Merge branch 'main' into BC-9204

Author: bischofmax

apps/server/src/modules/provisioning/service/tsp-provisioning.service.spec.ts

@@ -610,5 +610,33 @@ describe('TspProvisioningService', () => {
 				await expect(() => sut.provisionUser(data, school)).rejects.toThrow(BadDataLoggableException);
 			});
 		});
+
+		describe('when an error occurs while saving account', () => {
+			const setup = () => {
+				const school = schoolFactory.build();
+				const data = oauthDataDtoFactory.build({
+					system: provisioningSystemDtoFactory.build(),
+					externalUser: externalUserDtoFactory.build(),
+					externalSchool: externalSchoolDtoFactory.build(),
+				});
+				const user = userDoFactory.build({ id: faker.string.uuid(), roles: [] });
+
+				userServiceMock.findByExternalId.mockResolvedValueOnce(null);
+				userServiceMock.save.mockResolvedValueOnce(user);
+				schoolServiceMock.getSchools.mockResolvedValueOnce([school]);
+				roleServiceMock.findByNames.mockResolvedValueOnce([]);
+
+				accountServiceMock.findByUserId.mockRejectedValueOnce(new Error('Test error'));
+
+				return { data, school, user };
+			};
+
+			it('should delete the user and throw BadDataLoggableException', async () => {
+				const { data, school, user } = setup();
+
+				await expect(sut.provisionUser(data, school)).rejects.toThrow(BadDataLoggableException);
+				expect(userServiceMock.deleteUser).toHaveBeenCalledWith(user.id);
+			});
+		});
 	});
 });

apps/server/src/modules/provisioning/service/tsp-provisioning.service.ts

@@ -199,9 +199,16 @@ export class TspProvisioningService {
 		}
 		const savedUser = await this.userService.save(user);
 
-		const account = await this.accountService.findByUserId(savedUser.id ?? '');
-		const updated = this.createOrUpdateAccount(data.system.systemId, savedUser, account);
-		await this.accountService.save(updated);
+		try {
+			const account = await this.accountService.findByUserId(savedUser.id ?? '');
+			const updated = this.createOrUpdateAccount(data.system.systemId, savedUser, account);
+			await this.accountService.save(updated);
+		} catch (error) {
+			if (existingUser === null) {
+				await this.userService.deleteUser(savedUser.id ?? '');
+			}
+			throw new BadDataLoggableException('Error while saving account', { externalId: data.externalUser.externalId });
+		}
 
 		return user;
 	}

apps/server/src/modules/user/repo/mikro-orm/user.repo.ts

@@ -11,11 +11,11 @@ import { UserScope } from './user.scope';
 
 @Injectable()
 export class UserRepo extends BaseRepo<User> {
-	get entityName() {
+	get entityName(): typeof User {
 		return User;
 	}
 
-	async findById(id: EntityId, populate = false): Promise<User> {
+	public async findById(id: EntityId, populate = false): Promise<User> {
 		const user = await super.findById(id);
 
 		if (populate) {
@@ -26,7 +26,7 @@ export class UserRepo extends BaseRepo<User> {
 		return user;
 	}
 
-	async findByIdOrNull(id: EntityId, populate = false): Promise<User | null> {
+	public async findByIdOrNull(id: EntityId, populate = false): Promise<User | null> {
 		const user: User | null = await this._em.findOne(User, { id });
 
 		if (!user) {
@@ -41,7 +41,7 @@ export class UserRepo extends BaseRepo<User> {
 		return user;
 	}
 
-	async findByExternalIdOrFail(externalId: string, systemId: string): Promise<User> {
+	public async findByExternalIdOrFail(externalId: string, systemId: string): Promise<User> {
 		const [users] = await this._em.findAndCount(User, { externalId }, { populate: ['school.systems'] });
 		const resultUser = users.find((user) => {
 			const { systems } = user.school;
@@ -50,7 +50,7 @@ export class UserRepo extends BaseRepo<User> {
 		return resultUser ?? Promise.reject();
 	}
 
-	async findForImportUser(
+	public async findForImportUser(
 		school: SchoolEntity,
 		filters?: ImportUserNameMatchFilter,
 		options?: IFindOptions<User>
@@ -71,23 +71,23 @@ export class UserRepo extends BaseRepo<User> {
 		return countedUsers;
 	}
 
-	async findByEmail(email: string): Promise<User[]> {
+	public findByEmail(email: string): Promise<User[]> {
 		// find mail case-insensitive by regex
 		const promise: Promise<User[]> = this._em.find(User, {
 			email: new RegExp(`^${email.replace(/\W/g, '\\$&')}$`, 'i'),
 		});
 		return promise;
 	}
 
-	async deleteUser(userId: EntityId): Promise<number> {
+	public async deleteUser(userId: EntityId): Promise<number> {
 		const deletedUserNumber = await this._em.nativeDelete(User, {
 			id: userId,
 		});
 
 		return deletedUserNumber;
 	}
 
-	async getParentEmailsFromUser(userId: EntityId): Promise<string[]> {
+	public async getParentEmailsFromUser(userId: EntityId): Promise<string[]> {
 		const user: User | null = await this._em.findOne(User, { id: userId });
 		let parentsEmails: string[] = [];
 		if (user !== null) {
@@ -109,11 +109,11 @@ export class UserRepo extends BaseRepo<User> {
 		}
 	}
 
-	saveWithoutFlush(user: User): void {
+	public saveWithoutFlush(user: User): void {
 		this._em.persist(user);
 	}
 
-	async flush(): Promise<void> {
+	public async flush(): Promise<void> {
 		await this._em.flush();
 	}
 

apps/server/src/modules/user/service/user.service.spec.ts

@@ -847,6 +847,46 @@ describe('UserService', () => {
 		});
 	});
 
+	describe('deleteUser', () => {
+		describe('when user is successfully deleted', () => {
+			const setup = () => {
+				const userId = new ObjectId().toHexString();
+
+				userRepo.deleteUser.mockResolvedValueOnce(1);
+
+				return { userId };
+			};
+
+			it('should return true', async () => {
+				const { userId } = setup();
+
+				const result = await service.deleteUser(userId);
+
+				expect(result).toBe(true);
+				expect(userRepo.deleteUser).toHaveBeenCalledWith(userId);
+			});
+		});
+
+		describe(`when user was not deleted`, () => {
+			const setup = () => {
+				const userId = new ObjectId().toHexString();
+
+				userRepo.deleteUser.mockResolvedValueOnce(0);
+
+				return { userId };
+			};
+
+			it('should return false', async () => {
+				const { userId } = setup();
+
+				const result = await service.deleteUser(userId);
+
+				expect(result).toBe(false);
+				expect(userRepo.deleteUser).toHaveBeenCalledWith(userId);
+			});
+		});
+	});
+
 	describe('deleteUserData', () => {
 		describe('when user is missing', () => {
 			const setup = () => {

apps/server/src/modules/user/service/user.service.ts

@@ -228,6 +228,14 @@ export class UserService implements DeletionService, IEventHandler<UserDeletedEv
 		}
 	}
 
+	public async deleteUser(userId: EntityId): Promise<boolean> {
+		const deletionCount = await this.userRepo.deleteUser(userId);
+
+		const userDeleted = deletionCount === 1;
+
+		return userDeleted;
+	}
+
 	public async deleteUserData(userId: EntityId): Promise<DomainDeletionReport> {
 		this.logger.info(
 			new DataDeletionDomainOperationLoggable('Deleting user', DomainName.USER, userId, StatusModel.PENDING)