Merge branch 'Feature/program-manager/request-additional-time' into Main

# Conflicts:
#	ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/ProjectTask.cs

Company.Domain/SalaryAidAgg/ISalaryAidRepository.cs

@@ -15,12 +15,11 @@ public interface ISalaryAidRepository:IRepository<long,SalaryAid>
 	void RemoveRange(IEnumerable<SalaryAid> salaryAids);
 
 	#region Pooya
-
 	/// <summary>
 	/// گروهبندی بر اساس ماه هنگام جستجو با انتخاب کارمند
 	/// </summary>
 
-	SalaryAidsGroupedViewModel GetSearchListAsGrouped(SalaryAidSearchViewModel searchModel); 
+	SalaryAidsGroupedViewModel GetSearchListAsGrouped(SalaryAidSearchViewModel searchModel);
 	#endregion
 
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/GozareshgirProgramManager.Application.csproj

@@ -25,4 +25,9 @@
       </Reference>
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Modules\TaskSectionRevision\Commands\" />
+      <Folder Include="Modules\TaskSectionTimeRequests\Queries\" />
+    </ItemGroup>
+
 </Project>

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AssignProject/AssignProjectCommandHandler.cs

@@ -2,6 +2,9 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Domain.SkillAgg.Repositories;

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/AutoUpdateDeployStatus/AutoUpdateDeployStatusCommand.cs

@@ -2,6 +2,7 @@ using System.Linq;
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/ChangeDeployStatusProject/ChangeDeployeStatusProjectComand.cs

@@ -2,6 +2,7 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.ChangeDeployStatusProject;

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

@@ -1,6 +1,8 @@
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 
@@ -69,7 +71,7 @@ public class ChangeTaskPriorityCommandHandler : IBaseCommandHandler<ChangeTaskPr
         if (phase is null)
             return OperationResult.NotFound("فاز یافت نشد");
 
-        var tasks = phase.Tasks?.ToList() ?? new List<Domain.ProjectAgg.Entities.ProjectTask>();
+        var tasks = phase.Tasks?.ToList() ?? new List<ProjectTask>();
         foreach (var t in tasks)
         {
             if (t.Priority != priority)
@@ -89,10 +91,10 @@ public class ChangeTaskPriorityCommandHandler : IBaseCommandHandler<ChangeTaskPr
         if (project is null)
             return OperationResult.NotFound("پروژه یافت نشد");
 
-        var phases = project.Phases?.ToList() ?? new List<Domain.ProjectAgg.Entities.ProjectPhase>();
+        var phases = project.Phases?.ToList() ?? new List<ProjectPhase>();
         foreach (var phase in phases)
         {
-            var tasks = phase.Tasks?.ToList() ?? new List<Domain.ProjectAgg.Entities.ProjectTask>();
+            var tasks = phase.Tasks?.ToList() ?? new List<ProjectTask>();
             foreach (var t in tasks)
             {
                 if (t.Priority != priority)

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProject/CreateProjectCommandHandler.cs

@@ -3,6 +3,9 @@ using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain._Common.Exceptions;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateProjectWithHierarchy/CreateProjectWithHierarchyCommandHandler.cs

@@ -2,6 +2,7 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using MediatR;
 

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

@@ -1,5 +1,7 @@
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application.Modules.Projects.DTOs;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.SetTimeProject;
@@ -15,4 +17,5 @@ public class SetTimeSectionTime
     public string Description { get; set; }
     public int Hours { get; set; }
     public int Minutes { get; set; }
+    public TaskSectionAdditionalTimeType Type { get; set; }
 }

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

@@ -4,6 +4,9 @@ using GozareshgirProgramManager.Application.Modules.Projects.DTOs;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain._Common.Exceptions;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Domain.SkillAgg.Repositories;
@@ -369,7 +372,7 @@ public class SetTimeProjectCommandHandler : IBaseCommandHandler<SetTimeProjectCo
         foreach (var additionalTime in sectionItem.AdditionalTime)
         {
             var additionalTimeSpan = TimeSpan.FromHours(additionalTime.Hours).Add(TimeSpan.FromMinutes(additionalTime.Minutes));
-            section.AddAdditionalTime(additionalTimeSpan, additionalTime.Description, addedByUserId);
+            section.AddAdditionalTime(additionalTimeSpan, additionalTime.Type, additionalTime.Description, addedByUserId);
             hasAdditionalTime = true;
         }
         

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Extensions/ProjectMappingExtensions.cs

@@ -1,5 +1,9 @@
 using GozareshgirProgramManager.Application.Modules.Projects.DTOs;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Extensions;

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

@@ -4,6 +4,10 @@ using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectDeployBoardList/ProjectDeployBoardListQueryHandler.cs

@@ -3,6 +3,7 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Application.Modules.Projects.Queries.GetProjectsList;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
 

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/GetMessages/GetMessagesQuery.cs

@@ -1,6 +1,7 @@
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application._Common.Models;
 using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.TaskChatAgg.Enums;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
@@ -28,7 +29,7 @@ public class GetMessagesQueryHandler : IBaseQueryHandler<GetMessagesQuery, Pagin
     }
 
     private List<MessageDto> CreateAdditionalTimeNotes(
-        IEnumerable<Domain.ProjectAgg.Entities.TaskSectionAdditionalTime> additionalTimes,
+        IEnumerable<TaskSectionAdditionalTime> additionalTimes,
         Dictionary<long, string> users,
         Guid taskId)
     {

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionRevision/Commands/CreateTaskSectionRevision/CreateTaskSectionRevisionCommand.cs

@@ -0,0 +1,136 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.TaskChat.DTOs;
+using GozareshgirProgramManager.Application.Services.FileManagement;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Repositories;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+using Microsoft.AspNetCore.Http;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Commands.CreateTaskSectionRevision;
+
+public record CreateTaskSectionRevisionCommand(string Message, List<IFormFile> Files, Guid SectionId) : IBaseCommand;
+
+public class CreateTaskSectionRevisionCommandHandler : IBaseCommandHandler<CreateTaskSectionRevisionCommand>
+{
+    private readonly ITaskSectionRevisionRepository _revisionRepository;
+    private readonly IFileStorageService _fileStorageService;
+    private readonly IAuthHelper _authHelper;
+    private readonly IUnitOfWork _unitOfWork;
+    private readonly IUploadedFileRepository _fileRepository;
+    private readonly IThumbnailGeneratorService _thumbnailService;
+
+    public CreateTaskSectionRevisionCommandHandler(ITaskSectionRevisionRepository revisionRepository,
+        IFileStorageService fileStorageService, IAuthHelper authHelper, IUnitOfWork unitOfWork, IUploadedFileRepository fileRepository, IThumbnailGeneratorService thumbnailService)
+    {
+        _revisionRepository = revisionRepository;
+        _fileStorageService = fileStorageService;
+        _authHelper = authHelper;
+        _unitOfWork = unitOfWork;
+        _fileRepository = fileRepository;
+        _thumbnailService = thumbnailService;
+    }
+
+    public async Task<OperationResult> Handle(CreateTaskSectionRevisionCommand request,
+        CancellationToken cancellationToken)
+    {
+        var currentId = _authHelper.GetCurrentUserId();
+        
+        var entity = new Domain.ProjectAgg.Entities.Task.TaskSection.TaskSectionRevision(request.SectionId, request.Message, currentId!.Value);
+        if (request.Files is { Count: > 0 })
+        {
+            foreach (var file in request.Files)
+            {
+                if (file.Length == 0)
+                {
+                    return OperationResult.ValidationError("فایل خالی است");
+                }
+
+                const long maxFileSize = 100 * 1024 * 1024;
+                if (file.Length > maxFileSize)
+                {
+                    return OperationResult.ValidationError("حجم فایل بیش از حد مجاز است (حداکثر 100MB)");
+                }
+
+                var fileType = DetectFileType(file.ContentType, Path.GetExtension(file.FileName));
+
+                var uploadedFile = new UploadedFile(
+                    originalFileName: file.FileName,
+                    fileSizeBytes: file.Length,
+                    mimeType: file.ContentType,
+                    fileType: fileType,
+                    category: FileCategory.TaskSectionRevision,
+                    uploadedByUserId: currentId!.Value,
+                    storageProvider: StorageProvider.LocalFileSystem
+                );
+
+                await _fileRepository.AddAsync(uploadedFile);
+                await _fileRepository.SaveChangesAsync();
+
+                try
+                {
+                    await using var stream = file.OpenReadStream();
+                    var uploadResult = await _fileStorageService.UploadAsync(
+                        stream,
+                        uploadedFile.UniqueFileName,
+                        "TaskSectionRevision"
+                    );
+
+                    uploadedFile.CompleteUpload(uploadResult.StoragePath, uploadResult.StorageUrl);
+
+                    if (fileType == FileType.Image)
+                    {
+                        var dimensions = await _thumbnailService.GetImageDimensionsAsync(uploadResult.StoragePath);
+                        if (dimensions.HasValue)
+                        {
+                            uploadedFile.SetImageDimensions(dimensions.Value.Width, dimensions.Value.Height);
+                        }
+
+                        var thumbnail = await _thumbnailService
+                            .GenerateImageThumbnailAsync(uploadResult.StoragePath, category: "TaskSectionRevision");
+                        if (thumbnail.HasValue)
+                        {
+                            uploadedFile.SetThumbnail(thumbnail.Value.ThumbnailUrl);
+                        }
+                    }
+
+                    await _fileRepository.UpdateAsync(uploadedFile);
+                    await _fileRepository.SaveChangesAsync();
+
+                    var taskRevisionFile = new TaskRevisionFile(uploadedFile.Id);
+                    entity.AddFile(taskRevisionFile);
+                }
+                catch (Exception ex)
+                {
+                    await _fileRepository.DeleteAsync(uploadedFile);
+                    await _fileRepository.SaveChangesAsync();
+
+                    return OperationResult<MessageDto>.ValidationError($"خطا در آپلود فایل: {ex.Message}");
+                }
+            }
+        }
+
+        await _revisionRepository.CreateAsync(entity);
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        return OperationResult.Success();
+    }
+    private FileType DetectFileType(string mimeType, string extension)
+    {
+        if (mimeType.StartsWith("image/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Image;
+
+        if (mimeType.StartsWith("video/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Video;
+
+        if (mimeType.StartsWith("audio/", StringComparison.OrdinalIgnoreCase))
+            return FileType.Audio;
+
+        if (new[] { ".zip", ".rar", ".7z", ".tar", ".gz" }.Contains(extension.ToLower()))
+            return FileType.Archive;
+
+        return FileType.Document;
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionRevision/Queries/TaskRevisionsByTaskSectionId/TaskRevisionsByTaskSectionIdQuery.cs

@@ -0,0 +1,75 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Queries.TaskRevisionsByTaskSectionId;
+
+public record TaskRevisionsByTaskSectionIdQuery(Guid TaskSectionId)
+    : IBaseQuery<TaskRevisionsByTaskSectionIdResponse>;
+
+public class TaskRevisionsByTaskSectionIdQueryHandler : IBaseQueryHandler<TaskRevisionsByTaskSectionIdQuery,
+    TaskRevisionsByTaskSectionIdResponse>
+{
+    private readonly IProgramManagerDbContext _dbContext;
+
+    public TaskRevisionsByTaskSectionIdQueryHandler(IProgramManagerDbContext dbContext)
+    {
+        _dbContext = dbContext;
+    }
+
+    public async Task<OperationResult<TaskRevisionsByTaskSectionIdResponse>> Handle(
+        TaskRevisionsByTaskSectionIdQuery request, CancellationToken cancellationToken)
+    {
+        var taskEntity = await _dbContext.TaskSections
+            .Include(x=>x.Task)
+            .ThenInclude(x => x.Phase)
+            .ThenInclude(x => x.Project)
+            .FirstOrDefaultAsync(x => x.Id == request.TaskSectionId,
+                cancellationToken: cancellationToken);
+        if (taskEntity == null)
+        {
+            return OperationResult<TaskRevisionsByTaskSectionIdResponse>.NotFound("بخش فرعی یافت نشد");
+        }
+
+        var taskRevisions = await _dbContext.TaskSectionRevisions
+            .Include(x => x.Files).Where(x => x.TaskSectionId == request.TaskSectionId)
+            .ToListAsync(cancellationToken);
+        if (taskRevisions.Count == 0)
+        {
+            return OperationResult<TaskRevisionsByTaskSectionIdResponse>.NotFound("اصلاحی یافت نشد");
+        }
+
+        var fileIds = taskRevisions.SelectMany(x => x.Files)
+            .Select(x => x.FileId).Distinct().ToList();
+
+        var uploadedFiles = _dbContext.UploadedFiles
+            .Where(x => fileIds.Contains(x.Id)).ToList();
+
+        var resItems = taskRevisions.Select(x =>
+        {
+            var itemFileIds = x.Files.Select(f => f.FileId).Distinct().ToList();
+
+            var files = uploadedFiles
+                .Where(f => itemFileIds.Contains(f.Id))
+                .Select(file => new TaskRevisionsByTaskSectionIdItemFile()
+                {
+                    Id = file.Id,
+                    FileName = file.OriginalFileName,
+                    FileUrl = file.StorageUrl ?? "",
+                    FileSizeBytes = file.FileSizeBytes,
+                    FileType = file.FileType.ToString(),
+                    ThumbnailUrl = file.ThumbnailUrl,
+                    ImageWidth = file.ImageWidth,
+                    ImageHeight = file.ImageHeight,
+                    DurationSeconds = file.DurationSeconds
+                }).ToList();
+
+            return new TaskRevisionsByTaskSectionIdItem(x.Message, files);
+        }).ToList();
+
+        var res = new TaskRevisionsByTaskSectionIdResponse(resItems, taskEntity.Task.Phase.Project.Name,
+            taskEntity.Task.Phase.Name, taskEntity.Task.Name);
+        
+        return OperationResult<TaskRevisionsByTaskSectionIdResponse>.Success(res);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionRevision/Queries/TaskRevisionsByTaskSectionId/TaskRevisionsByTaskSectionIdResponse.cs

@@ -0,0 +1,42 @@
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Queries.TaskRevisionsByTaskSectionId;
+
+public record TaskRevisionsByTaskSectionIdResponse(
+    List<TaskRevisionsByTaskSectionIdItem> Items,
+    string ProjectName,
+    string PhaseName,
+    string TaskName);
+    
+    
+public record TaskRevisionsByTaskSectionIdItem(string Message, List<TaskRevisionsByTaskSectionIdItemFile> Files);
+
+public class TaskRevisionsByTaskSectionIdItemFile
+{
+    public Guid Id { get; set; }
+    public string FileName { get; set; } = string.Empty;
+    public string FileUrl { get; set; } = string.Empty;
+    public long FileSizeBytes { get; set; }
+    public string FileType { get; set; } = string.Empty;
+    public string? ThumbnailUrl { get; set; }
+    public int? ImageWidth { get; set; }
+    public int? ImageHeight { get; set; }
+    public int? DurationSeconds { get; set; }
+
+    public string FileSizeFormatted
+    {
+        get
+        {
+            const long kb = 1024;
+            const long mb = kb * 1024;
+            const long gb = mb * 1024;
+
+            if (FileSizeBytes >= gb)
+                return $"{FileSizeBytes / (double)gb:F2} GB";
+            if (FileSizeBytes >= mb)
+                return $"{FileSizeBytes / (double)mb:F2} MB";
+            if (FileSizeBytes >= kb)
+                return $"{FileSizeBytes / (double)kb:F2} KB";
+
+            return $"{FileSizeBytes} Bytes";
+        }
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Commands/AcceptTimeRequest/AcceptTimeRequestCommand.cs

@@ -0,0 +1,43 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionTimeRequests.Commands.AcceptTimeRequest;
+
+public record AcceptTimeRequestCommand(Guid TimeRequestId,
+    Guid SectionId,TaskSectionAdditionalTimeType TimeType,int Hour,int Minute):IBaseCommand;
+
+public class AcceptTimeRequestCommandHandler:IBaseCommandHandler<AcceptTimeRequestCommand>
+{
+    private readonly ITaskSectionTimeRequestRepository _timeRequestRepository;
+    private readonly ITaskSectionRepository _taskSectionRepository;
+    public AcceptTimeRequestCommandHandler(ITaskSectionTimeRequestRepository timeRequestRepository, ITaskSectionRepository taskSectionRepository)
+    {
+        _timeRequestRepository = timeRequestRepository;
+        _taskSectionRepository = taskSectionRepository;
+    }
+
+    public async Task<OperationResult> Handle(AcceptTimeRequestCommand request, CancellationToken cancellationToken)
+    {
+        var timeRequest = await _timeRequestRepository.GetByIdAsync(request.TimeRequestId, cancellationToken);
+        if (timeRequest == null)
+        {
+            return OperationResult.NotFound("درخواست زمان شما یافت نشد");
+        }
+
+        var taskSection = await _taskSectionRepository.GetByIdAsync(request.SectionId, cancellationToken);
+
+        if (taskSection == null)
+        {
+            return OperationResult.NotFound("بخش فرعی وارد شده نامعتبر است");
+        }
+
+        // if (timeRequest.RequestType.)
+        // {
+        //     
+        // }
+        throw new NotImplementedException();
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Commands/AcceptTimeRequest/AcceptTimeRequestCommandValidator.cs

@@ -0,0 +1,24 @@
+using FluentValidation;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionTimeRequests.Commands.AcceptTimeRequest;
+
+public class AcceptTimeRequestCommandValidator : AbstractValidator<AcceptTimeRequestCommand>
+{
+    public AcceptTimeRequestCommandValidator()
+    {
+        RuleFor(c => c.TimeRequestId)
+            .NotEmpty().WithMessage("شناسه درخواست نمیتواند خالی باشد");
+
+        RuleFor(c => c.SectionId)
+            .NotEmpty().WithMessage("شناسه بخش فرعی نمیتواند خالی باشد");
+
+        RuleFor(c => c.TimeType)
+            .NotNull().WithMessage("نوع زمان درخواست شده نامعتبر است")
+            .IsInEnum();
+
+        RuleFor(c => c.Hour)
+            .InclusiveBetween(0, 100).WithMessage("ساعت وارد شده میتواند بین 0 تا 100 باشد");
+        RuleFor(c => c.Minute)
+            .InclusiveBetween(0, 60).WithMessage("دقیقه وارد شده میتواند بین 0 تا 60 باشد");
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Commands/CreateTimeRequest/CreateTimeRequestCommand.cs

@@ -0,0 +1,52 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionTimeRequests.Commands.CreateTimeRequest;
+
+public record CreateTimeRequestCommand(int Hours, int Minutes, string Description,
+    TaskSectionTimeRequestType RequestType,Guid TaskSectionId) : IBaseCommand;
+
+public class CreateTimeRequestCommandHandler : IBaseCommandHandler<CreateTimeRequestCommand>
+{
+    private readonly IAuthHelper _authHelper;
+    private readonly ITaskSectionTimeRequestRepository _timeRequestRepository;
+    private readonly ITaskSectionRepository _taskSectionRepository;
+    private readonly IUnitOfWork _unitOfWork;
+
+    public CreateTimeRequestCommandHandler
+        (ITaskSectionTimeRequestRepository timeRequestRepository, IAuthHelper authHelper, IUnitOfWork unitOfWork, ITaskSectionRepository taskSectionRepository)
+    {
+        _timeRequestRepository = timeRequestRepository;
+        _authHelper = authHelper;
+        _unitOfWork = unitOfWork;
+        _taskSectionRepository = taskSectionRepository;
+    }
+
+    public async Task<OperationResult> Handle(CreateTimeRequestCommand request, CancellationToken cancellationToken)
+    {
+        var currentUser = _authHelper.GetCurrentUserId();
+        if (!currentUser.HasValue)
+        {
+            return OperationResult.Unauthorized();
+        }
+
+        if (!_taskSectionRepository.Exists(x=>x.Id == request.TaskSectionId))
+        {
+            return OperationResult.NotFound("وظیفه فرعی مورد نظر یافت نشد");
+        }
+        
+
+        var requestTimeSpan = TimeSpan.FromHours(request.Hours) + TimeSpan.FromMinutes(request.Minutes);
+        
+        var entity = new TaskSectionTimeRequest(currentUser.Value, request.Description, requestTimeSpan,
+            request.RequestType,request.TaskSectionId);
+        await _timeRequestRepository.CreateAsync(entity);
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        return OperationResult.Success();
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Commands/CreateTimeRequest/CreateTimeRequestValidator.cs

@@ -0,0 +1,20 @@
+using FluentValidation;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionTimeRequests.Commands.CreateTimeRequest;
+
+public class CreateTimeRequestValidator : AbstractValidator<CreateTimeRequestCommand>
+{
+    public CreateTimeRequestValidator()
+    {
+        RuleFor(c => c.Hours)
+            .InclusiveBetween(0, 100).WithMessage("ساعت درخواست شده باید کمتر از 100 ساعت باشد");
+
+        RuleFor(c => c.Minutes)
+            .InclusiveBetween(0, 59)
+            .WithMessage("دقیقه وارد شده باید بین 0 تا 60 باشد");
+
+        RuleFor(x => x.RequestType)
+            .IsInEnum()
+            .NotNull();
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Workflows/Queries/WorkflowList/WorkflowListQuery.cs

@@ -0,0 +1,62 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList;
+
+public record WorkflowListResponse(List<WorkflowListItem>Items);
+
+public class WorkflowListItem
+{
+    public string Title { get; set; }
+    public WorkflowType Type { get; set; }
+    public Guid EntityId { get; set; }
+}
+
+public enum WorkflowType
+{
+    Rejected,
+    NotAssigned,
+    PendingForApproval,
+}
+
+public record WorkflowListQuery():IBaseQuery<WorkflowListResponse>;
+
+public class WorkflowListQueryHandler:IBaseQueryHandler<WorkflowListQuery,WorkflowListResponse>
+{
+    private readonly IProgramManagerDbContext _context;
+    private readonly IAuthHelper _authHelper;
+
+    public WorkflowListQueryHandler(IProgramManagerDbContext context,
+        IAuthHelper authHelper)
+    {
+        _context = context;
+        _authHelper = authHelper;
+    }
+
+    public async Task<OperationResult<WorkflowListResponse>> Handle(WorkflowListQuery request, CancellationToken cancellationToken)
+    {
+        var currentUserId =_authHelper.GetCurrentUserId();
+
+        var query = await (from revision in _context.TaskSectionRevisions
+                .Where(x=>x.Status == RevisionReviewStatus.Pending)
+            join taskSection in _context.TaskSections.Where(x => x.CurrentAssignedUserId == currentUserId)
+                on revision.TaskSectionId equals taskSection.Id
+            select new
+            {
+                taskSection,
+                revision
+                
+            }).ToListAsync(cancellationToken: cancellationToken);
+
+        var workflowListItems = query.Select(x=>new WorkflowListItem()
+        {
+            EntityId = x.taskSection.Id,
+            Title = "برگشت از سمت مدیر",
+            Type = WorkflowType.Rejected
+        }).ToList();
+        var res = new WorkflowListResponse(workflowListItems);
+        return OperationResult<WorkflowListResponse>.Success(res);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Interfaces/IProgramManagerDbContext.cs

@@ -9,6 +9,10 @@ using GozareshgirProgramManager.Domain.UserAgg.Entities;
 using Microsoft.EntityFrameworkCore;
 using GozareshgirProgramManager.Domain.TaskChatAgg.Entities;
 using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 namespace GozareshgirProgramManager.Application._Common.Interfaces;
 
@@ -31,6 +35,12 @@ public interface IProgramManagerDbContext
     DbSet<TaskChatMessage> TaskChatMessages { get; set; }
     DbSet<UploadedFile> UploadedFiles { get; set; }
     
+    //Task Section Time Request
+    DbSet<TaskSectionTimeRequest> TaskSectionTimeRequests { get; set; }
+    
+    // Task Section Revision
+    DbSet<TaskSectionRevision>  TaskSectionRevisions { get; set; }
+    
     DbSet<Skill> Skills { get; set; }
     Task<int> SaveChangesAsync(CancellationToken cancellationToken = default);
 }

ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Models/OperationResult.cs

@@ -31,7 +31,7 @@ public class OperationResult
     
     // Helper methods for specific error types
     public static OperationResult NotFound(string errorMessage) => new(false, errorMessage, errorType: ErrorType.NotFound);
-    public static OperationResult Unauthorized(string errorMessage) => new(false, errorMessage, errorType: ErrorType.Unauthorized);
+    public static OperationResult Unauthorized(string errorMessage="احراز هویت شما منقضی شده است. لطفا دوباره وارد شوید") => new(false, errorMessage, errorType: ErrorType.Unauthorized);
     public static OperationResult ValidationError(string errorMessage) => new(false, errorMessage, errorType: ErrorType.Validation);
     public static OperationResult ValidationError(List<string> errors) => new(false, errors: errors, errorType: ErrorType.Validation);
     public static OperationResult InternalServerError(string errorMessage) => new(false, errorMessage, errorType: ErrorType.InternalServerError);

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Enums/FileCategory.cs

@@ -10,6 +10,7 @@ public enum FileCategory
     ProjectDocument = 3,        // مستندات پروژه
     UserProfilePhoto = 4,       // عکس پروفایل کاربر
     Report = 5,                 // گزارش
-    Other = 6                   // سایر
+    Other = 6,                   // سایر
+    TaskSectionRevision
 }
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Phase/PhaseSection.cs

@@ -1,7 +1,7 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.SkillAgg.Entities;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 
 /// <summary>
 /// بخش فاز - برای ذخیره تخصیص کاربر و مهارت در سطح Phase

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Phase/ProjectPhase.cs

@@ -1,8 +1,9 @@
-using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Events;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 
 /// <summary>
 /// فاز پروژه - سطح میانی در سلسله مراتب
@@ -28,7 +29,7 @@ public class ProjectPhase : ProjectHierarchyNode
     }
     
     public Guid ProjectId { get; private set; }
-    public Project Project { get; private set; } = null!;
+    public Project.Project Project { get; private set; } = null!;
     public IReadOnlyList<ProjectTask> Tasks => _tasks.AsReadOnly();
     public IReadOnlyList<PhaseSection> PhaseSections => _phaseSections.AsReadOnly();
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Project/Project.cs

@@ -1,8 +1,8 @@
-using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Events;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 
 /// <summary>
 /// پروژه - بالاترین سطح در سلسله مراتب و Aggregate Root

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Project/ProjectSection.cs

@@ -1,7 +1,7 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.SkillAgg.Entities;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 
 /// <summary>
 /// ProjectSection: shortcut container for UserId + SkillId at Project level

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/ProjectTask.cs

@@ -1,32 +1,33 @@
-using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Events;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
 
 /// <summary>
 /// تسک - پایین‌ترین سطح در سلسله مراتب که شامل بخش‌ها می‌شود
 /// </summary>
 public class ProjectTask : ProjectHierarchyNode
 {
-    private readonly List<TaskSection> _sections;
+    private readonly List<TaskSection.TaskSection> _sections;
 
     private ProjectTask()
     {
-        _sections = new List<TaskSection>();
+        _sections = new List<TaskSection.TaskSection>();
     }
 
     public ProjectTask(string name, Guid phaseId,ProjectTaskPriority priority, string? description = null) : base(name, description)
     {
         PhaseId = phaseId;
-        _sections = new List<TaskSection>();
+        _sections = new List<TaskSection.TaskSection>();
         Priority = priority;
+        Priority = ProjectTaskPriority.Low;
         AddDomainEvent(new TaskCreatedEvent(Id, phaseId, name));
     }
     
     public Guid PhaseId { get; private set; }
     public ProjectPhase Phase { get; private set; } = null!;
-    public IReadOnlyList<TaskSection> Sections => _sections.AsReadOnly();
+    public IReadOnlyList<TaskSection.TaskSection> Sections => _sections.AsReadOnly();
 
     // Task-specific properties
     public Enums.TaskStatus Status { get; private set; } = Enums.TaskStatus.NotStarted;
@@ -40,7 +41,7 @@ public class ProjectTask : ProjectHierarchyNode
     
     #region Section Management
 
-    public void AddSection(TaskSection section, bool cascadeToChildren = false)
+    public void AddSection(TaskSection.TaskSection section, bool cascadeToChildren = false)
     {
         var existingSection = _sections.FirstOrDefault(s => s.SkillId == section.SkillId);
         if (existingSection != null)
@@ -84,7 +85,7 @@ public class ProjectTask : ProjectHierarchyNode
             return;
         }
 
-        var section = new TaskSection(Id, skillId, assignedUserId);
+        var section = new TaskSection.TaskSection(Id, skillId, assignedUserId);
         _sections.Add(section);
         AddDomainEvent(new TaskSectionAddedEvent(Id, section.Id, skillId));
     }
@@ -204,12 +205,12 @@ public class ProjectTask : ProjectHierarchyNode
 
     #region Query Helpers
 
-    public IEnumerable<TaskSection> GetSectionsBySkill(Guid skillId)
+    public IEnumerable<TaskSection.TaskSection> GetSectionsBySkill(Guid skillId)
     {
         return _sections.Where(s => s.SkillId == skillId);
     }
 
-    public TaskSection? GetSectionBySkill(Guid skillId)
+    public TaskSection.TaskSection? GetSectionBySkill(Guid skillId)
     {
         return _sections.FirstOrDefault(s => s.SkillId == skillId);
     }
@@ -219,7 +220,7 @@ public class ProjectTask : ProjectHierarchyNode
         return _sections.Any(s => s.SkillId == skillId);
     }
 
-    public IEnumerable<TaskSection> GetAssignedSections(long userId)
+    public IEnumerable<TaskSection.TaskSection> GetAssignedSections(long userId)
     {
         return _sections.Where(s => s.CurrentAssignedUserId == userId);
     }

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/TaskSection/TaskSection.cs

@@ -1,12 +1,10 @@
-using System.Linq;
-using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain._Common.Exceptions;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Events;
-using GozareshgirProgramManager.Domain.ProjectAgg.Models;
 using GozareshgirProgramManager.Domain.SkillAgg.Entities;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 /// <summary>
 /// بخش تسک - برای ذخیره کار واقعی که کاربر روی یک مهارت خاص انجام می‌دهد
@@ -61,12 +59,13 @@ public class TaskSection : EntityBase<Guid>
     // برای backward compatibility
     public TimeSpan EstimatedHours => FinalEstimatedHours;
 
-    public void AddAdditionalTime(TimeSpan additionalHours, string? reason = null, long? addedByUserId = null)
+    public void AddAdditionalTime(TimeSpan additionalHours, TaskSectionAdditionalTimeType type, string? reason = null,
+        long? addedByUserId = null)
     {
         if (additionalHours <= TimeSpan.Zero)
             throw new BadRequestException("تایم اضافی باید بزرگتر از صفر باشد", nameof(additionalHours));
 
-        var additionalTime = new TaskSectionAdditionalTime(additionalHours, reason, addedByUserId);
+        var additionalTime = new TaskSectionAdditionalTime(additionalHours,type, reason, addedByUserId);
         _additionalTimes.Add(additionalTime);
     }
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/TaskSection/TaskSectionActivity.cs

@@ -1,7 +1,6 @@
-using System.Diagnostics.CodeAnalysis;
 using GozareshgirProgramManager.Domain._Common;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 /// <summary>
 /// فعالیت کاری روی یک بخش

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/TaskSection/TaskSectionAdditionalTime.cs

@@ -1,6 +1,6 @@
 using GozareshgirProgramManager.Domain._Common;
 
-namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 /// <summary>
 /// زمان اضافی اضافه شده بعد از تخمین اولیه
@@ -9,12 +9,13 @@ public class TaskSectionAdditionalTime : EntityBase<Guid>
 {
     private TaskSectionAdditionalTime() { }
 
-    public TaskSectionAdditionalTime(TimeSpan hours, string? reason = null, long? addedByUserId = null)
+    public TaskSectionAdditionalTime(TimeSpan hours, TaskSectionAdditionalTimeType type, string? reason = null,long? addedByUserId = null)
     {
         Hours = hours;
         Reason = reason;
         AddedByUserId = addedByUserId;
-        AddedAt = DateTime.UtcNow;
+        AddedAt = DateTime.Now;
+        Type = type;
     }
 
     public TimeSpan Hours { get; private set; }
@@ -22,8 +23,15 @@ public class TaskSectionAdditionalTime : EntityBase<Guid>
     public long? AddedByUserId { get; private set; }
     public DateTime AddedAt { get; private set; }
 
+    public TaskSectionAdditionalTimeType Type { get; set; }
     public void UpdateReason(string? reason)
     {
         Reason = reason;
     }
 }
+
+public enum TaskSectionAdditionalTimeType
+{
+    Effective,
+    Ineffective,
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/TaskSection/TaskSectionRevision.cs

@@ -0,0 +1,49 @@
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+
+public class TaskSectionRevision : EntityBase<Guid>
+{
+    public TaskSectionRevision(Guid taskSectionId,
+        string message, long createdByUserId)
+        {
+            TaskSectionId = taskSectionId;
+            Status = RevisionReviewStatus.Pending;
+            Message = message;
+            CreatedByUserId = createdByUserId;
+        }
+    
+    public Guid TaskSectionId { get; private set; }
+
+    public RevisionReviewStatus Status { get; private set; }
+
+
+    public string Message { get; private set; }
+
+    public long CreatedByUserId { get; private set; }
+    
+    public IReadOnlyCollection<TaskRevisionFile> Files => _files;
+    private readonly List<TaskRevisionFile> _files = new();
+
+    public void AddFile(TaskRevisionFile file)
+    {
+        _files.Add(file);
+    }
+    
+}
+public class TaskRevisionFile: EntityBase<Guid>
+{
+    public TaskRevisionFile(Guid fileId)
+    {
+        FileId = fileId;
+    }
+
+    public Guid FileId { get; private set; }
+}
+
+public enum RevisionReviewStatus : short
+{
+    Pending = 1,
+    Reviewed = 2
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/TaskSection/TaskSectionTimeRequest.cs

@@ -0,0 +1,29 @@
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+
+public class TaskSectionTimeRequest:EntityBase<Guid>
+{
+    
+    public TaskSectionTimeRequest(long userId, string description,
+        TimeSpan requestedTime, TaskSectionTimeRequestType requestType,
+        Guid taskSectionId)
+    {
+        UserId = userId;
+        Description = description;
+        RequestedTime = requestedTime;
+        RequestType = requestType;
+        TaskSectionId = taskSectionId;
+        RequestStatus = TaskSectionTimeRequestStatus.Pending;
+    }
+
+    public TaskSection TaskSection { get; set; }
+    public Guid TaskSectionId { get; set; }
+    public long UserId { get; private set; }
+    public string Description { get; private set; }
+    public TimeSpan RequestedTime { get; private set; }
+    public TaskSectionTimeRequestType RequestType { get; private set; }
+    public TaskSectionTimeRequestStatus RequestStatus { get; private set; }
+    
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Enums/TaskSectionTimeRequestStatus.cs

@@ -0,0 +1,8 @@
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+public enum TaskSectionTimeRequestStatus
+{
+    Pending,
+    Accepted,
+    Rejected
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Enums/TaskSectionTimeRequestType.cs

@@ -0,0 +1,8 @@
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+public enum TaskSectionTimeRequestType
+{
+    InitialTime,
+    AdditionalTime,
+    RejectedTime,
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/IPhaseSectionRepository.cs

@@ -1,5 +1,7 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
 using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 public interface IPhaseSectionRepository : IRepository<Guid, PhaseSection>
 {

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/IProjectPhaseRepository.cs

@@ -1,5 +1,6 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/IProjectRepository.cs

@@ -1,5 +1,6 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/IProjectSectionRepository.cs

@@ -1,5 +1,6 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/IProjectTaskRepository.cs

@@ -1,5 +1,6 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
 
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/ITaskSectionActivityRepository.cs

@@ -1,5 +1,6 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/ITaskSectionRepository.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/ITaskSectionRevisionRepository.cs

@@ -0,0 +1,9 @@
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+public interface ITaskSectionRevisionRepository:IRepository<Guid,TaskSectionRevision>
+{
+    
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Repositories/ITaskSectionTimeRequestRepository.cs

@@ -0,0 +1,10 @@
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+public interface ITaskSectionTimeRequestRepository:IRepository<Guid,TaskSectionTimeRequest>
+{
+    
+}

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/SkillAgg/Entities/Skill.cs

@@ -1,5 +1,6 @@
 using GozareshgirProgramManager.Domain._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 
 namespace GozareshgirProgramManager.Domain.SkillAgg.Entities;
 

ProgramManager/src/Domain/GozareshgirProgramManager.Domain/_Common/Exceptions/UnAuthorizedException.cs

@@ -2,7 +2,7 @@
 
 public class UnAuthorizedException:Exception
 {
-    public UnAuthorizedException(string message) : base(message)
+    public UnAuthorizedException(string message="احراز هویت شما منقضی شده است. لطفا دوباره وارد شوید") : base(message)
     {
     }
 }

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/DependencyInjection.cs

@@ -1,7 +1,3 @@
-
-
-
-using FluentValidation;
 using GozareshgirProgramManager.Application._Common.Behaviors;
 using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Application.Services.FileManagement;
@@ -11,10 +7,7 @@ using GozareshgirProgramManager.Domain.CustomerAgg.Repositories;
 using GozareshgirProgramManager.Domain.FileManagementAgg.Repositories;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Domain.RoleAgg.Repositories;
-using GozareshgirProgramManager.Domain.RoleAgg.Repositories;
 using GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Repositories;
-using GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Repositories;
-using GozareshgirProgramManager.Domain.SkillAgg.Repositories;
 using GozareshgirProgramManager.Domain.SkillAgg.Repositories;
 using GozareshgirProgramManager.Domain.TaskChatAgg.Repositories;
 using GozareshgirProgramManager.Domain.UserAgg.Repositories;
@@ -100,7 +93,12 @@ public static class DependencyInjection
         services.AddScoped<JwtTokenGenerator>();
         services.AddScoped<IAuthHelper, AuthHelper>();
 
+        
+        //TaskSection Time Request
+        services.AddScoped<ITaskSectionTimeRequestRepository, TaskSectionTimeRequestRepository>();
 
+        //TaskSection Revision
+        services.AddScoped<ITaskSectionRevisionRepository, TaskSectionRevisionRepository>();
 
         #region ServicesInjection
 

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/20260122100032_Add time Request and Task section revision.cs

@@ -0,0 +1,121 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace GozareshgirProgramManager.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddtimeRequestandTasksectionrevision : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Type",
+                table: "TaskSectionAdditionalTimes",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.CreateTable(
+                name: "TaskSectionRevisions",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TaskSectionId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    Status = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    Message = table.Column<string>(type: "nvarchar(500)", maxLength: 500, nullable: false),
+                    CreatedByUserId = table.Column<long>(type: "bigint", nullable: false),
+                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TaskSectionRevisions", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "TaskSectionTimeRequests",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TaskSectionId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    UserId = table.Column<long>(type: "bigint", nullable: false),
+                    Description = table.Column<string>(type: "nvarchar(1200)", maxLength: 1200, nullable: false),
+                    RequestedTime = table.Column<string>(type: "nvarchar(30)", maxLength: 30, nullable: false),
+                    RequestType = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    RequestStatus = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TaskSectionTimeRequests", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_TaskSectionTimeRequests_TaskSections_TaskSectionId",
+                        column: x => x.TaskSectionId,
+                        principalTable: "TaskSections",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "TaskRevisionFile",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    FileId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TaskSectionRevisionId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TaskRevisionFile", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_TaskRevisionFile_TaskSectionRevisions_TaskSectionRevisionId",
+                        column: x => x.TaskSectionRevisionId,
+                        principalTable: "TaskSectionRevisions",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_TaskRevisionFile_UploadedFiles_FileId",
+                        column: x => x.FileId,
+                        principalTable: "UploadedFiles",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TaskRevisionFile_FileId",
+                table: "TaskRevisionFile",
+                column: "FileId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TaskRevisionFile_TaskSectionRevisionId",
+                table: "TaskRevisionFile",
+                column: "TaskSectionRevisionId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TaskSectionTimeRequests_TaskSectionId",
+                table: "TaskSectionTimeRequests",
+                column: "TaskSectionId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "TaskRevisionFile");
+
+            migrationBuilder.DropTable(
+                name: "TaskSectionTimeRequests");
+
+            migrationBuilder.DropTable(
+                name: "TaskSectionRevisions");
+
+            migrationBuilder.DropColumn(
+                name: "Type",
+                table: "TaskSectionAdditionalTimes");
+        }
+    }
+}

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/AppDbContextModelSnapshot.cs

@@ -227,7 +227,7 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.ToTable("UploadedFiles", (string)null);
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.PhaseSection", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase.PhaseSection", b =>
                 {
                     b.Property<Guid>("Id")
                         .ValueGeneratedOnAdd()
@@ -254,49 +254,7 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.ToTable("PhaseSections");
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .HasColumnType("uniqueidentifier");
-
-                    b.Property<DateTime>("CreationDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Description")
-                        .HasMaxLength(1000)
-                        .HasColumnType("nvarchar(1000)");
-
-                    b.Property<DateTime?>("EndDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<bool>("HasAssignmentOverride")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(200)
-                        .HasColumnType("nvarchar(200)");
-
-                    b.Property<DateTime?>("PlannedEndDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("PlannedStartDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime?>("StartDate")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("Status")
-                        .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Projects", (string)null);
-                });
-
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase.ProjectPhase", b =>
                 {
                     b.Property<Guid>("Id")
                         .HasColumnType("uniqueidentifier");
@@ -348,7 +306,49 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.ToTable("ProjectPhases", (string)null);
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectSection", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(1000)
+                        .HasColumnType("nvarchar(1000)");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<bool>("HasAssignmentOverride")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("nvarchar(200)");
+
+                    b.Property<DateTime?>("PlannedEndDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("PlannedStartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Projects", (string)null);
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project.ProjectSection", b =>
                 {
                     b.Property<Guid>("Id")
                         .HasColumnType("uniqueidentifier");
@@ -374,7 +374,7 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.ToTable("ProjectSections");
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.ProjectTask", b =>
                 {
                     b.Property<Guid>("Id")
                         .HasColumnType("uniqueidentifier");
@@ -433,7 +433,7 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.ToTable("ProjectTasks", (string)null);
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSection", b =>
                 {
                     b.Property<Guid>("Id")
                         .HasColumnType("uniqueidentifier");
@@ -476,7 +476,7 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.ToTable("TaskSections", (string)null);
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionActivity", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSectionActivity", b =>
                 {
                     b.Property<Guid>("Id")
                         .HasColumnType("uniqueidentifier");
@@ -514,7 +514,7 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.ToTable("TaskSectionActivities", (string)null);
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionAdditionalTime", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSectionAdditionalTime", b =>
                 {
                     b.Property<Guid>("Id")
                         .HasColumnType("uniqueidentifier");
@@ -540,6 +540,11 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Property<Guid?>("TaskSectionId")
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
                     b.HasKey("Id");
 
                     b.HasIndex("TaskSectionId");
@@ -547,6 +552,76 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.ToTable("TaskSectionAdditionalTimes", (string)null);
                 });
 
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSectionRevision", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<long>("CreatedByUserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<Guid>("TaskSectionId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TaskSectionRevisions");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSectionTimeRequest", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasMaxLength(1200)
+                        .HasColumnType("nvarchar(1200)");
+
+                    b.Property<string>("RequestStatus")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("RequestType")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("RequestedTime")
+                        .IsRequired()
+                        .HasMaxLength(30)
+                        .HasColumnType("nvarchar(30)");
+
+                    b.Property<Guid>("TaskSectionId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<long>("UserId")
+                        .HasColumnType("bigint");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TaskSectionId");
+
+                    b.ToTable("TaskSectionTimeRequests");
+                });
+
             modelBuilder.Entity("GozareshgirProgramManager.Domain.RoleAgg.Entities.Role", b =>
                 {
                     b.Property<long>("Id")
@@ -792,9 +867,9 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.ToTable("UserRefreshTokens", (string)null);
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.PhaseSection", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase.PhaseSection", b =>
                 {
-                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", "Phase")
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase.ProjectPhase", "Phase")
                         .WithMany("PhaseSections")
                         .HasForeignKey("PhaseId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -810,9 +885,9 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Navigation("Skill");
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase.ProjectPhase", b =>
                 {
-                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", "Project")
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project.Project", "Project")
                         .WithMany("Phases")
                         .HasForeignKey("ProjectId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -821,9 +896,9 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Navigation("Project");
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectSection", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project.ProjectSection", b =>
                 {
-                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", "Project")
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project.Project", "Project")
                         .WithMany("ProjectSections")
                         .HasForeignKey("ProjectId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -839,9 +914,9 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Navigation("Skill");
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.ProjectTask", b =>
                 {
-                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", "Phase")
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase.ProjectPhase", "Phase")
                         .WithMany("Tasks")
                         .HasForeignKey("PhaseId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -850,7 +925,7 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Navigation("Phase");
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSection", b =>
                 {
                     b.HasOne("GozareshgirProgramManager.Domain.SkillAgg.Entities.Skill", "Skill")
                         .WithMany("Sections")
@@ -858,7 +933,7 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", "Task")
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.ProjectTask", "Task")
                         .WithMany("Sections")
                         .HasForeignKey("TaskId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -869,9 +944,9 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Navigation("Task");
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionActivity", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSectionActivity", b =>
                 {
-                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", "Section")
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSection", "Section")
                         .WithMany("Activities")
                         .HasForeignKey("SectionId")
                         .OnDelete(DeleteBehavior.Cascade)
@@ -880,13 +955,61 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Navigation("Section");
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSectionAdditionalTime", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSectionAdditionalTime", b =>
                 {
-                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", null)
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSection", null)
                         .WithMany("AdditionalTimes")
                         .HasForeignKey("TaskSectionId");
                 });
 
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSectionRevision", b =>
+                {
+                    b.OwnsMany("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskRevisionFile", "Files", b1 =>
+                        {
+                            b1.Property<Guid>("Id")
+                                .HasColumnType("uniqueidentifier");
+
+                            b1.Property<DateTime>("CreationDate")
+                                .HasColumnType("datetime2");
+
+                            b1.Property<Guid>("FileId")
+                                .HasColumnType("uniqueidentifier");
+
+                            b1.Property<Guid>("TaskSectionRevisionId")
+                                .HasColumnType("uniqueidentifier");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("FileId");
+
+                            b1.HasIndex("TaskSectionRevisionId");
+
+                            b1.ToTable("TaskRevisionFile");
+
+                            b1.HasOne("GozareshgirProgramManager.Domain.FileManagementAgg.Entities.UploadedFile", null)
+                                .WithMany()
+                                .HasForeignKey("FileId")
+                                .OnDelete(DeleteBehavior.Restrict)
+                                .IsRequired();
+
+                            b1.WithOwner()
+                                .HasForeignKey("TaskSectionRevisionId");
+                        });
+
+                    b.Navigation("Files");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSectionTimeRequest", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSection", "TaskSection")
+                        .WithMany()
+                        .HasForeignKey("TaskSectionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("TaskSection");
+                });
+
             modelBuilder.Entity("GozareshgirProgramManager.Domain.RoleAgg.Entities.Role", b =>
                 {
                     b.OwnsMany("GozareshgirProgramManager.Domain.PermissionAgg.Entities.Permission", "Permissions", b1 =>
@@ -1031,26 +1154,26 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project", b =>
-                {
-                    b.Navigation("Phases");
-
-                    b.Navigation("ProjectSections");
-                });
-
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase.ProjectPhase", b =>
                 {
                     b.Navigation("PhaseSections");
 
                     b.Navigation("Tasks");
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project.Project", b =>
+                {
+                    b.Navigation("Phases");
+
+                    b.Navigation("ProjectSections");
+                });
+
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.ProjectTask", b =>
                 {
                     b.Navigation("Sections");
                 });
 
-            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.TaskSection", b =>
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection.TaskSection", b =>
                 {
                     b.Navigation("Activities");
 

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Context/ProgramManagerDbContext.cs

@@ -5,6 +5,10 @@ using GozareshgirProgramManager.Application._Common.Interfaces;
 using GozareshgirProgramManager.Domain.CustomerAgg;
 using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.RoleAgg.Entities;
 using GozareshgirProgramManager.Domain.RoleUserAgg;
 using GozareshgirProgramManager.Domain.SalaryPaymentSettingAgg.Entities;
@@ -49,6 +53,12 @@ public class ProgramManagerDbContext : DbContext, IProgramManagerDbContext
     // Task Chat
     public DbSet<TaskChatMessage> TaskChatMessages { get; set; } = null!;
     
+    //Task Section Time Request
+    public DbSet<TaskSectionTimeRequest> TaskSectionTimeRequests { get; set; }
+    
+    // Task Section Revision
+    public DbSet<TaskSectionRevision>  TaskSectionRevisions { get; set; }
+    
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder.ApplyConfigurationsFromAssembly(typeof(ProgramManagerDbContext).Assembly);

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/AdditionalTimeMapping.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/PhaseSectionMapping.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/ProjectMapping.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/ProjectPhaseMapping.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/ProjectSectionMapping.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/ProjectTaskMapping.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;
 using Microsoft.EntityFrameworkCore;

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/TaskSectionActivityMapping.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/TaskSectionAdditionalTimeMapping.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
@@ -33,6 +34,9 @@ public class TaskSectionAdditionalTimeMapping : IEntityTypeConfiguration<TaskSec
         builder.Property(at => at.CreationDate)
             .IsRequired();
 
+        builder.Property(x=>x.Type)
+            .HasConversion<string>()
+            .HasMaxLength(50);
         // Ignore domain events
         builder.Ignore(at => at.DomainEvents);
     }

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/TaskSectionMapping.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;
 using Microsoft.EntityFrameworkCore;

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/TaskSectionRevisionMapping.cs

@@ -0,0 +1,34 @@
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace GozareshgirProgramManager.Infrastructure.Persistence.Mappings;
+
+public class TaskSectionRevisionMapping:IEntityTypeConfiguration<TaskSectionRevision>
+{
+    public void Configure(EntityTypeBuilder<TaskSectionRevision> builder)
+    {
+        builder.HasKey(x => x.Id);
+
+        builder.Property(x => x.Id)
+            .ValueGeneratedNever();
+
+        builder.Property(x => x.Status).HasConversion<string>()
+            .HasMaxLength(50);
+
+        builder.Property(x => x.Message).HasMaxLength(500);
+
+        builder.OwnsMany(x => x.Files, file =>
+        {
+            file.HasKey(x => x.Id);
+            file.Property(x => x.Id).ValueGeneratedNever();
+
+            file.HasOne<UploadedFile>()
+                .WithMany()
+                .HasForeignKey(x => x.FileId)
+                .IsRequired()
+                .OnDelete(DeleteBehavior.Restrict);
+        });
+    }
+}

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/TaskSectionTimeRequestMapping.cs

@@ -0,0 +1,33 @@
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using GozareshgirProgramManager.Infrastructure.Persistence._Common;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace GozareshgirProgramManager.Infrastructure.Persistence.Mappings;
+
+public class TaskSectionTimeRequestMapping:IEntityTypeConfiguration<TaskSectionTimeRequest>
+{
+    public void Configure(EntityTypeBuilder<TaskSectionTimeRequest> builder)
+    {
+        builder.HasKey(x => x.Id);
+
+        builder.Property(x => x.Id)
+            .ValueGeneratedNever();
+        
+        builder.Property(x => x.RequestStatus).
+            HasConversion<string>().HasMaxLength(50);
+        
+        builder.Property(x=>x.RequestType).
+            HasConversion<string>().HasMaxLength(50);
+
+        builder.Property(x => x.RequestedTime)
+            .HasTimeSpanConversion();
+        
+        builder.Property(x=>x.Description)
+            .HasMaxLength(1200);
+        
+        builder.HasOne(x=>x.TaskSection)
+            .WithMany().HasForeignKey(x=>x.TaskSectionId);
+        
+    }
+}

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/PhaseSectionRepository.cs

@@ -1,6 +1,7 @@
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using GozareshgirProgramManager.Infrastructure.Persistence.Context;
 
 namespace GozareshgirProgramManager.Infrastructure.Persistence.Repositories;

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/ProjectPhaseRepository.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Phase;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/ProjectRepository.cs

@@ -1,5 +1,6 @@
 
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/ProjectSectionRepository.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Project;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;
 using GozareshgirProgramManager.Infrastructure.Persistence.Context;

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/ProjectTaskRepository.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/TaskSectionActivityRepository.cs

@@ -1,6 +1,7 @@
 using GozareshgirProgramManager.Application.Modules.Projects.DTOs;
 using GozareshgirProgramManager.Application.Modules.Projects.Extensions;
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;
 using GozareshgirProgramManager.Infrastructure.Persistence.Context;

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/TaskSectionRepository.cs

@@ -1,4 +1,5 @@
 using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
 using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
 using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
 using GozareshgirProgramManager.Infrastructure.Persistence._Common;

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/TaskSectionRevisionRepository.cs

@@ -0,0 +1,16 @@
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+using GozareshgirProgramManager.Infrastructure.Persistence._Common;
+using GozareshgirProgramManager.Infrastructure.Persistence.Context;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Infrastructure.Persistence.Repositories;
+
+public class TaskSectionRevisionRepository:RepositoryBase<Guid,TaskSectionRevision>,ITaskSectionRevisionRepository
+{
+    private readonly ProgramManagerDbContext _programManagerDbContext;
+    public TaskSectionRevisionRepository(ProgramManagerDbContext programManagerDbContext) : base(programManagerDbContext)
+    {
+        _programManagerDbContext = programManagerDbContext;
+    }
+}

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Repositories/TaskSectionTimeRequestRepository.cs

@@ -0,0 +1,16 @@
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+using GozareshgirProgramManager.Infrastructure.Persistence._Common;
+using GozareshgirProgramManager.Infrastructure.Persistence.Context;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Infrastructure.Persistence.Repositories;
+
+public class TaskSectionTimeRequestRepository:RepositoryBase<Guid,TaskSectionTimeRequest>,ITaskSectionTimeRequestRepository
+{
+    private readonly ProgramManagerDbContext _context;
+    public TaskSectionTimeRequestRepository(ProgramManagerDbContext context) : base(context)
+    {
+        _context = context;
+    }
+}

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

@@ -0,0 +1,33 @@
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Commands.CreateTaskSectionRevision;
+using GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Queries.TaskRevisionsByTaskSectionId;
+using MediatR;
+using Microsoft.AspNetCore.Mvc;
+using ServiceHost.BaseControllers;
+
+namespace ServiceHost.Areas.Admin.Controllers.ProgramManager;
+
+public class TaskSectionRevisionController:ProgramManagerBaseController
+{
+    private readonly IMediator _mediator;
+
+    public TaskSectionRevisionController(IMediator mediator)
+    {
+        _mediator = mediator;
+    }
+    
+    [HttpPost]
+    public async Task<ActionResult<OperationResult>> CreateTaskRevision([FromForm]CreateTaskSectionRevisionCommand command)
+    {
+        var res =await _mediator.Send(command);
+        return Ok(res);
+    }
+
+    [HttpGet()]
+    public async Task<ActionResult<OperationResult<TaskRevisionsByTaskSectionIdResponse>>> GetRevisionsBySectionId(
+        TaskRevisionsByTaskSectionIdQuery query)
+    {
+        var res = await _mediator.Send(query);
+        return res;
+    } 
+}

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

@@ -0,0 +1,48 @@
+using System.Runtime.InteropServices;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.TaskSectionTimeRequests.Commands.CreateTimeRequest;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using MediatR;
+using Microsoft.AspNetCore.Mvc;
+using ServiceHost.BaseControllers;
+
+namespace ServiceHost.Areas.Admin.Controllers.ProgramManager;
+
+public class TimeRequestController:ProgramManagerBaseController
+{
+    private readonly IMediator _mediator;
+
+    public TimeRequestController(IMediator mediator)
+    {
+        _mediator = mediator;
+    }
+
+    [HttpPost("Rejected")]
+    public async Task<ActionResult<OperationResult>> CreateRejectedTimeRequest(CreateTimeRequest request)
+    {
+        var command = new CreateTimeRequestCommand(request.Hours, request.Minutes, request.Description,
+            TaskSectionTimeRequestType.RejectedTime,request.TaskSectionId);
+        var res = await _mediator.Send(command);
+        return res;
+    }
+    
+    [HttpPost("Initial")]
+    public async Task<ActionResult<OperationResult>> CreateInitialTimeRequest(CreateTimeRequest request)
+    {
+        var command = new CreateTimeRequestCommand(request.Hours, request.Minutes, request.Description,
+            TaskSectionTimeRequestType.InitialTime,request.TaskSectionId);
+        var res = await _mediator.Send(command);
+        return res;
+    }
+    
+    [HttpPost("Additional")]
+    public async Task<ActionResult<OperationResult>> CreateAdditionalTimeRequest(CreateTimeRequest request)
+    {
+        var command = new CreateTimeRequestCommand(request.Hours, request.Minutes, request.Description,
+            TaskSectionTimeRequestType.AdditionalTime,request.TaskSectionId);
+        var res = await _mediator.Send(command);
+        return res;
+    }
+}
+
+public record CreateTimeRequest(int Hours, int Minutes, string Description,Guid TaskSectionId);

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

@@ -0,0 +1,25 @@
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList;
+using MediatR;
+using Microsoft.AspNetCore.Mvc;
+using ServiceHost.BaseControllers;
+
+namespace ServiceHost.Areas.Admin.Controllers.ProgramManager;
+
+public class WorkflowController:ProgramManagerBaseController
+{
+    private readonly IMediator _mediator;
+
+    public WorkflowController(IMediator mediator)
+    {
+        _mediator = mediator;
+    }
+
+    [HttpGet]
+    public async Task<ActionResult<OperationResult<WorkflowListResponse>>> Get(WorkflowListQuery query)
+    {
+        var res = await _mediator.Send(query);
+        return res;
+    }
+    
+}

WorkFlow/Application/WorkFlow.Application/WorkFlowApplication.cs

@@ -87,9 +87,7 @@ public class WorkFlowApplication : IWorkFlowApplication
     {
         return (await GetRollCallWorkFlowsCutByBgService(workshopId)).Count;
     }
-
-
-
+    
     public async Task<int> GetAllWorkFlowCount(long workshopId, long accountId)
     {
         var count = 0;
@@ -434,7 +432,7 @@ public class WorkFlowApplication : IWorkFlowApplication
         var lastCheckouts = _checkoutACL.GetLastCheckoutsByWorkshopIdForWorkFlow(workshopId, twoMonthsAgo, now);
         List<DailyRollCallWorkFlowViewModel> rollCalls = _rollCallACL.GetUndefinedRollCalls(workshopId, twoMonthsAgo, now.AddDays(-1).Date);
         var activeEmployees = _rollCallACL.GetActiveWorkshopRollCallEmployees(workshopId, twoMonthsAgo, now);
-        return rollCalls.Select(x => new DailyRollCallWorkFlowViewModel()
+        var res= rollCalls.Select(x => new DailyRollCallWorkFlowViewModel()
         {
             DateTime = x.DateTime,
             DateTimeFa = x.DateTimeFa,
@@ -447,6 +445,8 @@ public class WorkFlowApplication : IWorkFlowApplication
     .ToList(),
             DayOfWeekFa = x.DateTime.DayOfWeek.DayOfWeeKToPersian()
         }).Where(y => y.RollCallWorkFlowPerDayViewModels != null && y.RollCallWorkFlowPerDayViewModels.Any()).OrderBy(x => x.DateTime).ToList();
+        
+        return res;
     }
 
     /// <summary>
@@ -757,7 +757,7 @@ public class WorkFlowApplication : IWorkFlowApplication
 
         var entites = _rollCallConfirmedWithoutLunchBreakRepository.GetByWorkshopId(workshopId, twoMonthsAgo, now).ToList();
 
-        return employeeWithoutBreakTimeAndNotSliced.Where(x => !entites.Any(y => y.RollCallId == x.RollCallId))
+        var res =  employeeWithoutBreakTimeAndNotSliced.Where(x => !entites.Any(y => y.RollCallId == x.RollCallId))
             .GroupBy(x => x.RollCallDate.Date).OrderBy(x => x.Key).Select(x => new DailyRollCallConfirmedWithoutLunchBreakViewModel
             {
                 DateGr = x.Key.Date,
@@ -770,6 +770,7 @@ public class WorkFlowApplication : IWorkFlowApplication
                     RollCallId = y.RollCallId,
                 }).ToList()
             }).ToList();
+        return res;
 
     }