diff --git a/src/time-and-attendance/modules/time-tracker/shifts/services/shifts-get.service.ts b/src/time-and-attendance/modules/time-tracker/shifts/services/shifts-get.service.ts
index 5d17686..af1e947 100644
--- a/src/time-and-attendance/modules/time-tracker/shifts/services/shifts-get.service.ts
+++ b/src/time-and-attendance/modules/time-tracker/shifts/services/shifts-get.service.ts
@@ -2,6 +2,7 @@ import { Injectable, NotFoundException } from "@nestjs/common";
 import { PrismaService } from "src/prisma/prisma.service";
 import { GetShiftDto } from "../dtos/shift-get.dto";
 import { toStringFromDate, toStringFromHHmm } from "../../../../utils/date-time-helpers";
+import { shift_select } from "src/time-and-attendance/utils/selects.utils";
 
 /**
  * _____________________________________________________________________________________
@@ -26,17 +27,7 @@ export class ShiftsGetService {
 
         const rows = await this.prisma.shifts.findMany({
             where: { id: { in: shift_ids } },
-            select: {
-                id:           true,
-                timesheet_id: true,
-                bank_code_id: true,
-                date:         true,
-                start_time:   true,
-                end_time:     true,
-                is_remote:    true,
-                is_approved:  true,
-                comment:      true,
-            }
+            select: shift_select,
         });
 
         if(rows.length !== shift_ids.length) {
diff --git a/src/time-and-attendance/modules/time-tracker/shifts/services/shifts-upsert.service.ts b/src/time-and-attendance/modules/time-tracker/shifts/services/shifts-upsert.service.ts
index 6049359..34d605c 100644
--- a/src/time-and-attendance/modules/time-tracker/shifts/services/shifts-upsert.service.ts
+++ b/src/time-and-attendance/modules/time-tracker/shifts/services/shifts-upsert.service.ts
@@ -5,6 +5,7 @@ import { updateShiftDto } from "../dtos/shift-update.dto";
 import { PrismaService } from "src/prisma/prisma.service";
 import { GetShiftDto } from "../dtos/shift-get.dto";
 import { ShiftDto } from "../dtos/shift-create.dto";
+import { shift_select } from "src/time-and-attendance/utils/selects.utils";
 
 type Normalized = { date: Date; start_time: Date; end_time: Date; };
 
@@ -136,10 +137,7 @@ export class ShiftsUpsertService {
                         is_remote: dto.is_remote,
                         comment: dto.comment ?? undefined,
                     },
-                    select: {
-                        timesheet_id: true, bank_code_id: true, date: true,
-                        start_time: true, end_time: true, is_remote: true, is_approved: true, comment: true,
-                    },
+                    select: shift_select,
                 });
 
                 existing.push({ start_time: row.start_time, end_time: row.end_time });
@@ -181,17 +179,7 @@ export class ShiftsUpsertService {
             const shift_ids = updates.map(update_shift => update_shift.id);
             const rows = await tx.shifts.findMany({
                 where: { id: { in: shift_ids } },
-                select: {
-                    id: true,
-                    timesheet_id: true,
-                    bank_code_id: true,
-                    date: true,
-                    start_time: true,
-                    end_time: true,
-                    is_remote: true,
-                    is_approved: true,
-                    comment: true,
-                },
+                select: shift_select,
             });
             const regroup_id = new Map(rows.map(r => [r.id, r]));
 
@@ -295,16 +283,7 @@ export class ShiftsUpsertService {
                 const row = await tx.shifts.update({
                     where: { id: planned.exist_shift.id },
                     data,
-                    select: {
-                        timesheet_id: true,
-                        bank_code_id: true,
-                        date: true,
-                        start_time: true,
-                        end_time: true,
-                        is_remote: true,
-                        is_approved: true,
-                        comment: true,
-                    },
+                    select: shift_select,
                 });
 
                 const summary_new = await this.overtime.getWeekOvertimeSummary(row.timesheet_id, planned.exist_shift.date, tx);
diff --git a/src/time-and-attendance/time-and-attendance.module.ts b/src/time-and-attendance/time-and-attendance.module.ts
index e3eff36..cee8cc5 100644
--- a/src/time-and-attendance/time-and-attendance.module.ts
+++ b/src/time-and-attendance/time-and-attendance.module.ts
@@ -3,7 +3,6 @@ import { GetTimesheetsOverviewService } from "src/time-and-attendance/modules/ti
 import { SchedulePresetsQueryService } from "src/time-and-attendance/modules/time-tracker/schedule-presets/services/schedule-presets-query.service";
 import { SchedulePresetsController } from "src/time-and-attendance/modules/time-tracker/schedule-presets/controller/schedule-presets.controller";
 import { ExpensesArchivalService } from "src/time-and-attendance/modules/expenses/services/expenses-archival.service";
-// import { LeaveRequestController } from "src/time-and-attendance/modules/leave-requests/controllers/leave-requests.controller";
 import { BusinessLogicsModule } from "src/time-and-attendance/domains/business-logics.module";
 import { ExpenseUpsertService } from "src/time-and-attendance/modules/expenses/services/expense-upsert.service";
 import { ShiftsUpsertService } from "src/time-and-attendance/modules/time-tracker/shifts/services/shifts-upsert.service";
@@ -23,7 +22,6 @@ import { Module } from "@nestjs/common";
         ShiftController, 
         SchedulePresetsController,
         ExpenseController,
-        // LeaveRequestController,
 
     ],
     providers: [
diff --git a/src/time-and-attendance/utils/selects.utils.ts b/src/time-and-attendance/utils/selects.utils.ts
index ac5845f..0140936 100644
--- a/src/time-and-attendance/utils/selects.utils.ts
+++ b/src/time-and-attendance/utils/selects.utils.ts
@@ -14,6 +14,17 @@ export const expense_select = {
         is_approved: true,
 } satisfies Prisma.ExpensesSelect;
 
+export const shift_select = {
+        id: true,
+        timesheet_id: true,
+        bank_code_id: true,
+        date: true,
+        start_time: true,
+        end_time: true,
+        is_remote: true,
+        is_approved: true,
+        comment: true,
+} satisfies Prisma.ShiftsSelect;
 
 export const leaveRequestsSelect = {
     id: true,