From 0c77df41c6334f5094ea9cbaced5649652834017 Mon Sep 17 00:00:00 2001
From: Nicolas Drolet <nicolasd@targointernet.com>
Date: Mon, 15 Dec 2025 09:01:37 -0500
Subject: [PATCH] fix(pay-period): minor fix to pay period handling, was
 returning pay-year of date from request rather than pay-year from pay period
 in db

---
 src/time-and-attendance/pay-period/pay-periods.mapper.ts       | 3 ++-
 .../schedule-presets/services/schedule-presets-get.service.ts  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/time-and-attendance/pay-period/pay-periods.mapper.ts b/src/time-and-attendance/pay-period/pay-periods.mapper.ts
index 4ec2a18..4403ad1 100644
--- a/src/time-and-attendance/pay-period/pay-periods.mapper.ts
+++ b/src/time-and-attendance/pay-period/pay-periods.mapper.ts
@@ -12,7 +12,8 @@ export function mapPayPeriodToDto(row: PayPeriods): PayPeriodDto {
     period_start: toDateString(row.period_start),
     period_end: toDateString(row.period_end),
     payday:pay,
-    pay_year: new Date(pay).getFullYear(),
+    // pay_year: new Date(pay).getFullYear(),
+    pay_year: row.pay_year,
     label: `${start}.${end}`,
   };
 }
diff --git a/src/time-and-attendance/schedule-presets/services/schedule-presets-get.service.ts b/src/time-and-attendance/schedule-presets/services/schedule-presets-get.service.ts
index f52879e..5e1d7ef 100644
--- a/src/time-and-attendance/schedule-presets/services/schedule-presets-get.service.ts
+++ b/src/time-and-attendance/schedule-presets/services/schedule-presets-get.service.ts
@@ -18,7 +18,7 @@ export class SchedulePresetsGetService {
                 orderBy: [{ is_default: 'desc' }, { name: 'asc' }],
                 include: {
                     shifts: {
-                        orderBy: [{ week_day: 'asc', start_time: 'asc' }],
+                        orderBy: [{ week_day: 'asc'}, {start_time: 'asc' }],
                         include: { bank_code: { select: { type: true } } },
                     },
                 },
@@ -38,6 +38,7 @@ export class SchedulePresetsGetService {
                     type: shift.bank_code?.type,
                 })),
             }));
+
             return { success: true, data: response };
         } catch (error) {
             return { success: false, error: `SCHEDULE_PRESET_NOT_FOUND` };