add initial migration for BugSection and BugDocuments tables

# Conflicts:
#	ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/AppDbContextModelSnapshot.cs

.gitignore

@@ -368,3 +368,6 @@ MigrationBackup/
 # Storage folder - ignore all uploaded files, thumbnails, and temporary files
 ServiceHost/Storage
 
+.env
+.env.*
+

0_Framework/Application/StaticWorkshopAccounts.cs

@@ -31,8 +31,9 @@ public static class StaticWorkshopAccounts
     /// 381 - مهدی قربانی
     /// 392 - عمار حسن دوست
     /// 20 - سمیرا الهی نیا
+    /// 322 - ماهان چمنی
     /// </summary>
-    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20, 476];
+    public static List<long> StaticAccountIds = [2, 3, 380, 381, 392, 20, 476,322];
 
     /// <summary>
     /// این تاریخ در جدول اکانت لفت ورک به این معنیست

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
 
 }

Directory.Build.props

@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <NuGetAudit>false</NuGetAudit>
+  </PropertyGroup>
+</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/CreateBugSection/CreateBugSectionCommandHandler.cs

@@ -0,0 +1,81 @@
+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._Common.Exceptions;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Repositories;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+using Microsoft.AspNetCore.Http;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Commands.CreateBugSection;
+
+public class CreateBugSectionCommandHandler : IBaseCommandHandler<CreateBugSectionCommand>
+{
+    readonly IUnitOfWork _unitOfWork;
+    readonly IBugSectionRepository _bugSectionRepository;
+    readonly IFileUploadService _fileUploadService;
+    private readonly IAuthHelper _authHelper;
+
+    public CreateBugSectionCommandHandler(IUnitOfWork unitOfWork, IBugSectionRepository bugSectionRepository,
+      IAuthHelper authHelper, IFileUploadService fileUploadService)
+    {
+        _unitOfWork = unitOfWork;
+        _bugSectionRepository = bugSectionRepository;
+
+        _authHelper = authHelper;
+        _fileUploadService = fileUploadService;
+    }
+
+    public async Task<OperationResult> Handle(CreateBugSectionCommand request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()
+                            ?? throw new UnAuthorizedException("کاربر احراز هویت نشده است");
+
+        #region Validation
+        if (_bugSectionRepository.Exists(x => x.TaskId == request.TaskId))
+            return OperationResult.Failure("برای این بخش قبلا تسک باگ ایجاد شده است");
+
+        if (string.IsNullOrWhiteSpace(request.InitialDescription))
+            return OperationResult.Failure("توضیحات باگ خالی است");
+
+        if (request.OriginalAssignedUserId == 0)
+            return OperationResult.Failure("کاربر انتخاب نشده است"); 
+        #endregion
+
+        var bug = new BugSection(request.TaskId, request.InitialDescription, request.OriginalAssignedUserId,
+            request.Priority);
+        await _bugSectionRepository.CreateAsync(bug);
+     
+        if (request.Files.Any())
+        {
+            foreach (var file in request.Files)
+            {
+                var uploadedFile = await _fileUploadService.UploadFileAsync
+                (
+                    file,
+                    FileCategory.BugSection,
+                    currentUserId
+                );
+                if (!uploadedFile.IsSuccess)
+                {
+                    return OperationResult.Failure(uploadedFile.ErrorMessage ?? "خطا در آپلود فایل");
+                }
+                bug.AddDocument(new BugDocument(uploadedFile.FileId!.Value));
+
+            }
+        }
+
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        return OperationResult.Success(); 
+    }
+
+
+}
+
+public record CreateBugSectionCommand(Guid TaskId, string InitialDescription, long OriginalAssignedUserId, ProjectTaskPriority Priority, List<IFormFile> Files) : IBaseCommand;
+

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/GetBugModalDetails/GetBugModalDetailsQueryHandler.cs

@@ -0,0 +1,29 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.GetBugModalDetails;
+
+public class GetBugModalDetailsQueryHandler : IBaseQueryHandler<GetBugModalDetailsQuery, GetBugModalDetailsResponse>
+{
+    private readonly IProgramManagerDbContext _context;
+
+    public GetBugModalDetailsQueryHandler(IProgramManagerDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<OperationResult<GetBugModalDetailsResponse>> Handle(GetBugModalDetailsQuery request, CancellationToken cancellationToken)
+    {
+        var projectTask =await _context.ProjectTasks.Include(ph=>ph.Phase).ThenInclude(p=>p.Project).FirstOrDefaultAsync(x=>x.Id == request.TaskId);
+        if(projectTask == null)
+            return OperationResult<GetBugModalDetailsResponse>.NotFound("بخش یافت نشد");
+
+        var response = new GetBugModalDetailsResponse(projectTask.Name,projectTask.Phase.Name, projectTask.Phase.Project.Name);
+        return OperationResult<GetBugModalDetailsResponse>.Success(response);
+    }
+}
+
+public record GetBugModalDetailsQuery(Guid TaskId) : IBaseQuery<GetBugModalDetailsResponse>;
+
+public record GetBugModalDetailsResponse(string TaskName, string PhaseName, string ProjectName);

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/Commands/SendMessage/SendMessageCommand.cs

@@ -28,26 +28,25 @@ public class SendMessageCommandHandler : IBaseCommandHandler<SendMessageCommand,
     private readonly ITaskChatMessageRepository _messageRepository;
     private readonly IUploadedFileRepository _fileRepository;
     private readonly IProjectTaskRepository _taskRepository;
-    private readonly IFileStorageService _fileStorageService;
-    private readonly IThumbnailGeneratorService _thumbnailService;
+    private readonly IFileUploadService _fileUploadService;
     private readonly IAuthHelper _authHelper;
 
     public SendMessageCommandHandler(
         ITaskChatMessageRepository messageRepository,
         IUploadedFileRepository fileRepository,
-        IProjectTaskRepository taskRepository,
-        IFileStorageService fileStorageService,
-        IThumbnailGeneratorService thumbnailService, IAuthHelper authHelper)
+        IProjectTaskRepository taskRepository, 
+        IAuthHelper authHelper,
+        IFileUploadService fileUploadService)
     {
         _messageRepository = messageRepository;
         _fileRepository = fileRepository;
         _taskRepository = taskRepository;
-        _fileStorageService = fileStorageService;
-        _thumbnailService = thumbnailService;
         _authHelper = authHelper;
+        _fileUploadService = fileUploadService;
     }
 
-    public async Task<OperationResult<MessageDto>> Handle(SendMessageCommand request, CancellationToken cancellationToken)
+    public async Task<OperationResult<MessageDto>> Handle(SendMessageCommand request,
+        CancellationToken cancellationToken)
     {
         var currentUserId = _authHelper.GetCurrentUserId()
                             ?? throw new UnAuthorizedException("کاربر احراز هویت نشده است");
@@ -57,75 +56,21 @@ public class SendMessageCommandHandler : IBaseCommandHandler<SendMessageCommand,
         {
             return OperationResult<MessageDto>.NotFound("تسک یافت نشد");
         }
-        
+
         Guid? uploadedFileId = null;
         if (request.File != null)
         {
-            if (request.File.Length == 0)
-            {
-                return OperationResult<MessageDto>.ValidationError("فایل خالی است");
-            }
-
-            const long maxFileSize = 100 * 1024 * 1024;
-            if (request.File.Length > maxFileSize)
-            {
-                return OperationResult<MessageDto>.ValidationError("حجم فایل بیش از حد مجاز است (حداکثر 100MB)");
-            }
-
-            var fileType = DetectFileType(request.File.ContentType, Path.GetExtension(request.File.FileName));
-
-            var uploadedFile = new UploadedFile(
-                originalFileName: request.File.FileName,
-                fileSizeBytes: request.File.Length,
-                mimeType: request.File.ContentType,
-                fileType: fileType,
-                category: FileCategory.TaskChatMessage,
-                uploadedByUserId: currentUserId,
-                storageProvider: StorageProvider.LocalFileSystem
+           var uploadedFile =  await _fileUploadService.UploadFileAsync
+            (
+                request.File,
+                FileCategory.TaskChatMessage,
+                currentUserId
             );
-
-            await _fileRepository.AddAsync(uploadedFile);
-            await _fileRepository.SaveChangesAsync();
-
-            try
+            if (!uploadedFile.IsSuccess)
             {
-                using var stream = request.File.OpenReadStream();
-                var uploadResult = await _fileStorageService.UploadAsync(
-                    stream,
-                    uploadedFile.UniqueFileName,
-                    "TaskChatMessage"
-                );
-
-                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: "TaskChatMessage");
-                    if (thumbnail.HasValue)
-                    {
-                        uploadedFile.SetThumbnail(thumbnail.Value.ThumbnailUrl);
-                    }
-                }
-
-                await _fileRepository.UpdateAsync(uploadedFile);
-                await _fileRepository.SaveChangesAsync();
-
-                uploadedFileId = uploadedFile.Id;
-            }
-            catch (Exception ex)
-            {
-                await _fileRepository.DeleteAsync(uploadedFile);
-                await _fileRepository.SaveChangesAsync();
-
-                return OperationResult<MessageDto>.ValidationError($"خطا در آپلود فایل: {ex.Message}");
+                return OperationResult<MessageDto>.Failure(uploadedFile.ErrorMessage ?? "خطا در آپلود فایل");
             }
+            uploadedFileId = uploadedFile.FileId!.Value;
         }
 
         var message = new TaskChatMessage(
@@ -209,4 +154,4 @@ public class SendMessageCommandHandler : IBaseCommandHandler<SendMessageCommand,
 
         return FileType.Document;
     }
-}
+}

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/Commands/CreateTaskSectionRevision/CreateTaskSectionRevisionValidator.cs

@@ -0,0 +1,14 @@
+using FluentValidation;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Commands.CreateTaskSectionRevision;
+
+public class CreateTaskSectionRevisionValidator:AbstractValidator<CreateTaskSectionRevisionCommand>
+{
+    public CreateTaskSectionRevisionValidator()
+    {
+        RuleFor(x=>x.Message)
+            .NotEmpty()
+            .WithMessage("توضیحات اجباری است");
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionRevision/Commands/SetStatusReviewedRevision/SetStatusReviewedRevisionCommand.cs

@@ -0,0 +1,35 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Repositories;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Commands.SetStatusReviewedRevision;
+
+public record SetStatusReviewedRevisionCommand(Guid TaskSectionId):IBaseCommand;
+
+public class SetStatusReviewedRevisionCommandHandler : IBaseCommandHandler<SetStatusReviewedRevisionCommand>
+{
+    private readonly ITaskSectionRevisionRepository _revisionRepository;
+    private readonly IUnitOfWork _unitOfWork;
+
+    public SetStatusReviewedRevisionCommandHandler(ITaskSectionRevisionRepository revisionRepository, IUnitOfWork unitOfWork)
+    {
+        _revisionRepository = revisionRepository;
+        _unitOfWork = unitOfWork;
+    }
+
+    public async Task<OperationResult> Handle(SetStatusReviewedRevisionCommand request, CancellationToken cancellationToken)
+    {
+        var taskSectionRevisions = await _revisionRepository.GetByTaskSectionId(request.TaskSectionId);
+        if (taskSectionRevisions == null || taskSectionRevisions.Count == 0)
+            return OperationResult.NotFound("اصلاحی برای این بخش یافت نشد");
+
+        foreach (var revision in taskSectionRevisions)
+        {
+            revision.MarkReviewed();
+        }
+
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        return OperationResult.Success();
+    }
+}

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

@@ -0,0 +1,92 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+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 taskSectionEntity = await _dbContext.TaskSections
+            .Include(x=>x.Task)
+            .ThenInclude(x => x.Phase)
+            .ThenInclude(x => x.Project)
+            .FirstOrDefaultAsync(x => x.Id == request.TaskSectionId,
+                cancellationToken: cancellationToken);
+        
+        if (taskSectionEntity == 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 skill = await _dbContext.Skills.FirstOrDefaultAsync(x => x.Id == taskSectionEntity.SkillId,
+            cancellationToken: cancellationToken);
+        
+        if (skill == null)
+            return OperationResult<TaskRevisionsByTaskSectionIdResponse>.NotFound("مهارت مورد نظر یافت نشد");
+
+
+        var user =await _dbContext.Users.FirstOrDefaultAsync(x => x.Id == taskSectionEntity.CurrentAssignedUserId,
+            cancellationToken: cancellationToken);
+        if (user == null)
+            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,$"{x.CreationDate.ToFarsi()} {x.CreationDate:HH:mm}");
+        }).ToList();
+
+        var res = new TaskRevisionsByTaskSectionIdResponse(resItems, taskSectionEntity.Task.Phase.Project.Name,
+            taskSectionEntity.Task.Phase.Name, taskSectionEntity.Task.Name,
+            skill.Name,
+            user.FullName
+            );
+        
+        return OperationResult<TaskRevisionsByTaskSectionIdResponse>.Success(res);
+    }
+}

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

@@ -0,0 +1,16 @@
+using GozareshgirProgramManager.Application._Common.Models;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Queries.TaskRevisionsByTaskSectionId;
+
+public record TaskRevisionsByTaskSectionIdResponse(
+    List<TaskRevisionsByTaskSectionIdItem> Items,
+    string ProjectName,
+    string PhaseName,
+    string TaskName,
+    string SkillName,
+    string UserName);
+    
+    
+public record TaskRevisionsByTaskSectionIdItem(string Message, List<TaskRevisionsByTaskSectionIdItemFile> Files,string CreationDate);
+
+public class TaskRevisionsByTaskSectionIdItemFile:UploadedFileDto;

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

@@ -0,0 +1,56 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+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;
+    private readonly IUnitOfWork _unitOfWork;
+    public AcceptTimeRequestCommandHandler(ITaskSectionTimeRequestRepository timeRequestRepository, ITaskSectionRepository taskSectionRepository, IUnitOfWork unitOfWork)
+    {
+        _timeRequestRepository = timeRequestRepository;
+        _taskSectionRepository = taskSectionRepository;
+        _unitOfWork = unitOfWork;
+    }
+
+    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.RequestStatus == TaskSectionTimeRequestStatus.Accepted)
+        {
+            return OperationResult.Failure("این درخواست قبلا تایید شده است");
+        }
+        
+        // تایید درخواست زمان
+        timeRequest.AcceptTimeRequest();
+        
+        // اضافه کردن زمان به TaskSection
+        var totalMinutes = (request.Hour * 60) + request.Minute;
+        var additionalTime = TimeSpan.FromMinutes(totalMinutes);
+        taskSection.AddAdditionalTime(additionalTime, request.TimeType, timeRequest.Description);
+        
+        await _unitOfWork.SaveChangesAsync(cancellationToken);
+        return OperationResult.Success();
+
+    }
+}

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/TaskSectionTimeRequests/Queries/CreateTimeRequestDetails/CreateTimeRequestDetailsQuery.cs

@@ -0,0 +1,49 @@
+using GozareshgirProgramManager.Application._Common.Extensions;
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.TaskSectionTimeRequests.Queries.CreateTimeRequestDetails;
+
+public record CreateTimeRequestDetailsResponse(List<CreateTimeRequestDetailsRevision> Revisions);
+
+public record CreateTimeRequestDetailsRevision(string Message, List<UploadedFileDto> Files);
+
+public record CreateTimeRequestDetailsQuery(Guid TaskSectionId) : IBaseQuery<CreateTimeRequestDetailsResponse>;
+
+public class
+    CreateTimeRequestDetailsQueryHandler : IBaseQueryHandler<CreateTimeRequestDetailsQuery,
+    CreateTimeRequestDetailsResponse>
+{
+    private readonly IProgramManagerDbContext _context;
+
+    public CreateTimeRequestDetailsQueryHandler(IProgramManagerDbContext context)
+    {
+        _context = context;
+    }
+
+    public async Task<OperationResult<CreateTimeRequestDetailsResponse>> Handle(CreateTimeRequestDetailsQuery request,
+        CancellationToken cancellationToken)
+    {
+        var revisions = await _context.TaskSectionRevisions.Where(x =>
+            x.TaskSectionId == request.TaskSectionId && x.Status == RevisionReviewStatus.Pending).ToListAsync(cancellationToken: cancellationToken);
+
+        var fileIds = revisions.SelectMany(x => x.Files)
+            .Select(x => x.Id).ToList();
+
+        var files =await _context.UploadedFiles
+            .Where(x => fileIds.Contains(x.Id)).ToListAsync(cancellationToken: cancellationToken);
+
+        var resItem = revisions.Select(x =>
+        {
+            var selectFileIds = x.Files.Select(f => f.FileId).ToList();
+            var filesDto = files.Where(f => selectFileIds.Contains(f.Id))
+                .Select(f => f.ToDto()).ToList();
+            return new CreateTimeRequestDetailsRevision(x.Message, filesDto);
+        }).ToList();
+        var res = new CreateTimeRequestDetailsResponse(resItem);
+
+        return OperationResult<CreateTimeRequestDetailsResponse>.Success(res);
+    }
+}

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

@@ -0,0 +1,11 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList;
+
+namespace GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList;
+
+public interface IWorkflowProvider
+{
+    WorkflowType Type { get; }
+    Task<List<WorkflowListItem>> GetItems(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken);
+    Task<int> GetCount(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken);
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Workflows/Queries/WorkflowList/Providers/BugSectionWorkflowProvider.cs

@@ -0,0 +1,32 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList.Providers;
+
+public class BugSectionWorkflowProvider : IWorkflowProvider
+{
+    public WorkflowType Type => WorkflowType.BugSection;
+    public async Task<List<WorkflowListItem>> GetItems(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken)
+    {
+        var bugs =context.BugSections
+            .Where(b=>b.Status == TaskSectionStatus.ReadyToStart)
+            .Include(x => x.ProjectTask).AsNoTracking();
+
+        return await bugs.Select(x => new WorkflowListItem
+        {
+            EntityId = x.Id,
+            Title = x.ProjectTask.Name,
+            Type = WorkflowType.BugSection
+        }).ToListAsync(cancellationToken);
+    
+    }
+
+    public async Task<int> GetCount(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken)
+    {
+        var query = context.BugSections
+            .Where(b => b.Status == TaskSectionStatus.ReadyToStart);
+
+        return await query.CountAsync(cancellationToken);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Workflows/Queries/WorkflowList/Providers/NotAssignedWorkflowProvider.cs

@@ -0,0 +1,31 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList.Providers;
+
+public class NotAssignedWorkflowProvider : IWorkflowProvider
+{
+    public WorkflowType Type => WorkflowType.NotAssigned;
+
+    public async Task<List<WorkflowListItem>> GetItems(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken)
+    {
+        // Assuming 0 means unassigned in CurrentAssignedUserId
+        var sections = await context.TaskSections
+            .Where(x => x.CurrentAssignedUserId == 0)
+            .ToListAsync(cancellationToken);
+
+        return sections.Select(ts => new WorkflowListItem
+        {
+            EntityId = ts.Id,
+            Title = "تخصیص‌ نیافته",
+            Type = WorkflowType.NotAssigned
+        }).ToList();
+    }
+
+    public async Task<int> GetCount(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken)
+    {
+        return await context.TaskSections
+            .Where(x => x.CurrentAssignedUserId == 0)
+            .CountAsync(cancellationToken);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Workflows/Queries/WorkflowList/Providers/RejectedRevisionsWorkflowProvider.cs

@@ -0,0 +1,41 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using Microsoft.EntityFrameworkCore;
+
+namespace GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList.Providers;
+
+public class RejectedRevisionsWorkflowProvider : IWorkflowProvider
+{
+    public WorkflowType Type => WorkflowType.Rejected;
+
+    public async Task<List<WorkflowListItem>> GetItems(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken)
+    {
+        var query = from revision in context.TaskSectionRevisions
+                        .Where(x => x.Status == RevisionReviewStatus.Pending)
+                    join taskSection in context.TaskSections
+                        on revision.TaskSectionId equals taskSection.Id
+                    where taskSection.CurrentAssignedUserId == currentUserId
+                    select taskSection;
+
+        var sections = await query.ToListAsync(cancellationToken);
+
+        return sections.Select(ts => new WorkflowListItem
+        {
+            EntityId = ts.Id,
+            Title = "برگشت از سمت مدیر",
+            Type = WorkflowType.Rejected
+        }).ToList();
+    }
+
+    public async Task<int> GetCount(long currentUserId, IProgramManagerDbContext context, CancellationToken cancellationToken)
+    {
+        var query = from revision in context.TaskSectionRevisions
+                        .Where(x => x.Status == RevisionReviewStatus.Pending)
+                    join taskSection in context.TaskSections
+                        on revision.TaskSectionId equals taskSection.Id
+                    where taskSection.CurrentAssignedUserId == currentUserId
+                    select revision.Id;
+
+        return await query.CountAsync(cancellationToken);
+    }
+}

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

@@ -0,0 +1,50 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList.Providers;
+
+namespace GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList;
+
+public record WorkflowCountResponse(int Total, int Rejected, int NotAssigned, int PendingForApproval);
+
+public record WorkflowCountQuery() : IBaseQuery<WorkflowCountResponse>;
+
+public class WorkflowCountQueryHandler : IBaseQueryHandler<WorkflowCountQuery, WorkflowCountResponse>
+{
+    private readonly IProgramManagerDbContext _context;
+    private readonly IAuthHelper _authHelper;
+    private readonly IEnumerable<IWorkflowProvider> _providers;
+
+    public WorkflowCountQueryHandler(IProgramManagerDbContext context, IAuthHelper authHelper, IEnumerable<IWorkflowProvider> providers)
+    {
+        _context = context;
+        _authHelper = authHelper;
+        _providers = providers;
+    }
+
+    public async Task<OperationResult<WorkflowCountResponse>> Handle(WorkflowCountQuery request, CancellationToken cancellationToken)
+    {
+        long currentUserId = _authHelper.GetCurrentUserId()!.Value;
+
+        int rejectedCount = 0;
+        int notAssignedCount = 0;
+        int pendingForApprovalCount = 0;
+
+        foreach (var provider in _providers)
+        {
+            var count = await provider.GetCount(currentUserId, _context, cancellationToken);
+            switch (provider.Type)
+            {
+                case WorkflowType.Rejected:
+                    rejectedCount += count; break;
+                case WorkflowType.NotAssigned:
+                    notAssignedCount += count; break;
+                case WorkflowType.PendingForApproval:
+                    pendingForApprovalCount += count; break;
+            }
+        }
+
+        var total = rejectedCount + notAssignedCount + pendingForApprovalCount;
+        var response = new WorkflowCountResponse(total, rejectedCount, notAssignedCount, pendingForApprovalCount);
+        return OperationResult<WorkflowCountResponse>.Success(response);
+    }
+}

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

@@ -0,0 +1,56 @@
+using GozareshgirProgramManager.Application._Common.Interfaces;
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection;
+using GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList.Providers;
+
+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,
+    BugSection,
+}
+
+public record WorkflowListQuery():IBaseQuery<WorkflowListResponse>;
+
+public class WorkflowListQueryHandler:IBaseQueryHandler<WorkflowListQuery,WorkflowListResponse>
+{
+    private readonly IProgramManagerDbContext _context;
+    private readonly IAuthHelper _authHelper;
+    private readonly IEnumerable<IWorkflowProvider> _providers;
+
+    public WorkflowListQueryHandler(IProgramManagerDbContext context,
+        IAuthHelper authHelper,
+        IEnumerable<IWorkflowProvider> providers)
+    {
+        _context = context;
+        _authHelper = authHelper;
+        _providers = providers;
+    }
+
+    public async Task<OperationResult<WorkflowListResponse>> Handle(WorkflowListQuery request, CancellationToken cancellationToken)
+    {
+        var currentUserId = _authHelper.GetCurrentUserId()!.Value;
+        var items = new List<WorkflowListItem>();
+        var response = new WorkflowListResponse(items);
+        foreach (var provider in _providers)
+        {
+            var providerItems = await provider.GetItems(currentUserId, _context, cancellationToken);
+            if (providerItems?.Count > 0)
+                items.AddRange(providerItems);
+        }
+
+        return OperationResult<WorkflowListResponse>.Success(response);
+    }
+}

ProgramManager/src/Application/GozareshgirProgramManager.Application/Services/FileManagement/IFileUploadService.cs

@@ -0,0 +1,69 @@
+using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+using Microsoft.AspNetCore.Http;
+
+namespace GozareshgirProgramManager.Application.Services.FileManagement;
+
+/// <summary>
+/// سرویس آپلود و مدیریت کامل فایل
+/// این سرویس تمام مراحل آپلود، ذخیره، تولید thumbnail و... را انجام می‌دهد
+/// </summary>
+public interface IFileUploadService
+{
+    /// <summary>
+    /// آپلود فایل با تمام مراحل پردازش
+    /// </summary>
+    /// <param name="file">فایل برای آپلود</param>
+    /// <param name="category">دسته‌بندی فایل</param>
+    /// <param name="uploadedByUserId">شناسه کاربر آپلودکننده</param>
+    /// <param name="maxFileSizeBytes">حداکثر حجم مجاز فایل (پیش‌فرض: 100MB)</param>
+    /// <returns>شناسه فایل آپلود شده یا null در صورت خطا</returns>
+    Task<FileUploadResult> UploadFileAsync(
+        IFormFile file,
+        FileCategory category,
+        long uploadedByUserId,
+        long maxFileSizeBytes = 100 * 1024 * 1024);
+    
+    /// <summary>
+    /// آپلود فایل با Stream
+    /// </summary>
+    Task<FileUploadResult> UploadFileFromStreamAsync(
+        Stream fileStream,
+        string fileName,
+        string contentType,
+        FileCategory category,
+        long uploadedByUserId,
+        long maxFileSizeBytes = 100 * 1024 * 1024);
+}
+
+/// <summary>
+/// نتیجه عملیات آپلود فایل
+/// </summary>
+public class FileUploadResult
+{
+    public bool IsSuccess { get; set; }
+    public Guid? FileId { get; set; }
+    public string? ErrorMessage { get; set; }
+    public string? StorageUrl { get; set; }
+    public string? ThumbnailUrl { get; set; }
+
+    public static FileUploadResult Success(Guid fileId, string storageUrl, string? thumbnailUrl = null)
+    {
+        return new FileUploadResult
+        {
+            IsSuccess = true,
+            FileId = fileId,
+            StorageUrl = storageUrl,
+            ThumbnailUrl = thumbnailUrl
+        };
+    }
+
+    public static FileUploadResult Failed(string errorMessage)
+    {
+        return new FileUploadResult
+        {
+            IsSuccess = false,
+            ErrorMessage = errorMessage
+        };
+    }
+}
+

ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Constants/ProgramManagerPermissionCode.cs

@@ -149,6 +149,22 @@ public static class ProgramManagerPermissionCode
         {
             public const int Code = 990111;
         }
+
+        /// <summary>
+        /// اولویت بندی
+        /// </summary>
+        public static class Priority
+        {
+            public const int Code = 990112;
+        }
+
+        /// <summary>
+        /// ایجاد تسک باگ
+        /// </summary>
+        public static class CreateBug
+        {
+            public const int Code = 990113;
+        }
     }
 
     #endregion
@@ -226,11 +242,26 @@ public static class ProgramManagerPermissionCode
         {
             public const int Code = 990208;
         }
+
+        /// <summary>
+        /// رد با تایید اتمام اجرا
+        /// </summary>
+        public static class RejectOrApproveTaskComplete
+        {
+            public const int Code = 990209;
+        }
+    }
+
+    #endregion
+
+    #region Workflow[تب کارپوشه]
+    public static class Workflow
+    {
+        public const int Code = 9903;
     }
 
     #endregion
 
-   
     public static Dictionary<string, object> GetAllCodes()
     {
         var result = new Dictionary<string, object>();

ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Extensions/FileExtensions.cs

@@ -0,0 +1,23 @@
+using GozareshgirProgramManager.Application._Common.Models;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+
+namespace GozareshgirProgramManager.Application._Common.Extensions;
+
+public static class FileExtensions
+{
+    public static UploadedFileDto ToDto(this UploadedFile file)
+    {
+        return new UploadedFileDto()
+        {
+            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
+        };
+    }
+}

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;
 
@@ -25,12 +29,18 @@ public interface IProgramManagerDbContext
     DbSet<TaskSection> TaskSections { get; set; }
     DbSet<ProjectSection> ProjectSections { get; set; }
     DbSet<PhaseSection> PhaseSections { get; set; }
-    
+    DbSet<BugSection> BugSections { get; set; }
     DbSet<ProjectTask> ProjectTasks { get; set; }
     
     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/Application/GozareshgirProgramManager.Application/_Common/Models/UploadedFileDto.cs

@@ -0,0 +1,34 @@
+namespace GozareshgirProgramManager.Application._Common.Models;
+
+public class UploadedFileDto
+{
+    
+    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/Domain/GozareshgirProgramManager.Domain/FileManagementAgg/Enums/FileCategory.cs

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

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

@@ -0,0 +1,14 @@
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+
+public class BugDocument
+{
+
+    public BugDocument(Guid fileId)
+    {
+        FileId = fileId;
+    }
+    private BugDocument() { } // EF
+    public Guid Id { get; private set; }
+    public Guid FileId { get; private set; }
+    public BugSection BugSection { get; private set; }
+}

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

@@ -0,0 +1,66 @@
+using GozareshgirProgramManager.Domain._Common;
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task;
+using GozareshgirProgramManager.Domain.ProjectAgg.Enums;
+
+namespace GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+
+public class BugSection : EntityBase<Guid>
+{
+    public BugSection(Guid taskId, string initialDescription, long originalAssignedUserId, ProjectTaskPriority priority)
+    {
+        TaskId = taskId;
+        InitialDescription = initialDescription;
+        Status = TaskSectionStatus.ReadyToStart;
+        OriginalAssignedUserId = originalAssignedUserId;
+        Priority = priority;
+    }
+
+
+
+
+
+    // برای EF Core
+    private BugSection()
+    {
+       
+    }
+
+    /// <summary>
+    /// آی دی تسک - بخش فرعی
+    /// </summary>
+    public Guid TaskId { get; private set; }
+
+    /// <summary>
+    /// توضیحات مدیر
+    /// </summary>
+    public string InitialDescription { get; set; }
+
+
+    /// <summary>
+    /// وضعیت باگ گزارش شده
+    /// </summary>
+    public TaskSectionStatus Status { get; private set; }
+
+
+    // شخصی که برای اولین بار این بخش به او اختصاص داده شده (مالک اصلی)
+    public long OriginalAssignedUserId { get; private set; }
+
+    /// <summary>
+    /// اولویت رسیدگی
+    /// </summary>
+    public ProjectTaskPriority Priority { get; private set; }
+
+    // Navigation to ProjectTask (must be Task level)
+    public ProjectTask ProjectTask { get; private set; } = null!;
+
+    /// <summary>
+    /// لیست مدارک و فایلها
+    /// </summary>
+    public List<BugDocument> BugDocuments { get; private set; } = new();
+
+    public void AddDocument(BugDocument document)
+    {
+        BugDocuments.Add(document);
+    }
+
+}

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,34 @@
-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>();
+        BugSectionList = new List<BugSection>();
         Priority = priority;
         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();
+    public List<BugSection> BugSectionList { get; set; }
 
     // Task-specific properties
     public Enums.TaskStatus Status { get; private set; } = Enums.TaskStatus.NotStarted;
@@ -40,7 +42,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 +86,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 +206,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 +221,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,56 @@
+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 void MarkReviewed()
+    {
+        if (Status == RevisionReviewStatus.Reviewed)
+            return;
+        Status = RevisionReviewStatus.Reviewed;
+    }
+    
+}
+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,33 @@
+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; }
+
+    public void AcceptTimeRequest()
+    {
+        RequestStatus = TaskSectionTimeRequestStatus.Accepted;
+    }
+}

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/IBugSectionRepository.cs

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

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>
+{
+    Task<List<TaskSectionRevision>> GetByTaskSectionId(Guid requestTaskSectionId);
+}

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;
@@ -32,6 +25,9 @@ using Shared.Contracts.PmRole.Commands;
 using Shared.Contracts.PmRole.Queries;
 using Shared.Contracts.PmUser.Commands;
 using Shared.Contracts.PmUser.Queries;
+using System.Reflection;
+using GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList;
+using GozareshgirProgramManager.Application.Modules.Workflows.Queries.WorkflowList.Providers;
 
 namespace GozareshgirProgramManager.Infrastructure;
 
@@ -80,7 +76,8 @@ public static class DependencyInjection
         services.AddScoped<ITaskSectionActivityRepository, TaskSectionActivityRepository>();
         services.AddScoped<IPhaseSectionRepository, PhaseSectionRepository>();
         services.AddScoped<IProjectSectionRepository, ProjectSectionRepository>();
-        
+        services.AddScoped<IBugSectionRepository, BugSectionRepository>();
+
         services.AddScoped<ISkillRepository, SkillRepository>();
         
         services.AddScoped<IUserRefreshTokenRepository, UserRefreshTokenRepository>();
@@ -92,6 +89,7 @@ public static class DependencyInjection
         // File Storage Services
         services.AddScoped<IFileStorageService, Services.FileManagement.LocalFileStorageService>();
         services.AddScoped<IThumbnailGeneratorService, Services.FileManagement.ThumbnailGeneratorService>();
+        services.AddScoped<IFileUploadService, Services.FileManagement.FileUploadService>();
 
         // JWT Settings
         services.Configure<JwtSettings>(configuration.GetSection("JwtSettings"));
@@ -100,7 +98,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
 
@@ -116,6 +119,16 @@ public static class DependencyInjection
         //  MediatR Validation Behavior
         services.AddTransient(typeof(IPipelineBehavior<,>), typeof(ValidationBehavior<,>));
 
+        // Workflow providers: auto-register all IWorkflowProvider implementations in the Application assembly
+        var appAssembly = typeof(IWorkflowProvider).Assembly;
+        var providerTypes = appAssembly
+            .GetTypes()
+            .Where(t => !t.IsAbstract && !t.IsInterface && typeof(IWorkflowProvider).IsAssignableFrom(t))
+            .ToList();
+        foreach (var providerType in providerTypes)
+        {
+            services.AddScoped(typeof(IWorkflowProvider), providerType);
+        }
 
         return services;
     }

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/20260127151807_Bug Section Init.cs

@@ -0,0 +1,77 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace GozareshgirProgramManager.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class BugSectionInit : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "BugSections",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TaskId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    InitialDescription = table.Column<string>(type: "nvarchar(500)", maxLength: 500, nullable: true),
+                    Status = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    OriginalAssignedUserId = table.Column<long>(type: "bigint", nullable: false),
+                    Priority = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    CreationDate = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_BugSections", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_BugSections_ProjectTasks_TaskId",
+                        column: x => x.TaskId,
+                        principalTable: "ProjectTasks",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "BugDocuments",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    FileId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    BugSectionId = table.Column<Guid>(type: "uniqueidentifier", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_BugDocuments", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_BugDocuments_BugSections_BugSectionId",
+                        column: x => x.BugSectionId,
+                        principalTable: "BugSections",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BugDocuments_BugSectionId",
+                table: "BugDocuments",
+                column: "BugSectionId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BugSections_TaskId",
+                table: "BugSections",
+                column: "TaskId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "BugDocuments");
+
+            migrationBuilder.DropTable(
+                name: "BugSections");
+        }
+    }
+}

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

@@ -227,6 +227,41 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.ToTable("UploadedFiles", (string)null);
                 });
 
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.BugSection", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("InitialDescription")
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)");
+
+                    b.Property<long>("OriginalAssignedUserId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Priority")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<Guid>("TaskId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TaskId");
+
+                    b.ToTable("BugSections", (string)null);
+                });
+
             modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.PhaseSection", b =>
                 {
                     b.Property<Guid>("Id")
@@ -254,49 +289,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 +341,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 +409,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 +468,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 +511,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 +549,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 +575,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 +587,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,6 +902,43 @@ namespace GozareshgirProgramManager.Infrastructure.Migrations
                     b.ToTable("UserRefreshTokens", (string)null);
                 });
 
+            modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.BugSection", b =>
+                {
+                    b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectTask", "ProjectTask")
+                        .WithMany("BugSectionList")
+                        .HasForeignKey("TaskId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.OwnsMany("GozareshgirProgramManager.Domain.ProjectAgg.Entities.BugDocument", "BugDocuments", b1 =>
+                        {
+                            b1.Property<Guid>("Id")
+                                .ValueGeneratedOnAdd()
+                                .HasColumnType("uniqueidentifier");
+
+                            b1.Property<Guid>("BugSectionId")
+                                .HasColumnType("uniqueidentifier");
+
+                            b1.Property<Guid>("FileId")
+                                .HasColumnType("uniqueidentifier");
+
+                            b1.HasKey("Id");
+
+                            b1.HasIndex("BugSectionId");
+
+                            b1.ToTable("BugDocuments", (string)null);
+
+                            b1.WithOwner("BugSection")
+                                .HasForeignKey("BugSectionId");
+
+                            b1.Navigation("BugSection");
+                        });
+
+                    b.Navigation("BugDocuments");
+
+                    b.Navigation("ProjectTask");
+                });
+
             modelBuilder.Entity("GozareshgirProgramManager.Domain.ProjectAgg.Entities.PhaseSection", b =>
                 {
                     b.HasOne("GozareshgirProgramManager.Domain.ProjectAgg.Entities.ProjectPhase", "Phase")
@@ -810,9 +957,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 +968,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 +986,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 +997,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 +1005,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 +1016,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 +1027,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 +1226,28 @@ 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("BugSectionList");
+
                     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;
@@ -25,6 +29,7 @@ public class ProgramManagerDbContext : DbContext, IProgramManagerDbContext
     public DbSet<TaskSection> TaskSections { get; set; } = null!;
     public DbSet<ProjectSection> ProjectSections { get; set; } = null!;
     public DbSet<PhaseSection> PhaseSections { get; set; } = null!;
+    public DbSet<BugSection> BugSections { get; set; } = null!;
 
     // New Hierarchy entities
     public DbSet<Project> Projects { get; set; } = null!;
@@ -49,6 +54,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/BugSectionMapping.cs

@@ -0,0 +1,51 @@
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace GozareshgirProgramManager.Infrastructure.Persistence.Mappings;
+
+public class BugSectionMapping : IEntityTypeConfiguration<BugSection>
+{
+    public void Configure(EntityTypeBuilder<BugSection> builder)
+    {
+        builder.ToTable("BugSections");
+
+        builder.HasKey(x => x.Id);
+
+        builder.Property(x => x.Id)
+            .ValueGeneratedNever();
+
+        builder.Property(x => x.TaskId)
+            .IsRequired();
+
+        builder.Property(x => x.Status)
+            .HasConversion<string>()
+            .HasMaxLength(50)
+            .IsRequired();
+
+
+        builder.Property(x => x.Priority)
+            .HasConversion<string>()
+            .HasMaxLength(50)
+            .IsRequired();
+
+        builder.Property(x => x.InitialDescription)
+            .HasMaxLength(500)
+            .IsRequired(false);
+
+
+        builder.OwnsMany(x => x.BugDocuments, navigationBuilder =>
+        {
+     
+            navigationBuilder.ToTable("BugDocuments");
+            navigationBuilder.HasKey(x => x.Id);
+            navigationBuilder.WithOwner(x => x.BugSection);
+        });
+
+        // Navigation to ProjectTask (Task level)
+        builder.HasOne(x => x.ProjectTask)
+            .WithMany(t => t.BugSectionList)
+            .HasForeignKey(x => x.TaskId)
+            .OnDelete(DeleteBehavior.Cascade);
+    }
+}

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;
@@ -74,6 +75,12 @@ public class ProjectTaskMapping : IEntityTypeConfiguration<ProjectTask>
             .WithOne(s => s.Task)
             .HasForeignKey(s => s.TaskId)
             .OnDelete(DeleteBehavior.Cascade);
-        
+
+        // One-to-many relationship with BugSections
+        builder.HasMany(t => t.BugSectionList)
+            .WithOne(s => s.ProjectTask)
+            .HasForeignKey(s => s.TaskId)
+            .OnDelete(DeleteBehavior.Cascade);
+
     }
 }

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/BugSectionRepository.cs

@@ -0,0 +1,16 @@
+using GozareshgirProgramManager.Domain.ProjectAgg.Entities;
+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 BugSectionRepository : RepositoryBase<Guid,BugSection>, IBugSectionRepository 
+{
+    private readonly ProgramManagerDbContext _context;
+    public BugSectionRepository(ProgramManagerDbContext context) : base(context)
+    {
+        _context = context;
+    }
+}

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,24 @@
+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;
+    }
+
+    public async Task<List<TaskSectionRevision>> GetByTaskSectionId(Guid requestTaskSectionId)
+    {
+       var res = await _programManagerDbContext.TaskSectionRevisions
+            .Where(x => requestTaskSectionId == x.TaskSectionId)
+            .ToListAsync();
+       return res;
+    }
+}

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;
+    }
+}

ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Services/FileManagement/FileUploadService.cs

@@ -0,0 +1,232 @@
+using GozareshgirProgramManager.Application.Services.FileManagement;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Entities;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Enums;
+using GozareshgirProgramManager.Domain.FileManagementAgg.Repositories;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+
+namespace GozareshgirProgramManager.Infrastructure.Services.FileManagement;
+
+/// <summary>
+/// پیاده‌سازی سرویس آپلود کامل فایل
+/// </summary>
+public class FileUploadService : IFileUploadService
+{
+    private readonly IUploadedFileRepository _fileRepository;
+    private readonly IFileStorageService _fileStorageService;
+    private readonly IThumbnailGeneratorService _thumbnailService;
+    private readonly ILogger<FileUploadService> _logger;
+
+    public FileUploadService(
+        IUploadedFileRepository fileRepository,
+        IFileStorageService fileStorageService,
+        IThumbnailGeneratorService thumbnailService,
+        ILogger<FileUploadService> logger)
+    {
+        _fileRepository = fileRepository;
+        _fileStorageService = fileStorageService;
+        _thumbnailService = thumbnailService;
+        _logger = logger;
+    }
+
+    public async Task<FileUploadResult> UploadFileAsync(
+        IFormFile file,
+        FileCategory category,
+        long uploadedByUserId,
+        long maxFileSizeBytes = 100 * 1024 * 1024)
+    {
+        try
+        {
+            // اعتبارسنجی ورودی
+            if (file.Length == 0)
+            {
+                return FileUploadResult.Failed("فایل خالی است");
+            }
+
+            if (file.Length > maxFileSizeBytes)
+            {
+                var maxSizeMb = maxFileSizeBytes / (1024 * 1024);
+                return FileUploadResult.Failed($"حجم فایل بیش از حد مجاز است (حداکثر {maxSizeMb}MB)");
+            }
+
+            using var stream = file.OpenReadStream();
+            return await UploadFileFromStreamAsync(
+                stream,
+                file.FileName,
+                file.ContentType,
+                category,
+                uploadedByUserId,
+                maxFileSizeBytes);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "خطا در آپلود فایل {FileName}", file.FileName);
+            return FileUploadResult.Failed($"خطا در آپلود فایل: {ex.Message}");
+        }
+    }
+
+    public async Task<FileUploadResult> UploadFileFromStreamAsync(
+        Stream fileStream,
+        string fileName,
+        string contentType,
+        FileCategory category,
+        long uploadedByUserId,
+        long maxFileSizeBytes = 100 * 1024 * 1024)
+    {
+        UploadedFile? uploadedFile = null;
+
+        try
+        {
+            // تشخیص نوع فایل
+            var fileType = DetectFileType(contentType, Path.GetExtension(fileName));
+
+            // ایجاد رکورد فایل در دیتابیس
+            uploadedFile = new UploadedFile(
+                originalFileName: fileName,
+                fileSizeBytes: fileStream.Length,
+                mimeType: contentType,
+                fileType: fileType,
+                category: category,
+                uploadedByUserId: uploadedByUserId,
+                storageProvider: StorageProvider.LocalFileSystem
+            );
+
+            await _fileRepository.AddAsync(uploadedFile);
+            await _fileRepository.SaveChangesAsync();
+
+            // آپلود فایل به استوریج
+            var categoryFolder = category.ToString();
+            var uploadResult = await _fileStorageService.UploadAsync(
+                fileStream,
+                uploadedFile.UniqueFileName,
+                categoryFolder
+            );
+
+            // به‌روزرسانی اطلاعات آپلود
+            uploadedFile.CompleteUpload(uploadResult.StoragePath, uploadResult.StorageUrl);
+
+            // پردازش‌های خاص بر اساس نوع فایل
+            string? thumbnailUrl = null;
+            if (fileType == FileType.Image)
+            {
+                thumbnailUrl = await ProcessImageAsync(uploadedFile, uploadResult.StoragePath, categoryFolder);
+            }
+            else if (fileType == FileType.Video)
+            {
+                thumbnailUrl = await ProcessVideoAsync(uploadedFile, uploadResult.StoragePath, categoryFolder);
+            }
+
+            // ذخیره تغییرات نهایی
+            await _fileRepository.UpdateAsync(uploadedFile);
+            await _fileRepository.SaveChangesAsync();
+
+            _logger.LogInformation(
+                "فایل {FileName} با شناسه {FileId} با موفقیت آپلود شد",
+                fileName,
+                uploadedFile.Id);
+
+            return FileUploadResult.Success(uploadedFile.Id, uploadResult.StorageUrl, thumbnailUrl);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "خطا در آپلود فایل {FileName}", fileName);
+
+            // در صورت خطا، فایل آپلود شده را حذف کنیم
+            if (uploadedFile != null)
+            {
+                try
+                {
+                    await _fileRepository.DeleteAsync(uploadedFile);
+                    await _fileRepository.SaveChangesAsync();
+                }
+                catch (Exception deleteEx)
+                {
+                    _logger.LogError(deleteEx, "خطا در حذف فایل ناموفق {FileId}", uploadedFile.Id);
+                }
+            }
+
+            return FileUploadResult.Failed($"خطا در آپلود فایل: {ex.Message}");
+        }
+    }
+
+    /// <summary>
+    /// پردازش تصویر (ابعاد و thumbnail)
+    /// </summary>
+    private async Task<string?> ProcessImageAsync(UploadedFile file, string storagePath, string categoryFolder)
+    {
+        try
+        {
+            // دریافت ابعاد تصویر
+            var dimensions = await _thumbnailService.GetImageDimensionsAsync(storagePath);
+            if (dimensions.HasValue)
+            {
+                file.SetImageDimensions(dimensions.Value.Width, dimensions.Value.Height);
+            }
+
+            // تولید thumbnail
+            var thumbnail = await _thumbnailService.GenerateImageThumbnailAsync(
+                storagePath,
+                category: categoryFolder);
+
+            if (thumbnail.HasValue)
+            {
+                file.SetThumbnail(thumbnail.Value.ThumbnailUrl);
+                return thumbnail.Value.ThumbnailUrl;
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "خطا در پردازش تصویر {FileId}", file.Id);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// پردازش ویدیو (thumbnail)
+    /// </summary>
+    private async Task<string?> ProcessVideoAsync(UploadedFile file, string storagePath, string categoryFolder)
+    {
+        try
+        {
+            // تولید thumbnail از ویدیو
+            var thumbnail = await _thumbnailService.GenerateVideoThumbnailAsync(
+                storagePath,
+                category: categoryFolder);
+
+            if (thumbnail.HasValue)
+            {
+                file.SetThumbnail(thumbnail.Value.ThumbnailUrl);
+                return thumbnail.Value.ThumbnailUrl;
+            }
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "خطا در پردازش ویدیو {FileId}", file.Id);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// تشخیص نوع فایل از روی MIME type و extension
+    /// </summary>
+    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;
+    }
+
+}
+