Merge branch 'main' into BC-5119-Prevent-creating-new-neXboards

ansible/roles/schulcloud-server-init/templates/configmap_file_init.yml.j2

@@ -390,8 +390,8 @@ data:
                       }'
 
             # Add Bettermarks' tools configuration as an external tool
-            # (stored in the 'external_tools' collection) that uses OAuth.
-            mongosh $DATABASE__URL --eval 'db.external_tools.replaceOne(
+            # (stored in the 'external-tools' collection) that uses OAuth.
+            mongosh $DATABASE__URL --eval 'db.external-tools.replaceOne(
                 {
                   "name": "bettermarks",
                   "config_type": "oauth2"
@@ -486,9 +486,9 @@ data:
          echo "POSTed nextcloud to hydra."
 
          # Add Nextcloud' tools configuration as an external tool
-         # (stored in the 'external_tools' collection) that uses OAuth.
-         echo "Inserting nextcloud to external_tools..."
-         mongosh $DATABASE__URL --eval 'db.external_tools.update(
+         # (stored in the 'external-tools' collection) that uses OAuth.
+         echo "Inserting nextcloud to external-tools..."
+         mongosh $DATABASE__URL --eval 'db.external-tools.update(
              {
                "name": "nextcloud",
                "config_type": "oauth2"
@@ -512,7 +512,7 @@ data:
                "upsert": true
              }
          );'
-         echo "Inserted nextcloud to external_tools."
+         echo "Inserted nextcloud to external-tools."
 
          echo "Nextcloud config data init performed successfully."
     fi

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 = {