Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions auth/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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,
Expand All @@ -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<User> = {};
if (data.phoneNumber !== undefined) {
Expand All @@ -199,6 +190,14 @@ export class AuthService {
return { success: true };
}

private async findUserOrThrow(userId: number): Promise<User> {
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 תווים)');
Expand Down
7 changes: 0 additions & 7 deletions base-entity/__tests__/base-entity.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,6 @@ describe('BaseEntityService', () => {
name: string;
userId?: number;
}
const options = {
model: {
type: TestEntity,
options: {}
}
};

const mockRepository = {
target: TestEntity,
manager: {
Expand Down
2 changes: 1 addition & 1 deletion utils/report/__tests__/pdf-render.scope.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion utils/report/markup-to-pdf.generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export abstract class MarkupToPdfReportGenerator<T = any, U = any> 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);
Expand Down
Loading