From 4164c7d761db99896d2b8337723ec2ae58d12044 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 18 Jun 2025 18:12:28 +0530
Subject: [PATCH] Cheange the message sending when manageing project
 infrastructure

---
 Marco.Pms.Services/Controllers/ProjectController.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index b120c04..9f1131e 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -620,7 +620,7 @@ namespace MarcoBMS.Services.Controllers
                         _context.WorkItems.Update(workItem);
                         await _context.SaveChangesAsync();
                         responseMessage = "Task Updated Successfully";
-                        message = $"Task Updated by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
+                        message = $"Task Updated in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
                     }
                     else
                     {
@@ -628,7 +628,7 @@ namespace MarcoBMS.Services.Controllers
                         _context.WorkItems.Add(workItem);
                         await _context.SaveChangesAsync();
                         responseMessage = "Task Added Successfully";
-                        message = $"Task Added by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
+                        message = $"Task Added in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
                     }
                     var result = new WorkItemVM
                     {
@@ -675,7 +675,7 @@ namespace MarcoBMS.Services.Controllers
 
                         projectIds.Add(floor?.Building?.ProjectId ?? Guid.Empty);
 
-                        var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", ProjectIds = projectIds, Message = $"Task Deleted by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}" };
+                        var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", ProjectIds = projectIds, Message = $"Task Deleted in Building: {floor?.Building?.Name}, on Floor: {floor?.FloorName}, in Area: {task.WorkArea?.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}" };
                         await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                     }
                     else
@@ -766,6 +766,7 @@ namespace MarcoBMS.Services.Controllers
                         }
                         Building? building = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == floor.BuildingId);
                         projectIds.Add(building?.ProjectId ?? Guid.Empty);
+                        message = $"{message} in Building: {building?.Name}";
                     }
                     if (item.WorkArea != null)
                     {
@@ -792,6 +793,7 @@ namespace MarcoBMS.Services.Controllers
                         }
                         Floor? floor = await _context.Floor.Include(f => f.Building).FirstOrDefaultAsync(f => f.Id == workArea.FloorId);
                         projectIds.Add(floor?.Building?.ProjectId ?? Guid.Empty);
+                        message = $"{message} in Building: {floor?.Building?.Name}, on Floor: {floor?.FloorName}";
                     }
                 }
                 message = $"{message} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";