From 70092e56016afa74c99decb8c820fd3fc8d9d891 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Fri, 26 Sep 2025 16:12:46 +0530
Subject: [PATCH] Added the created by and updated by in organization update
 API

---
 .../Controllers/OrganizationController.cs              | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/OrganizationController.cs b/Marco.Pms.Services/Controllers/OrganizationController.cs
index 1629490..de2546b 100644
--- a/Marco.Pms.Services/Controllers/OrganizationController.cs
+++ b/Marco.Pms.Services/Controllers/OrganizationController.cs
@@ -740,7 +740,7 @@ namespace Marco.Pms.Services.Controllers
                 // Get the current logged-in employee
                 var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
 
-                _logger.LogDebug("Started updating service provider OrganizationId: {OrganizationId} by EmployeeId: {EmployeeId}",
+                _logger.LogDebug("Started updating organization OrganizationId: {OrganizationId} by EmployeeId: {EmployeeId}",
                 id, loggedInEmployee.Id);
 
                 // Check if the user is a tenant-level employee and restrict editing to their own org
@@ -823,10 +823,14 @@ namespace Marco.Pms.Services.Controllers
 
                 var response = _mapper.Map<OrganizationVM>(organization);
 
-                _logger.LogInfo("Successfully updated service provider OrganizationId: {OrganizationId} by EmployeeId: {EmployeeId}",
+                var createdByEmployee = await _context.Employees.Include(e => e.JobRole).FirstOrDefaultAsync(e => e.Id == organization.CreatedById);
+                response.CreatedBy = _mapper.Map<BasicEmployeeVM>(createdByEmployee);
+                response.UpdatedBy = _mapper.Map<BasicEmployeeVM>(loggedInEmployee);
+
+                _logger.LogInfo("Successfully updated organization OrganizationId: {OrganizationId} by EmployeeId: {EmployeeId}",
                     id, loggedInEmployee.Id);
 
-                return Ok(ApiResponse<object>.SuccessResponse(response, "Successfully updated the service provider", 200));
+                return Ok(ApiResponse<object>.SuccessResponse(response, "Organization updated Successfully", 200));
             }
             catch (DbUpdateException dbEx)
             {