Merge branch 'main' into N21-2103-update-media-activations

hpi-schul-cloud · Dec 18, 2024 · 3200b50 · 3200b50
2 parents de94936 + 9a1c294
commit 3200b50
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/apps/server/src/modules/provisioning/loggable/group-provisioning-info.loggable.spec.ts b/apps/server/src/modules/provisioning/loggable/group-provisioning-info.loggable.spec.ts
@@ -11,7 +11,7 @@ describe(GroupProvisioningInfoLoggable.name, () => {
 				otherUsers: externalGroupUserDtoFactory.buildList(otherUserCount),
 			});
 
-			const loggable = new GroupProvisioningInfoLoggable(externalGroups, 100);
+			const loggable = new GroupProvisioningInfoLoggable(externalGroups, 100, 'igorHatGesagt');
 
 			return {
 				loggable,
@@ -31,6 +31,7 @@ describe(GroupProvisioningInfoLoggable.name, () => {
 					groupCount,
 					userCount: totalUserCount,
 					durationMs: 100,
+					externalUserId: 'igorHatGesagt',
 				},
 			});
 		});

diff --git a/apps/server/src/modules/provisioning/loggable/group-provisioning-info.loggable.ts b/apps/server/src/modules/provisioning/loggable/group-provisioning-info.loggable.ts
@@ -2,7 +2,11 @@ import { ErrorLogMessage, Loggable, LogMessage, ValidationErrorLogMessage } from
 import { ExternalGroupDto } from '../dto';
 
 export class GroupProvisioningInfoLoggable implements Loggable {
-	constructor(private readonly groups: ExternalGroupDto[], private readonly durationMs: number) {}
+	constructor(
+		private readonly groups: ExternalGroupDto[],
+		private readonly durationMs: number,
+		private readonly externalUserId: string
+	) {}
 
 	public getLogMessage(): LogMessage | ErrorLogMessage | ValidationErrorLogMessage {
 		const userCount = this.groups.reduce(
@@ -16,6 +20,7 @@ export class GroupProvisioningInfoLoggable implements Loggable {
 				groupCount: this.groups.length,
 				userCount,
 				durationMs: this.durationMs,
+				externalUserId: this.externalUserId,
 			},
 		};
 	}

diff --git a/apps/server/src/modules/provisioning/strategy/schulconnex/schulconnex.strategy.ts b/apps/server/src/modules/provisioning/strategy/schulconnex/schulconnex.strategy.ts
@@ -103,7 +103,9 @@ export abstract class SchulconnexProvisioningStrategy extends ProvisioningStrate
 		}
 
 		const endTime = performance.now();
-		this.logger.warning(new GroupProvisioningInfoLoggable(data.externalGroups ?? [], endTime - startTime));
+		this.logger.warning(
+			new GroupProvisioningInfoLoggable(data.externalGroups ?? [], endTime - startTime, data.externalUser.externalId)
+		);
 	}
 
 	private async removeUserFromGroups(data: OauthDataDto): Promise<void> {