diff --git a/src/time-and-attendance/time-tracker/shifts/services/shifts-update-delete.service.ts b/src/time-and-attendance/time-tracker/shifts/services/shifts-update-delete.service.ts index bb71e23..511036b 100644 --- a/src/time-and-attendance/time-tracker/shifts/services/shifts-update-delete.service.ts +++ b/src/time-and-attendance/time-tracker/shifts/services/shifts-update-delete.service.ts @@ -1,4 +1,4 @@ -import { toDateFromString, toHHmmFromString, toStringFromHHmm, toStringFromDate, overlaps } from "src/time-and-attendance/utils/date-time.utils"; +import { toDateFromString, toHHmmFromString, toStringFromHHmm, toStringFromDate, overlaps, toUTCDateFromString } from "src/time-and-attendance/utils/date-time.utils"; import { BankCodesResolver } from "src/time-and-attendance/utils/resolve-bank-type-id.utils"; import { PrismaService } from "src/prisma/prisma.service"; import { shift_select } from "src/time-and-attendance/utils/selects.utils"; @@ -56,17 +56,17 @@ export class ShiftsUpdateDeleteService { //_________________________________________________________________ // UPDATE //_________________________________________________________________ - async updateShift(dto: ShiftDto, email): Promise> { + async updateShift(dto: ShiftDto, email: string): Promise> { try { const timesheet = await this.timesheetResolver.findTimesheetIdByEmail(email, toDateFromString(dto.date)); - if (!timesheet.success) return { success: false, error: ' timesheet not found' } + if (!timesheet.success) return { success: false, error: timesheet.error } //finds original shift const original = await this.prisma.shifts.findFirst({ where: { id: dto.id, timesheet_id: timesheet.data.id }, select: shift_select, }); - if (!original) return { success: false, error: `Shift with id: ${dto.id} not found` }; + if (!original) return { success: false, error: `Shift with id: ${dto.id} not found` }; //transform string format to date and HHmm const normed_shift = await this.normalizeShiftDto(dto); @@ -162,7 +162,7 @@ export class ShiftsUpdateDeleteService { for (let j = i + 1; j < shifts.length; j++) { const shift_a = shifts[i]; const shift_b = shifts[j]; - + if (shift_a.date !== shift_b.date) continue; if (shift_a.id === shift_b.id) continue; const has_overlap = overlaps(