From e94210a341b26f5811bf28e49ac2b8e14c06f9e1 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Fri, 17 Oct 2025 14:23:57 +0530
Subject: [PATCH] Added the organization name in attendance records

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

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index b2b6b58..780a464 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -54,7 +54,6 @@ namespace MarcoBMS.Services.Controllers
         }
 
         [HttpGet("log/attendance/{attendanceid}")]
-
         public async Task<IActionResult> GetAttendanceLogById(Guid attendanceid)
         {
             using var scope = _serviceScopeFactory.CreateScope();
@@ -158,7 +157,6 @@ namespace MarcoBMS.Services.Controllers
         /// <returns></returns>
 
         [HttpGet("project/log")]
-
         public async Task<IActionResult> EmployeeAttendanceByDateRange([FromQuery] Guid? projectId, [FromQuery] Guid? organizationId, [FromQuery] string? dateFrom = null, [FromQuery] string? dateTo = null)
         {
             var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
@@ -280,8 +278,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).
@@ -291,6 +287,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();
@@ -340,7 +338,6 @@ namespace MarcoBMS.Services.Controllers
             }
         }
 
-
         [HttpGet("regularize")]
         public async Task<IActionResult> GetRequestRegularizeAttendance([FromQuery] Guid? projectId, [FromQuery] Guid? organizationId, [FromQuery] bool IncludeInActive)
         {
@@ -404,8 +401,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)
@@ -564,7 +560,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)