Merge branch 'BC-5629-batch-deletion-mechanism' into BC-5628-cyclic-d…

…ata-deletion

apps/server/src/modules/deletion/console/deletion-console.app.ts → apps/server/src/apps/deletion-console.app.ts

@@ -1,12 +1,18 @@
 /* istanbul ignore file */
 import { BootstrapConsole } from 'nestjs-console';
-import { DeletionConsoleModule } from './deletion-console.module';
+import { DeletionConsoleModule } from '@modules/deletion';
 
 const bootstrap = new BootstrapConsole({
 	module: DeletionConsoleModule,
 	useDecorators: true,
 });
 
+const logErrorAndSetExitCode = (err: unknown) => {
+	// eslint-disable-next-line no-console
+	console.error(err);
+	process.exitCode = 1;
+};
+
 bootstrap
 	.init()
 	.then(async (app) => {
@@ -18,13 +24,7 @@ bootstrap
 		} catch (err) {
 			await app.close();
 
-			// eslint-disable-next-line no-console
-			console.error(err);
-			process.exitCode = 1;
+			logErrorAndSetExitCode(err);
 		}
 	})
-	.catch((err) => {
-		// eslint-disable-next-line no-console
-		console.error(err);
-		process.exitCode = 1;
-	});
+	.catch((err) => logErrorAndSetExitCode(err));

apps/server/src/core/error/loggable/axios-error.loggable.spec.ts

@@ -0,0 +1,32 @@
+import { axiosErrorFactory } from '@shared/testing/factory';
+import { AxiosError } from 'axios';
+import { AxiosErrorLoggable } from './axios-error.loggable';
+
+describe(AxiosErrorLoggable.name, () => {
+	describe('getLogMessage', () => {
+		const setup = () => {
+			const error = {
+				error: 'invalid_request',
+			};
+			const type = 'mockType';
+			const axiosError: AxiosError = axiosErrorFactory.withError(error).build();
+
+			const axiosErrorLoggable = new AxiosErrorLoggable(axiosError, type);
+
+			return { axiosErrorLoggable, error, axiosError };
+		};
+
+		it('should return error log message', () => {
+			const { axiosErrorLoggable, error, axiosError } = setup();
+
+			const result = axiosErrorLoggable.getLogMessage();
+
+			expect(result).toEqual({
+				type: 'mockType',
+				message: axiosError.message,
+				data: JSON.stringify(error),
+				stack: 'mockStack',
+			});
+		});
+	});
+});

apps/server/src/core/error/loggable/axios-error.loggable.ts

@@ -0,0 +1,20 @@
+import { HttpException, HttpStatus } from '@nestjs/common';
+import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from '@src/core/logger';
+import { AxiosError } from 'axios';
+
+export class AxiosErrorLoggable extends HttpException implements Loggable {
+	constructor(private readonly axiosError: AxiosError, protected readonly type: string) {
+		super(JSON.stringify(axiosError.response?.data), axiosError.status ?? HttpStatus.INTERNAL_SERVER_ERROR, {
+			cause: axiosError.cause,
+		});
+	}
+
+	getLogMessage(): LogMessage | ErrorLogMessage | ValidationErrorLogMessage {
+		return {
+			message: this.axiosError.message,
+			type: this.type,
+			data: JSON.stringify(this.axiosError.response?.data),
+			stack: this.axiosError.stack,
+		};
+	}
+}

apps/server/src/core/error/loggable/index.ts

@@ -0,0 +1,2 @@
+export * from './error.loggable';
+export * from './axios-error.loggable';

apps/server/src/core/logger/types/logging.types.ts

@@ -7,7 +7,7 @@ export type ErrorLogMessage = {
 	error?: Error;
 	type: string; // TODO: use enum
 	stack?: string;
-	data?: { [key: string]: string | number | undefined };
+	data?: { [key: string]: string | number | boolean | undefined };
 };
 
 export type ValidationErrorLogMessage = {