From d18bdb1363033db96e3992580a8adba191131824 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 12 Nov 2025 09:44:02 +0530
Subject: [PATCH] Added contact details of the project in service project list
 view model

---
 .../ViewModels/ServiceProject/ServiceProjectVm.cs  | 14 +++++++-------
 .../Service/ServiceProjectService.cs               |  3 ---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Marco.Pms.Model/ViewModels/ServiceProject/ServiceProjectVm.cs b/Marco.Pms.Model/ViewModels/ServiceProject/ServiceProjectVm.cs
index e86d7fd..93cc49a 100644
--- a/Marco.Pms.Model/ViewModels/ServiceProject/ServiceProjectVm.cs
+++ b/Marco.Pms.Model/ViewModels/ServiceProject/ServiceProjectVm.cs
@@ -8,17 +8,17 @@ namespace Marco.Pms.Model.ViewModels.ServiceProject
     public class ServiceProjectVM
     {
         public Guid Id { get; set; }
-        public string Name { get; set; } = string.Empty;
-        public string ShortName { get; set; } = string.Empty;
-        public string Address { get; set; } = string.Empty;
+        public string? Name { get; set; }
+        public string? ShortName { get; set; }
+        public string? Address { get; set; }
         public DateTime AssignedDate { get; set; }
         public StatusMaster? Status { get; set; }
         public BasicOrganizationVm? Client { get; set; }
         public List<ServiceMasterVM>? Services { get; set; }
-        public BasicEmployeeVM? CreatedBy { get; set; }
-        public BasicEmployeeVM? UpdatedBy { get; set; }
-        public DateTime? UpdatedAt { get; set; }
-
+        public string? ContactName { get; set; }
+        public string? ContactPhone { get; set; }
+        public string? ContactEmail { get; set; }
         public DateTime CreatedAt { get; set; }
+        public BasicEmployeeVM? CreatedBy { get; set; }
     }
 }
diff --git a/Marco.Pms.Services/Service/ServiceProjectService.cs b/Marco.Pms.Services/Service/ServiceProjectService.cs
index 14ff9ab..0b442bb 100644
--- a/Marco.Pms.Services/Service/ServiceProjectService.cs
+++ b/Marco.Pms.Services/Service/ServiceProjectService.cs
@@ -105,7 +105,6 @@ namespace Marco.Pms.Services.Service
 
                 serviceProjectVM.Services = services.Where(s => serviceIds.Contains(s.Id)).Select(s => _mapper.Map<ServiceMasterVM>(s)).ToList();
 
-                serviceProjectVM.CreatedAt = DateTime.UtcNow;
                 serviceProjectVM.CreatedBy = _mapper.Map<BasicEmployeeVM>(loggedInEmployee);
                 return ApiResponse<object>.SuccessResponse(serviceProjectVM, "An Successfullly occurred while saving the project.", 201);
 
@@ -127,7 +126,6 @@ namespace Marco.Pms.Services.Service
                     .Include(sp => sp.Client)
                     .Include(sp => sp.Status)
                     .Include(sp => sp.CreatedBy).ThenInclude(e => e!.JobRole)
-                    .Include(sp => sp.UpdatedBy).ThenInclude(e => e!.JobRole)
                     .Where(sp => sp.TenantId == tenantId && sp.IsActive);
 
                 var serviceProjects = await serviceProjectQuery
@@ -254,7 +252,6 @@ namespace Marco.Pms.Services.Service
                         .Include(sp => sp.Client)
                         .Include(sp => sp.Status)
                         .Include(sp => sp.CreatedBy).ThenInclude(e => e!.JobRole)
-                        .Include(sp => sp.UpdatedBy).ThenInclude(e => e!.JobRole)
                         .Where(sp => sp.TenantId == tenantId && sp.IsActive).FirstOrDefaultAsync();
                 });