From 0b81a6ea6264ed9b0c81f3b367f1db818c99b915 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 7 Apr 2025 09:42:38 +0530
Subject: [PATCH] Make changes in report api to check if user reporting second
 time.

---
 .../ViewModels/Activities/ReportTaskVM.cs          |  2 +-
 Marco.Pms.Services/Controllers/TaskController.cs   | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs
index 7f85be5..d328330 100644
--- a/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs
@@ -14,6 +14,6 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public int WorkItemId { get; set; }
         public int TenantId { get; set; }
 
-        public List<TaskComment> Comments { 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 1090a7d..34a94d7 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -108,7 +108,10 @@ namespace MarcoBMS.Services.Controllers
             if (taskAllocation == null) {
                 return BadRequest(ApiResponse<object>.ErrorResponse("No such task has been allocated.", "No such task has been allocated.", 400));
             }
-
+            if(taskAllocation.CompletedTask != 0)
+            {
+                taskAllocation.WorkItem.CompletedWork -= taskAllocation.CompletedTask;
+            }
             taskAllocation.ReportedDate = reportTask.ReportedDate;
             taskAllocation.CompletedTask = reportTask.CompletedTask;
             taskAllocation.WorkItem.CompletedWork += reportTask.CompletedTask;
@@ -117,8 +120,15 @@ namespace MarcoBMS.Services.Controllers
 
             _context.TaskComments.Add(comment);
             await _context.SaveChangesAsync();
+
             var response = taskAllocation.ToReportTaskVMFromTaskAllocation();
-            response.Comments = await _context.TaskComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
+            List < TaskComment > comments = await _context.TaskComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
+            List < CommentVM > resultComments = new List<CommentVM> { };
+            foreach(var result in comments)
+            {
+                resultComments.Add(result.ToCommentVMFromTaskComment());
+            }
+            response.Comments = resultComments;
             return Ok(ApiResponse<object>.SuccessResponse(response, "Task reported successfully", 200));
         }