From 8c816da28696da10de6a10a8822002ebeca1cf15 Mon Sep 17 00:00:00 2001 From: Matthieu Haineault Date: Fri, 14 Nov 2025 09:39:15 -0500 Subject: [PATCH] cleaning(): more cleaning and imports ajustements --- src/common/mappers/bank-type-id.mapper.ts | 14 ++++++++------ src/common/mappers/email-id.mapper.ts | 3 ++- src/common/mappers/shifts-id.mapper.ts | 10 +++++----- .../identity-and-account.module.ts | 2 ++ .../preferences/preferences.module.ts | 3 ++- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/common/mappers/bank-type-id.mapper.ts b/src/common/mappers/bank-type-id.mapper.ts index 725a84f..9d6b8cc 100644 --- a/src/common/mappers/bank-type-id.mapper.ts +++ b/src/common/mappers/bank-type-id.mapper.ts @@ -23,25 +23,27 @@ export class BankCodesResolver { }; //finds only id by type - readonly findBankCodeIDByType = async (type: string, client?: Tx): Promise> => { + readonly findBankCodeIDByType = async (type: string, client?: Tx + ): Promise> => { const db = client ?? this.prisma; const bank_code = await db.bankCodes.findFirst({ where: { type }, select: { id: true }, }); - if (!bank_code) return { success: false, error:`Unkown bank type: ${type}`}; + if (!bank_code) return { success: false, error: `Unkown bank type: ${type}` }; - return { success: true, data: bank_code.id}; + return { success: true, data: bank_code.id }; } - readonly findTypeByBankCodeId = async (bank_code_id: number, client?: Tx): Promise> => { + readonly findTypeByBankCodeId = async (bank_code_id: number, client?: Tx + ): Promise> => { const db = client ?? this.prisma; const bank_code = await db.bankCodes.findFirst({ where: { id: bank_code_id }, select: { type: true }, }); - if (!bank_code) return {success: false, error: `Type with id : ${bank_code_id} not found` } + if (!bank_code) return { success: false, error: `Type with id : ${bank_code_id} not found` } - return {success: true, data: bank_code.type}; + return { success: true, data: bank_code.type }; } } \ No newline at end of file diff --git a/src/common/mappers/email-id.mapper.ts b/src/common/mappers/email-id.mapper.ts index 14e0bc0..731c817 100644 --- a/src/common/mappers/email-id.mapper.ts +++ b/src/common/mappers/email-id.mapper.ts @@ -11,7 +11,8 @@ export class EmailToIdResolver { constructor(private readonly prisma: PrismaService) { } // find employee_id using email - readonly findIdByEmail = async (email: string, client?: Tx): Promise> => { + readonly findIdByEmail = async (email: string, client?: Tx + ): Promise> => { const db = client ?? this.prisma; const employee = await db.employees.findFirst({ where: { user: { email } }, diff --git a/src/common/mappers/shifts-id.mapper.ts b/src/common/mappers/shifts-id.mapper.ts index 350069a..35ae5e2 100644 --- a/src/common/mappers/shifts-id.mapper.ts +++ b/src/common/mappers/shifts-id.mapper.ts @@ -15,12 +15,13 @@ interface ShiftKey { } export class ShiftIdResolver { - constructor(private readonly prisma: PrismaService) {} + constructor(private readonly prisma: PrismaService) { } - readonly findShiftIdByData = async ( key: ShiftKey, client?: Tx ): Promise> => { + readonly findShiftIdByData = async (key: ShiftKey, client?: Tx + ): Promise> => { const db = client ?? this.prisma; const shift = await db.shifts.findFirst({ - where: { + where: { timesheet_id: key.timesheet_id, bank_code_id: key.bank_code_id, date: key.date, @@ -31,9 +32,8 @@ export class ShiftIdResolver { }, select: { id: true }, }); + if (!shift) return { success: false, error: `shift not found` } - if(!shift) return { success: false, error: `shift not found`} - return { success: true, data: shift.id }; }; } \ No newline at end of file diff --git a/src/identity-and-account/identity-and-account.module.ts b/src/identity-and-account/identity-and-account.module.ts index 32c8c69..a656fc2 100644 --- a/src/identity-and-account/identity-and-account.module.ts +++ b/src/identity-and-account/identity-and-account.module.ts @@ -1,4 +1,5 @@ import { Module } from "@nestjs/common"; +import { EmailToIdResolver } from "src/common/mappers/email-id.mapper"; import { EmployeesController } from "src/identity-and-account/employees/controllers/employees.controller"; import { EmployeesModule } from "src/identity-and-account/employees/employees.module"; import { EmployeesArchivalService } from "src/identity-and-account/employees/services/employees-archival.service"; @@ -24,6 +25,7 @@ import { UsersModule } from "src/identity-and-account/users-management/users.mod EmployeesService, PreferencesService, UsersService, + EmailToIdResolver, ], }) export class IdentityAndAccountModule { }; diff --git a/src/identity-and-account/preferences/preferences.module.ts b/src/identity-and-account/preferences/preferences.module.ts index 1873933..b8808bf 100644 --- a/src/identity-and-account/preferences/preferences.module.ts +++ b/src/identity-and-account/preferences/preferences.module.ts @@ -1,10 +1,11 @@ +import { EmailToIdResolver } from "src/common/mappers/email-id.mapper"; import { PreferencesController } from "./controllers/preferences.controller"; import { PreferencesService } from "./services/preferences.service"; import { Module } from "@nestjs/common"; @Module({ controllers: [ PreferencesController ], - providers: [ PreferencesService ], + providers: [ PreferencesService, EmailToIdResolver ], exports: [ PreferencesService ], })