admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add Task Revision query and revision and request mapping

Browse Source
This commit is contained in:
mahan
2026-01-24 11:12:25 +03:30
parent a3fd3e6920
commit 7e563a0f01
14 changed files with 1804 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ProgramManager/src/Application/GozareshgirProgramManager.Application/GozareshgirProgramManager.Application.csproj
View File

@@ -26,7 +26,8 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Modules\TaskSectionRevision\" />
<Folder Include="Modules\TaskSectionRevision\Commands\" />
<Folder Include="Modules\TaskSectionTimeRequests\Queries\" />
</ItemGroup>
</Project>

134
ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Commands/CreateTaskSectionRevision/CreateTaskSectionRevisionCommand.cs
View File

@@ -1,134 +0,0 @@
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.Projects.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 TaskSectionRevision(request.SectionId, request.Message, currentId!.Value);
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;
}
}

136
ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionRevision/Commands/CreateTaskSectionRevision/CreateTaskSectionRevisionCommand.cs Normal file
View File

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

74
ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionRevision/Queries/TaskRevisionsByTaskSectionId/TaskRevisionsByTaskSectionIdQuery.cs Normal file
View File

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

42
ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionRevision/Queries/TaskRevisionsByTaskSectionId/TaskRevisionsByTaskSectionIdResponse.cs Normal file
View File

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

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

@@ -15,14 +15,16 @@ public class CreateTimeRequestCommandHandler : IBaseCommandHandler<CreateTimeReq
{
private readonly IAuthHelper _authHelper;
private readonly ITaskSectionTimeRequestRepository _timeRequestRepository;
private readonly ITaskSectionRepository _taskSectionRepository;
private readonly IUnitOfWork _unitOfWork;
public CreateTimeRequestCommandHandler
(ITaskSectionTimeRequestRepository timeRequestRepository, IAuthHelper authHelper, IUnitOfWork unitOfWork)
(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)
@@ -33,10 +35,16 @@ public class CreateTimeRequestCommandHandler : IBaseCommandHandler<CreateTimeReq
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,
TaskSectionTimeRequestType.RejectedTime,request.TaskSectionId);
request.RequestType,request.TaskSectionId);
await _timeRequestRepository.CreateAsync(entity);
await _unitOfWork.SaveChangesAsync(cancellationToken);
return OperationResult.Success();

6
ProgramManager/src/Application/GozareshgirProgramManager.Application/_Common/Interfaces/IProgramManagerDbContext.cs
View File

@@ -35,6 +35,12 @@ public interface IProgramManagerDbContext
DbSet<TaskChatMessage> TaskChatMessages { get; set; }
DbSet<UploadedFile> UploadedFiles { get; set; }
//Task Section Time Request
DbSet<TaskSectionTimeRequest> TaskSectionTimeRequests { get; set; }
// Task Section Revision
DbSet<TaskSectionRevision> TaskSectionRevisions { get; set; }
DbSet<Skill> Skills { get; set; }
Task<int> SaveChangesAsync(CancellationToken cancellationToken = default);
}

1198
ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/20260122100032_Add time Request and Task section revision.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

121
ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/20260122100032_Add time Request and Task section revision.cs Normal file
View File

@@ -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");
}
}
}

269
ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Migrations/AppDbContextModelSnapshot.cs
View File

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

3
ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/TaskSectionAdditionalTimeMapping.cs
View File

@@ -34,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);
}

3
ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/TaskSectionRevisionMapping.cs
View File

@@ -14,7 +14,8 @@ public class TaskSectionRevisionMapping:IEntityTypeConfiguration<TaskSectionRevi
builder.Property(x => x.Id)
.ValueGeneratedNever();
builder.Property(x => x.Status).HasConversion<string>();
builder.Property(x => x.Status).HasConversion<string>()
.HasMaxLength(50);
builder.Property(x => x.Message).HasMaxLength(500);

5
ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Persistence/Mappings/TaskSectionTimeRequestMapping.cs
View File

@@ -23,9 +23,8 @@ public class TaskSectionTimeRequestMapping:IEntityTypeConfiguration<TaskSectionT
builder.Property(x => x.RequestedTime)
.HasTimeSpanConversion();
builder.Property(x => x.TaskSection)
.HasConversion<string>()
.HasMaxLength(50);
builder.Property(x=>x.Description)
.HasMaxLength(1200);
builder.HasOne(x=>x.TaskSection)
.WithMany().HasForeignKey(x=>x.TaskSectionId);

14
ServiceHost/Areas/Admin/Controllers/ProgramManager/TaskSectionRevisionController.cs
View File

@@ -1,5 +1,6 @@
using GozareshgirProgramManager.Application._Common.Models;
using GozareshgirProgramManager.Application.Modules.Projects.Commands.CreateTaskSectionRevision;
using GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Commands.CreateTaskSectionRevision;
using GozareshgirProgramManager.Application.Modules.TaskSectionRevision.Queries.TaskRevisionsByTaskSectionId;
using MediatR;
using Microsoft.AspNetCore.Mvc;
using ServiceHost.BaseControllers;
@@ -14,10 +15,19 @@ public class TaskSectionRevisionController:ProgramManagerBaseController
{
_mediator = mediator;
}
[HttpPost]
public async Task<ActionResult<OperationResult>> CreateTaskRevision([FromForm]CreateTaskSectionRevisionCommand command)
{
var res =await _mediator.Send(command);
return Ok(res);
}
[HttpGet()]
public async Task<ActionResult<OperationResult<TaskRevisionsByTaskSectionIdResponse>>> GetRevisionsBySectionId(
TaskRevisionsByTaskSectionIdQuery query)
{
var res = await _mediator.Send(query);
return res;
}
}