From 2a31b27f9b6877c691dff83f66ae86efbe3a2b71 Mon Sep 17 00:00:00 2001 From: mahan Date: Mon, 15 Dec 2025 10:43:17 +0330 Subject: [PATCH] feat: simplify StartWork and StopWork methods by removing userId parameter --- .../ChangeStatusSectionCommandHandler.cs | 14 +++++++------- .../ProjectAgg/Entities/TaskSection.cs | 16 +++------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeStatusSection/ChangeStatusSectionCommandHandler.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeStatusSection/ChangeStatusSectionCommandHandler.cs index 9e37cdc8..4214ec2d 100644 --- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeStatusSection/ChangeStatusSectionCommandHandler.cs +++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeStatusSection/ChangeStatusSectionCommandHandler.cs @@ -45,12 +45,12 @@ public class ChangeStatusSectionCommandHandler : IBaseCommandHandler> { - { TaskSectionStatus.ReadyToStart, new List { TaskSectionStatus.InProgress } }, - { TaskSectionStatus.InProgress, new List { TaskSectionStatus.Incomplete, TaskSectionStatus.Completed } }, - { TaskSectionStatus.Incomplete, new List { TaskSectionStatus.InProgress, TaskSectionStatus.Completed } }, - { TaskSectionStatus.Completed, new List { TaskSectionStatus.InProgress, TaskSectionStatus.Incomplete } }, // Can return to InProgress or Incomplete - { TaskSectionStatus.NotAssigned, new List { TaskSectionStatus.InProgress, TaskSectionStatus.ReadyToStart } } + { TaskSectionStatus.ReadyToStart, [TaskSectionStatus.InProgress] }, + { TaskSectionStatus.InProgress, [TaskSectionStatus.Incomplete, TaskSectionStatus.Completed] }, + { TaskSectionStatus.Incomplete, [TaskSectionStatus.InProgress, TaskSectionStatus.Completed] }, + { TaskSectionStatus.Completed, [TaskSectionStatus.InProgress, TaskSectionStatus.Incomplete] }, // Can return to InProgress or Incomplete + { TaskSectionStatus.NotAssigned, [TaskSectionStatus.InProgress, TaskSectionStatus.ReadyToStart] } }; if (!validTransitions.TryGetValue(currentStatus, out var allowedTargets)) diff --git a/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/TaskSection.cs b/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/TaskSection.cs index b2a6fd91..c663ed4b 100644 --- a/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/TaskSection.cs +++ b/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/TaskSection.cs @@ -104,13 +104,8 @@ public class TaskSection : EntityBase 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 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 throw new BadRequestException("هیچ فعالیت فعالی یافت نشد"); } - if (activeActivity.UserId != userId) - { - throw new BadRequestException("کاربر مجاز به توقف این فعالیت نیست"); - } - UpdateStatus(taskSectionStatus); activeActivity.StopWork(endNotes); }