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(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(createdByEmployee); + response.UpdatedBy = _mapper.Map(loggedInEmployee); + + _logger.LogInfo("Successfully updated organization OrganizationId: {OrganizationId} by EmployeeId: {EmployeeId}", id, loggedInEmployee.Id); - return Ok(ApiResponse.SuccessResponse(response, "Successfully updated the service provider", 200)); + return Ok(ApiResponse.SuccessResponse(response, "Organization updated Successfully", 200)); } catch (DbUpdateException dbEx) {