From 4ccc69056029a7b7748f8c004340fc11c51e75e1 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 21:35:40 +0530
Subject: [PATCH] Chnaged the name form presignedUrls to ReportedProsignedUrl

---
 Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs | 2 +-
 Marco.Pms.Services/Controllers/TaskController.cs    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
index 6260e2a..acb5bd9 100644
--- a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
@@ -11,7 +11,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public double CompletedTask { get; set; }
         public BasicEmployeeVM? AssignedBy { get; set; }
         public Guid WorkItemId { get; set; }
-        public List<string>? PreSignedUrls { get; set; }
+        public List<string>? ReportedPreSignedUrls { get; set; }
         public WorkItem? WorkItem { get; set; }
         public List<BasicEmployeeVM>? teamMembers { get; set; }
         public List<CommentVM>? comments { get; set; }
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index 8c93170..ea4fbf1 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -317,7 +317,7 @@ namespace MarcoBMS.Services.Controllers
 
             List<Employee> employees = await _context.Employees.Where(e => employeeIdList.Contains(e.Id)).Include(e => e.JobRole).ToListAsync();
 
-            List<TaskComment> allComments = await _context.TaskComments.Where(c => taskIdList.Contains(c.TaskAllocationId)).ToListAsync();
+            List<TaskComment> allComments = await _context.TaskComments.Include(c => c.Employee).Where(c => taskIdList.Contains(c.TaskAllocationId)).ToListAsync();
             var allCommentIds = allComments.Select(c => c.Id).ToList();
 
             var taskAttachments = await _context.TaskAttachments.Where(t => taskIdList.Contains(t.ReferenceId) || allCommentIds.Contains(t.ReferenceId)).ToListAsync();
@@ -345,7 +345,7 @@ namespace MarcoBMS.Services.Controllers
                     string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
                     taskPreSignedUrls.Add(preSignedUrl);
                 }
-                response.PreSignedUrls = taskPreSignedUrls;
+                response.ReportedPreSignedUrls = taskPreSignedUrls;
 
                 foreach (var taskMember in taskMembers)
                 {