diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AddTaskToPhase/AddTaskToPhaseCommand.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AddTaskToPhase/AddTaskToPhaseCommand.cs deleted file mode 100644 index 1373f8a6..00000000 --- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AddTaskToPhase/AddTaskToPhaseCommand.cs +++ /dev/null @@ -1,16 +0,0 @@ -using GozareshgirProgramManager.Application._Common.Interfaces; -using GozareshgirProgramManager.Domain.ProjectAgg.Enums; - -namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AddTaskToPhase; - -/// -/// Command to add a task to an existing phase -/// -public record AddTaskToPhaseCommand( - Guid PhaseId, - string Name, - string? Description = null, - ProjectTaskPriority Priority = ProjectTaskPriority.Medium, - int OrderIndex = 0, - DateTime? DueDate = null -) : IBaseCommand; diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AddTaskToPhase/AddTaskToPhaseCommandHandler.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AddTaskToPhase/AddTaskToPhaseCommandHandler.cs deleted file mode 100644 index 360811a7..00000000 --- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AddTaskToPhase/AddTaskToPhaseCommandHandler.cs +++ /dev/null @@ -1,53 +0,0 @@ -using GozareshgirProgramManager.Application._Common.Interfaces; -using GozareshgirProgramManager.Application._Common.Models; -using GozareshgirProgramManager.Domain._Common; -using GozareshgirProgramManager.Domain.ProjectAgg.Repositories; -using MediatR; - -namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.AddTaskToPhase; - -public class AddTaskToPhaseCommandHandler : IRequestHandler -{ - private readonly IProjectPhaseRepository _phaseRepository; - private readonly IUnitOfWork _unitOfWork; - - public AddTaskToPhaseCommandHandler( - IProjectPhaseRepository phaseRepository, - IUnitOfWork unitOfWork) - { - _phaseRepository = phaseRepository; - _unitOfWork = unitOfWork; - } - - public async Task Handle(AddTaskToPhaseCommand request, CancellationToken cancellationToken) - { - try - { - // Get phase - var phase = await _phaseRepository.GetByIdAsync(request.PhaseId); - if (phase == null) - { - return OperationResult.NotFound("فاز یافت نشد"); - } - - // Add task - var task = phase.AddTask(request.Name, request.Description); - task.SetPriority(request.Priority); - task.SetOrderIndex(request.OrderIndex); - - if (request.DueDate.HasValue) - { - task.SetDates(dueDate: request.DueDate); - } - - // Save changes - await _unitOfWork.SaveChangesAsync(cancellationToken); - - return OperationResult.Success(); - } - catch (Exception ex) - { - return OperationResult.Failure($"خطا در افزودن تسک: {ex.Message}"); - } - } -} diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommand.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommand.cs index 475e7aab..547f09bb 100644 --- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommand.cs +++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommand.cs @@ -4,4 +4,5 @@ using GozareshgirProgramManager.Domain.ProjectAgg.Enums; namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.CreateProject; public record CreateProjectCommand(string Name,ProjectHierarchyLevel Level, + ProjectTaskPriority? Priority, Guid? ParentId):IBaseCommand; \ No newline at end of file diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommandHandler.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommandHandler.cs index 1ba61509..ef4a4292 100644 --- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommandHandler.cs +++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommandHandler.cs @@ -16,7 +16,8 @@ public class CreateProjectCommandHandler : IBaseCommandHandlerx.Id == request.ParentId.Value)) + + if (!_projectRepository.Exists(x => x.Id == request.ParentId.Value)) { throw new BadRequestException("والد پروژه یافت نشد"); } @@ -69,14 +70,15 @@ public class CreateProjectCommandHandler : IBaseCommandHandlerx.Id == request.ParentId.Value)) + + if (!_projectPhaseRepository.Exists(x => x.Id == request.ParentId.Value)) { throw new BadRequestException("والد پروژه یافت نشد"); } - var projectTask = new ProjectTask(request.Name, request.ParentId.Value); + var priority = request.Priority ?? ProjectTaskPriority.Low; + + var projectTask = new ProjectTask(request.Name, request.ParentId.Value, priority); await _projectTaskRepository.CreateAsync(projectTask); } -} - \ No newline at end of file +} \ No newline at end of file diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectListDto.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectListDto.cs index 91a82c28..9157ec1d 100644 --- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectListDto.cs +++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectListDto.cs @@ -10,8 +10,10 @@ public class GetProjectItemDto public int Percentage { get; init; } public ProjectHierarchyLevel Level { get; init; } public Guid? ParentId { get; init; } - public int TotalHours { get; set; } - public int Minutes { get; set; } + + public TimeSpan TotalTime { get; init; } + + public TimeSpan RemainingTime { get; init; } public AssignmentStatus Front { get; set; } public AssignmentStatus Backend { get; set; } public AssignmentStatus Design { get; set; } diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectsListQueryHandler.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectsListQueryHandler.cs index a982caf3..9d184312 100644 --- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectsListQueryHandler.cs +++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/GetProjectsList/GetProjectsListQueryHandler.cs @@ -16,7 +16,8 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler> Handle(GetProjectsListQuery request, CancellationToken cancellationToken) + public async Task> Handle(GetProjectsListQuery request, + CancellationToken cancellationToken) { var projects = new List(); var phases = new List(); @@ -51,13 +52,14 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler(); } + var entities = await query .OrderByDescending(p => p.CreationDate) .ToListAsync(cancellationToken); var result = new List(); foreach (var project in entities) { - var (percentage, totalTime) = await CalculateProjectPercentage(project, cancellationToken); + var (percentage, totalTime,remainingTime) = await CalculateProjectPercentage(project, cancellationToken); result.Add(new GetProjectDto { Id = project.Id, @@ -65,10 +67,12 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler x.Percentage).ToList(); return result; } @@ -79,13 +83,14 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler x.ProjectId == parentId); } + var entities = await query .OrderByDescending(p => p.CreationDate) .ToListAsync(cancellationToken); var result = new List(); foreach (var phase in entities) { - var (percentage, totalTime) = await CalculatePhasePercentage(phase, cancellationToken); + var (percentage, totalTime,remainingTime) = await CalculatePhasePercentage(phase, cancellationToken); result.Add(new GetPhaseDto { Id = phase.Id, @@ -93,10 +98,12 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler x.Percentage).ToList(); + return result; } @@ -107,6 +114,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler x.PhaseId == parentId); } + var entities = await query .OrderByDescending(t => t.CreationDate) .ToListAsync(cancellationToken); @@ -118,7 +126,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler s.Activities) .Include(s => s.Skill) @@ -140,13 +148,12 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler s.Activities.Sum(a => a.GetTimeSpent().Ticks))); - var remainingTime = totalTime - spentTime; // ساخت section DTOs برای تمام Skills var sectionDtos = allSkills.Select(skill => { var section = sections.FirstOrDefault(s => s.SkillId == skill.Id); - + if (section == null) { // اگر section وجود نداشت، یک DTO با وضعیت Unassigned برمی‌گردانیم @@ -184,18 +191,20 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler x.Percentage).ToList(); + return result; } - private async Task SetSkillFlags(List items, CancellationToken cancellationToken) where TItem : GetProjectItemDto + private async Task SetSkillFlags(List items, CancellationToken cancellationToken) + where TItem : GetProjectItemDto { if (!items.Any()) return; @@ -213,7 +222,8 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler(List items, List projectIds, CancellationToken cancellationToken) where TItem : GetProjectItemDto + private async Task SetSkillFlagsForProjects(List items, List projectIds, + CancellationToken cancellationToken) where TItem : GetProjectItemDto { // For projects: gather all phases, then tasks, then sections var phases = await _context.ProjectPhases @@ -243,7 +253,8 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler(List items, List phaseIds, CancellationToken cancellationToken) where TItem : GetProjectItemDto + private async Task SetSkillFlagsForPhases(List items, List phaseIds, + CancellationToken cancellationToken) where TItem : GetProjectItemDto { // For phases: gather tasks, then sections var tasks = await _context.ProjectTasks @@ -269,68 +280,81 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler CalculateProjectPercentage(Project project, CancellationToken cancellationToken) + private async Task<(int Percentage, TimeSpan TotalTime,TimeSpan RemainingTime)> CalculateProjectPercentage(Project project, + CancellationToken cancellationToken) { var phases = await _context.ProjectPhases .Where(ph => ph.ProjectId == project.Id) .ToListAsync(cancellationToken); if (!phases.Any()) - return (0, TimeSpan.Zero); + return (0, TimeSpan.Zero,TimeSpan.Zero); var phasePercentages = new List(); var totalTime = TimeSpan.Zero; + var remainingTime = TimeSpan.Zero; foreach (var phase in phases) { - var (phasePercentage, phaseTime) = await CalculatePhasePercentage(phase, cancellationToken); + var (phasePercentage, phaseTime,phaseRemainingTime) = await CalculatePhasePercentage(phase, cancellationToken); phasePercentages.Add(phasePercentage); totalTime += phaseTime; + remainingTime += phaseRemainingTime; } + var averagePercentage = phasePercentages.Any() ? (int)phasePercentages.Average() : 0; - return (averagePercentage, totalTime); + return (averagePercentage, totalTime,remainingTime); } - private async Task<(int Percentage, TimeSpan TotalTime)> CalculatePhasePercentage(ProjectPhase phase, CancellationToken cancellationToken) + private async Task<(int Percentage, TimeSpan TotalTime,TimeSpan RemainingTime)> CalculatePhasePercentage(ProjectPhase phase, + CancellationToken cancellationToken) { var tasks = await _context.ProjectTasks .Where(t => t.PhaseId == phase.Id) .ToListAsync(cancellationToken); if (!tasks.Any()) - return (0, TimeSpan.Zero); + return (0, TimeSpan.Zero,TimeSpan.Zero); var taskPercentages = new List(); var totalTime = TimeSpan.Zero; + var remainingTime = TimeSpan.Zero; foreach (var task in tasks) { - var (taskPercentage, taskTime) = await CalculateTaskPercentage(task, cancellationToken); + var (taskPercentage, taskTime,taskRemainingTime) = await CalculateTaskPercentage(task, cancellationToken); taskPercentages.Add(taskPercentage); totalTime += taskTime; + remainingTime += taskRemainingTime; } + var averagePercentage = taskPercentages.Any() ? (int)taskPercentages.Average() : 0; - return (averagePercentage, totalTime); + return (averagePercentage, totalTime,remainingTime); } - private async Task<(int Percentage, TimeSpan TotalTime)> CalculateTaskPercentage(ProjectTask task, CancellationToken cancellationToken) + private async Task<(int Percentage, TimeSpan TotalTime, TimeSpan RemainingTime)> CalculateTaskPercentage( + ProjectTask task, CancellationToken cancellationToken) { var sections = await _context.TaskSections .Include(s => s.Activities) - .Include(x=>x.AdditionalTimes) + .Include(x => x.AdditionalTimes) .Where(s => s.TaskId == task.Id) .ToListAsync(cancellationToken); if (!sections.Any()) - return (0, TimeSpan.Zero); + return (0, TimeSpan.Zero, TimeSpan.Zero); var sectionPercentages = new List(); var totalTime = TimeSpan.Zero; + var spentTime = TimeSpan.Zero; foreach (var section in sections) { var (sectionPercentage, sectionTime) = CalculateSectionPercentage(section); + var sectionSpent = TimeSpan.FromTicks(section.Activities.Sum(x => x.GetTimeSpent().Ticks)); sectionPercentages.Add(sectionPercentage); totalTime += sectionTime; + spentTime += sectionSpent; } + var remainingTime = totalTime - spentTime; var averagePercentage = sectionPercentages.Any() ? (int)sectionPercentages.Average() : 0; - return (averagePercentage, totalTime); + return (averagePercentage, totalTime, remainingTime); } private static (int Percentage, TimeSpan TotalTime) CalculateSectionPercentage(TaskSection section) { - return ((int)section.GetProgressPercentage(),section.FinalEstimatedHours); + return ((int)section.GetProgressPercentage(), section.FinalEstimatedHours); } private static AssignmentStatus GetAssignmentStatus(TaskSection? section) @@ -341,7 +365,7 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler 0; - + // بررسی وجود time (InitialEstimatedHours بزرگتر از صفر باشد) bool hasTime = section.InitialEstimatedHours > TimeSpan.Zero; @@ -356,5 +380,4 @@ public class GetProjectsListQueryHandler : IBaseQueryHandler> { public long? UserId { get; set; } - public string? SearchText { get; set; } + public string? ProjectName { get; set; } public TaskSectionStatus? Status { get; set; } } \ No newline at end of file diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs index a5b171f4..8eb4861f 100644 --- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs +++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectBoardList/ProjectBoardListQueryHandler.cs @@ -46,11 +46,11 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler x.CurrentAssignedUserId == request.UserId); } - if (!string.IsNullOrWhiteSpace(request.SearchText)) + if (!string.IsNullOrWhiteSpace(request.ProjectName)) { - queryable = queryable.Where(x=>x.Task.Name.Contains(request.SearchText) - || x.Task.Phase.Name.Contains(request.SearchText) - || x.Task.Phase.Project.Name.Contains(request.SearchText)); + queryable = queryable.Where(x=>x.Task.Name.Contains(request.ProjectName) + || x.Task.Phase.Name.Contains(request.ProjectName) + || x.Task.Phase.Project.Name.Contains(request.ProjectName)); } var data = await queryable.ToListAsync(cancellationToken); @@ -70,6 +70,9 @@ public class ProjectBoardListQueryHandler : IBaseQueryHandler x.CurrentAssignedUserId == currentUserId) .ThenByDescending(x=>x.Task.Priority) .ThenBy(x => GetStatusOrder(x.Status)) + .ThenBy(x=>x.Task.Phase.ProjectId) + .ThenBy(x=>x.Task.PhaseId) + .ThenBy(x=>x.TaskId) .Select(x => { // محاسبه یکبار برای هر Activity و Cache کردن نتیجه diff --git a/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/ProjectPhase.cs b/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/ProjectPhase.cs index 60b98df9..129c5ff4 100644 --- a/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/ProjectPhase.cs +++ b/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/ProjectPhase.cs @@ -41,15 +41,7 @@ public class ProjectPhase : ProjectHierarchyNode public ProjectDeployStatus DeployStatus { get; set; } #region Task Management - - public ProjectTask AddTask(string name, string? description = null) - { - var task = new ProjectTask(name, Id, description); - _tasks.Add(task); - AddDomainEvent(new TaskAddedEvent(task.Id, Id, name)); - return task; - } - + public void RemoveTask(Guid taskId) { var task = _tasks.FirstOrDefault(t => t.Id == taskId); diff --git a/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/ProjectTask.cs b/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/ProjectTask.cs index 8c11e2a0..81d0e861 100644 --- a/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/ProjectTask.cs +++ b/ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/ProjectTask.cs @@ -16,11 +16,11 @@ public class ProjectTask : ProjectHierarchyNode _sections = new List(); } - public ProjectTask(string name, Guid phaseId, string? description = null) : base(name, description) + public ProjectTask(string name, Guid phaseId,ProjectTaskPriority priority, string? description = null) : base(name, description) { PhaseId = phaseId; _sections = new List(); - Priority = ProjectTaskPriority.Low; + Priority = priority; AddDomainEvent(new TaskCreatedEvent(Id, phaseId, name)); }