From d7444d6073bbf945e468cd75ddfdc8e6fc1b3362 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 14 Nov 2026 07:13:22 +0000 Subject: [PATCH] Refactor: extract findUserOrThrow in AuthService, drop dead test vars - AuthService: getProfile, updateSettings and updateProfile each repeated the same find-by-id + "User not found" check; move it into a private findUserOrThrow helper. Same query, same error. - MarkupToPdfReportGenerator: type the standalone browser variable. - Tests: remove an unused options object and an unused result variable. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_012GTictqecCYiBSiCMj1RKN --- auth/auth.service.ts | 23 +++++++++---------- .../__tests__/base-entity.service.spec.ts | 7 ------ .../report/__tests__/pdf-render.scope.spec.ts | 2 +- utils/report/markup-to-pdf.generator.ts | 2 +- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/auth/auth.service.ts b/auth/auth.service.ts index 02e85f6..0fbf8cb 100644 --- a/auth/auth.service.ts +++ b/auth/auth.service.ts @@ -136,10 +136,7 @@ export class AuthService { } async getProfile(userId: number) { - const user = await this.userRepository.findOneBy({ id: userId }); - if (!user) { - throw new Error('User not found'); - } + const user = await this.findUserOrThrow(userId); if (!user.additionalData?.yemotWebhookToken) { user.additionalData = { @@ -158,10 +155,7 @@ export class AuthService { } async updateSettings(userId: number, data: any) { - const user = await this.userRepository.findOneBy({ id: userId }); - if (!user) { - throw new Error('User not found'); - } + const user = await this.findUserOrThrow(userId); user.additionalData = { ...user.additionalData, @@ -173,10 +167,7 @@ export class AuthService { } async updateProfile(userId: number, data: UpdateProfileData) { - const user = await this.userRepository.findOneBy({ id: userId }); - if (!user) { - throw new Error('User not found'); - } + const user = await this.findUserOrThrow(userId); const update: Partial = {}; if (data.phoneNumber !== undefined) { @@ -199,6 +190,14 @@ export class AuthService { return { success: true }; } + private async findUserOrThrow(userId: number): Promise { + const user = await this.userRepository.findOneBy({ id: userId }); + if (!user) { + throw new Error('User not found'); + } + return user; + } + private async validateMailAddressAlias(userId: number, alias: string) { if (!MAIL_ALIAS_REGEX.test(alias)) { throw new BadRequestException('כתובת המייל אינה תקינה - יש להשתמש באותיות באנגלית, מספרים, נקודה, מקף או קו תחתון (3-64 תווים)'); diff --git a/base-entity/__tests__/base-entity.service.spec.ts b/base-entity/__tests__/base-entity.service.spec.ts index ae485bf..dc966a2 100644 --- a/base-entity/__tests__/base-entity.service.spec.ts +++ b/base-entity/__tests__/base-entity.service.spec.ts @@ -61,13 +61,6 @@ describe('BaseEntityService', () => { name: string; userId?: number; } - const options = { - model: { - type: TestEntity, - options: {} - } - }; - const mockRepository = { target: TestEntity, manager: { diff --git a/utils/report/__tests__/pdf-render.scope.spec.ts b/utils/report/__tests__/pdf-render.scope.spec.ts index e015ec2..8c44a7b 100644 --- a/utils/report/__tests__/pdf-render.scope.spec.ts +++ b/utils/report/__tests__/pdf-render.scope.spec.ts @@ -103,7 +103,7 @@ describe('BulkToPdfReportGenerator render scope', () => { .mockResolvedValue(onePagePdfBuffer); const bulkGenerator = new BulkToPdfReportGenerator(new TestMarkupToPdfGenerator(() => 'test')); - const result = await bulkGenerator.getFileBuffer([1, 2, 3]); + await bulkGenerator.getFileBuffer([1, 2, 3]); expect(puppeteer.launch).toHaveBeenCalledTimes(2); // shared browser relaunched once diff --git a/utils/report/markup-to-pdf.generator.ts b/utils/report/markup-to-pdf.generator.ts index be961a0..7b9f36e 100644 --- a/utils/report/markup-to-pdf.generator.ts +++ b/utils/report/markup-to-pdf.generator.ts @@ -82,7 +82,7 @@ export abstract class MarkupToPdfReportGenerator extends BaseR } await acquireBrowserSlot(queueDeadline); - let browser; + let browser: Browser | undefined; try { browser = await puppeteer.launch({ args: PUPPETEER_LAUNCH_ARGS }); return await this.renderPdfOnBrowser(browser, markup);