feat: simplify StartWork and StopWork methods by removing userId parameter
This commit is contained in:
@@ -104,13 +104,8 @@ public class TaskSection : EntityBase<Guid>
|
||||
UpdateStatus(TaskSectionStatus.NotAssigned);
|
||||
}
|
||||
|
||||
public void StartWork(long userId, string? notes = null)
|
||||
public void StartWork(string? notes = null)
|
||||
{
|
||||
if (CurrentAssignedUserId != userId)
|
||||
{
|
||||
throw new BadRequestException("کاربر مجاز به شروع این بخش نیست");
|
||||
}
|
||||
|
||||
// if (Status == TaskSectionStatus.Completed)
|
||||
// {
|
||||
// throw new BadRequestException("این بخش قبلاً تکمیل شده است");
|
||||
@@ -121,14 +116,14 @@ public class TaskSection : EntityBase<Guid>
|
||||
throw new BadRequestException("یک فعالیت در حال انجام وجود دارد");
|
||||
}
|
||||
|
||||
var activity = new TaskSectionActivity(Id, userId, notes);
|
||||
var activity = new TaskSectionActivity(Id, CurrentAssignedUserId, notes);
|
||||
_activities.Add(activity);
|
||||
|
||||
|
||||
UpdateStatus(TaskSectionStatus.InProgress);
|
||||
}
|
||||
|
||||
public void StopWork(long userId, TaskSectionStatus taskSectionStatus, string? endNotes = null)
|
||||
public void StopWork(TaskSectionStatus taskSectionStatus, string? endNotes = null)
|
||||
{
|
||||
var activeActivity = _activities.FirstOrDefault(a => a.IsActive);
|
||||
if (activeActivity == null)
|
||||
@@ -136,11 +131,6 @@ public class TaskSection : EntityBase<Guid>
|
||||
throw new BadRequestException("هیچ فعالیت فعالی یافت نشد");
|
||||
}
|
||||
|
||||
if (activeActivity.UserId != userId)
|
||||
{
|
||||
throw new BadRequestException("کاربر مجاز به توقف این فعالیت نیست");
|
||||
}
|
||||
|
||||
UpdateStatus(taskSectionStatus);
|
||||
activeActivity.StopWork(endNotes);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user