Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeTaskPriority/ChangeTaskPriorityCommand.cs

@@ -0,0 +1,41 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeTaskPriority;
+
+/// <summary>
+/// Command to change a task priority.
+/// </summary>
+public record ChangeTaskPriorityCommand(Guid TaskId, TaskPriority Priority) : IBaseCommand;
+
+public class ChangeTaskPriorityCommandHandler : IBaseCommandHandler<ChangeTaskPriorityCommand>
+{
+    private readonly IProjectTaskRepository _taskRepository;
+    private readonly IUnitOfWork _unitOfWork;
+
+    public ChangeTaskPriorityCommandHandler(IProjectTaskRepository taskRepository, IUnitOfWork unitOfWork)
+    {
+        _taskRepository = taskRepository;
+        _unitOfWork = unitOfWork;
+    }
+
+    public async Task<OperationResult> Handle(ChangeTaskPriorityCommand request, CancellationToken cancellationToken)
+    {
+        var task = await _taskRepository.GetByIdAsync(request.TaskId, cancellationToken);
+        if (task is null)
+            return OperationResult.NotFound("تسک یافت نشد");
+
+        // Idempotent: if already same priority, skip extra work
+        if (task.Priority != request.Priority)
+        {
+            task.SetPriority(request.Priority);
+        }
+
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        return OperationResult.Success();
+    }
+}
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/SetTimeProject/SetTimeProjectCommandHandler.cs

@@ -365,10 +365,26 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
 
         section.ClearAdditionalTimes();
         // افزودن زمان‌های اضافی
+        bool hasAdditionalTime = false;
         foreach (var additionalTime in sectionItem.AdditionalTime)
         {
             var additionalTimeSpan = TimeSpan.FromHours(additionalTime.Hours).Add(TimeSpan.FromMinutes(additionalTime.Minutes));
             section.AddAdditionalTime(additionalTimeSpan, additionalTime.Description, addedByUserId);
+            hasAdditionalTime = true;
+        }
+        
+        // تغییر status به Incomplete فقط اگر زمان اضافی اضافه شده باشد و در وضعیتی غیر از ReadyToStart باشد
+        if (hasAdditionalTime && section.Status != TaskSectionStatus.ReadyToStart)
+        {
+            // اگر سکشن درحال انجام است، باید متوقف شود قبل از تغییر status
+            if (section.Status == TaskSectionStatus.InProgress)
+            {
+                section.StopWork(TaskSectionStatus.Incomplete);
+            }
+            else
+            {
+                section.UpdateStatus(TaskSectionStatus.Incomplete);
+            }
         }
     }
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectsListQueryHandler.cs

@@ -189,6 +189,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler<GetProjectsListQuer
                 SpentTime = spentTime,
                 RemainingTime = remainingTime,
                 Sections = sectionDtos,
+                Priority = task.Priority
             });
         }
         return result;

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetTaskListDto.cs

@@ -15,6 +15,7 @@ public class GetTaskDto
     // Task-specific fields
     public TimeSpan SpentTime { get; init; }
     public TimeSpan RemainingTime { get; init; }
+    public TaskPriority Priority { get; set; }
     public List<GetTaskSectionDto> Sections { get;  init; }
 }
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs

@@ -53,7 +53,9 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler<ProjectBoardListQu
             .ToDictionaryAsync(x => x.Id, x => x.FullName, cancellationToken);
         
 
-        var result = data .OrderByDescending(x => x.CurrentAssignedUserId == currentUserId)
+        var result = data
+            .OrderByDescending(x => x.CurrentAssignedUserId == currentUserId)
+            .ThenByDescending(x=>x.Task.Priority)
             .ThenBy(x => GetStatusOrder(x.Status))
             .Select(x =>
             {

ServiceHost/Areas/Admin/Controllers/ProgramManager/ProjectController.cs

@@ -22,6 +22,7 @@ using GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectH
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
 using ServiceHost.BaseControllers;
+using GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeTaskPriority;
 using GozareshgirProgramManager.Application.Modules.Projects.Commands.AutoPendingFullTimeTaskSections;
 
 namespace ServiceHost.Areas.Admin.Controllers.ProgramManager;
@@ -168,4 +169,12 @@ public class ProjectController : ProgramManagerBaseController
         var res = await _mediator.Send(command);
         return res;
     }
+    
+    [HttpPost("change-priority")]
+    public async Task<ActionResult<OperationResult>> ChangePriority([FromBody] ChangeTaskPriorityCommand command)
+    {
+        var res = await _mediator.Send(command);
+        return res;
+    }
+    
 }

ServiceHost/Properties/launchSettings.json

@@ -19,7 +19,7 @@
       "sqlDebugging": true,
       "dotnetRunMessages": "true",
       "nativeDebugging": true,
-      "applicationUrl": "https://localhost:5004;http://localhost:5003;https://192.168.0.117:5006",
+      "applicationUrl": "https://localhost:5004;http://localhost:5003;",
       "jsWebView2Debugging": false,
       "hotReloadEnabled": true
     },
@@ -44,7 +44,7 @@
       "sqlDebugging": true,
       "dotnetRunMessages": "true",
       "nativeDebugging": true,
-      "applicationUrl": "https://localhost:5004;http://localhost:5003;https://192.168.0.117:5006;",
+      "applicationUrl": "https://localhost:5004;http://localhost:5003;",
       "jsWebView2Debugging": false,
       "hotReloadEnabled": true
     }