diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 0b065e8..331acbe 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -134,7 +134,7 @@ model SchedulePresetShifts { id Int @id @default(autoincrement()) preset_id Int bank_code_id Int - sort_order Int + start_time DateTime @db.Time(0) end_time DateTime @db.Time(0) is_remote Boolean @default(false) @@ -142,7 +142,7 @@ model SchedulePresetShifts { bank_code BankCodes @relation("SchedulePresetShiftsBankCodes", fields: [bank_code_id], references: [id]) preset SchedulePresets @relation("SchedulePresetShiftsSchedulePreset", fields: [preset_id], references: [id]) - @@unique([preset_id, week_day, sort_order]) + @@unique([preset_id, week_day]) @@index([preset_id, week_day]) @@map("schedule_preset_shifts") } diff --git a/src/identity-and-account/employees/services/employees-get.service.ts b/src/identity-and-account/employees/services/employees-get.service.ts index 7175de8..51d2d07 100644 --- a/src/identity-and-account/employees/services/employees-get.service.ts +++ b/src/identity-and-account/employees/services/employees-get.service.ts @@ -158,6 +158,11 @@ export class EmployeesGetService { external_payroll_id: true, is_supervisor: true, schedule_preset_id: true, + schedule_preset: { + select: { + id: true, + } + } } }); if (!employee) return { success: false, error: `EMPLOYEE_NOT_FOUND` }; @@ -186,7 +191,8 @@ export class EmployeesGetService { first_work_day: toStringFromDate(employee.first_work_day), last_work_day: employee.last_work_day ? toStringFromDate(employee.last_work_day) : undefined, supervisor_full_name: employee.supervisor ? `${employee.supervisor?.user.first_name} ${employee.supervisor?.user.last_name}` : '', - user_module_access: module_access_array + user_module_access: module_access_array, + preset_id: employee.schedule_preset_id ? employee.schedule_preset_id : undefined, }, }; };