From 5ce95f7e232aa5918314c427e2b1585b236b787d Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Tue, 14 Oct 2025 11:36:32 +0530
Subject: [PATCH] Added the organization name in record response object

---
 Marco.Pms.Services/Controllers/AttendanceController.cs | 10 +++++-----
 Marco.Pms.Services/Helpers/EmployeeHelper.cs           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index e93a452..cdfdba5 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -321,7 +321,6 @@ namespace MarcoBMS.Services.Controllers
             return Ok(ApiResponse<object>.SuccessResponse(result, System.String.Format("{0} Attendance records fetched successfully", result.Count), 200));
         }
 
-        [HttpGet("project/team")]
         /// <summary>
         /// Retrieves employee attendance records for a specified project and date.
         /// The result is filtered based on the logged-in employee's permissions (Team or Self).
@@ -331,6 +330,8 @@ namespace MarcoBMS.Services.Controllers
         /// <param name="includeInactive">Optional. Includes inactive employees in the team list if true.</param>
         /// <param name="date">Optional. The date for which to fetch attendance, in "yyyy-MM-dd" format. Defaults to the current UTC date.</param>
         /// <returns>An IActionResult containing a list of employee attendance records or an error response.</returns>
+
+        [HttpGet("project/team")]
         public async Task<IActionResult> EmployeeAttendanceByProjectAsync([FromQuery] Guid projectId, [FromQuery] Guid? organizationId, [FromQuery] bool includeInactive, [FromQuery] string? date = null)
         {
             var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
@@ -390,7 +391,6 @@ namespace MarcoBMS.Services.Controllers
             }
         }
 
-
         [HttpGet("regularize")]
         public async Task<IActionResult> GetRequestRegularizeAttendance([FromQuery] Guid projectId, [FromQuery] Guid? organizationId, [FromQuery] bool IncludeInActive)
         {
@@ -456,8 +456,7 @@ namespace MarcoBMS.Services.Controllers
             return Ok(ApiResponse<object>.SuccessResponse(result, System.String.Format("{0} Attendance records fetched successfully", result.Count), 200));
         }
 
-        [HttpPost]
-        [Route("record")]
+        [HttpPost("record")]
         public async Task<IActionResult> RecordAttendance([FromBody] RecordAttendanceDot recordAttendanceDot)
         {
             if (!ModelState.IsValid)
@@ -612,7 +611,8 @@ namespace MarcoBMS.Services.Controllers
                         LastName = employee.LastName,
                         Id = attendance.Id,
                         Activity = attendance.Activity,
-                        JobRoleName = employee.JobRole.Name
+                        JobRoleName = employee.JobRole.Name,
+                        OrganizationName = employee.Organization?.Name
                     };
                     var sendActivity = 0;
                     if (recordAttendanceDot.Id == Guid.Empty)
diff --git a/Marco.Pms.Services/Helpers/EmployeeHelper.cs b/Marco.Pms.Services/Helpers/EmployeeHelper.cs
index 717788b..80e2fd7 100644
--- a/Marco.Pms.Services/Helpers/EmployeeHelper.cs
+++ b/Marco.Pms.Services/Helpers/EmployeeHelper.cs
@@ -24,7 +24,7 @@ namespace MarcoBMS.Services.Helpers
         public async Task<Employee> GetEmployeeByID(Guid EmployeeID)
         {
 
-            return await _context.Employees.Include(e => e.JobRole).FirstOrDefaultAsync(e => e.Id == EmployeeID) ?? new Employee { };
+            return await _context.Employees.Include(e => e.JobRole).Include(e => e.Organization).FirstOrDefaultAsync(e => e.Id == EmployeeID) ?? new Employee { };
         }
 
         public async Task<Employee> GetEmployeeByApplicationUserID(string ApplicationUserID)
-- 
2.43.0