louis/targo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(expenses): fix Prisma query select

Browse Source
This commit is contained in:
Matthieu Haineault 2025-11-18 08:24:51 -05:00
parent 7863a15562
commit 194a12d7ab
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/utils/date-utils.ts
View File

@ -57,7 +57,7 @@ import { ANCHOR_ISO, MS_PER_DAY, PERIODS_PER_YEAR, PERIOD_DAYS } from "src/commo
//ensures the week starts from sunday //ensures the week starts from sunday
export function weekStartSunday(date_local: Date): Date { export function weekStartSunday(date_local: Date): Date {
const start_date = new Date(); const start_date = new Date();
start_date.setDate(date_local.getDate() - date_local.getDay()); start_date.setDate(date_local.getUTCDate() - date_local.getUTCDay());
return start_date; return start_date;
} }

5
src/time-and-attendance/expenses/services/expense-upsert.service.ts
View File

@ -1,6 +1,6 @@
import { weekStartSunday, toStringFromDate, toDateFromString } from "src/common/utils/date-utils"; import { weekStartSunday, toStringFromDate, toDateFromString } from "src/common/utils/date-utils";
import { EmailToIdResolver } from "src/common/mappers/email-id.mapper"; import { EmailToIdResolver } from "src/common/mappers/email-id.mapper";
import { expense_select } from "src/time-and-attendance/utils/selects.utils"; import { expense_select, timesheet_select } from "src/time-and-attendance/utils/selects.utils";
import { PrismaService } from "src/prisma/prisma.service"; import { PrismaService } from "src/prisma/prisma.service";
import { Injectable } from "@nestjs/common"; import { Injectable } from "@nestjs/common";
import { Result } from "src/common/errors/result-error.factory"; import { Result } from "src/common/errors/result-error.factory";
@ -33,6 +33,7 @@ export class ExpenseUpsertService {
//finds the timesheet using expense.date by finding the sunday //finds the timesheet using expense.date by finding the sunday
const start_date = weekStartSunday(normed_expense.data.date); const start_date = weekStartSunday(normed_expense.data.date);
const timesheet = await this.prisma.timesheets.findFirst({ const timesheet = await this.prisma.timesheets.findFirst({
where: { start_date, employee_id: employee_id.data }, where: { start_date, employee_id: employee_id.data },
select: { id: true, employee_id: true }, select: { id: true, employee_id: true },
@ -79,7 +80,7 @@ export class ExpenseUpsertService {
const timesheet = await this.prisma.timesheets.findUnique({ const timesheet = await this.prisma.timesheets.findUnique({
where: { id: dto.timesheet_id }, where: { id: dto.timesheet_id },
select: expense_select, select: timesheet_select,
}); });
if (!timesheet) return { success: false, error: `Timesheet ${dto.timesheet_id} not found` } if (!timesheet) return { success: false, error: `Timesheet ${dto.timesheet_id} not found` }