diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Queries/CreateTimeRequestDetails/CreateTimeRequestDetailsQuery.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Queries/CreateTimeRequestDetails/CreateTimeRequestDetailsQuery.cs index 6a2c7e18..0657ce5c 100644 --- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Queries/CreateTimeRequestDetails/CreateTimeRequestDetailsQuery.cs +++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskSectionTimeRequests/Queries/CreateTimeRequestDetails/CreateTimeRequestDetailsQuery.cs @@ -1,6 +1,7 @@ using GozareshgirProgramManager.Application._Common.Extensions; using GozareshgirProgramManager.Application._Common.Interfaces; using GozareshgirProgramManager.Application._Common.Models; +using GozareshgirProgramManager.Domain._Common; using GozareshgirProgramManager.Domain.ProjectAgg.Entities.Task.TaskSection; using Microsoft.EntityFrameworkCore; @@ -8,7 +9,7 @@ namespace GozareshgirProgramManager.Application.Modules.TaskSectionTimeRequests. public record CreateTimeRequestDetailsResponse(List Revisions); -public record CreateTimeRequestDetailsRevision(string Message, List Files); +public record CreateTimeRequestDetailsRevision(string Message, List Files,Guid Id,string CreationDate); public record CreateTimeRequestDetailsQuery(Guid TaskSectionId) : IBaseQuery; @@ -30,7 +31,7 @@ public class x.TaskSectionId == request.TaskSectionId && x.Status == RevisionReviewStatus.Pending).ToListAsync(cancellationToken: cancellationToken); var fileIds = revisions.SelectMany(x => x.Files) - .Select(x => x.Id).ToList(); + .Select(x => x.FileId).ToList(); var files =await _context.UploadedFiles .Where(x => fileIds.Contains(x.Id)).ToListAsync(cancellationToken: cancellationToken); @@ -40,7 +41,8 @@ public class 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); + + return new CreateTimeRequestDetailsRevision(x.Message, filesDto,x.Id,x.CreationDate.ToFarsi()); }).ToList(); var res = new CreateTimeRequestDetailsResponse(resItem);