This commit is contained in:
Bastian Wagner
2026-08-01 13:17:26 +02:00
parent e3bff40181
commit 4c1bd49405
23 changed files with 185 additions and 2027 deletions

View File

@@ -94,11 +94,7 @@ describe('AdminUsersService', () => {
},
manager,
);
expect(lockedUserQuery.setLock).toHaveBeenCalledWith(
'pessimistic_write',
undefined,
['lockedUser'],
);
expect(lockedUserQuery.setLock).toHaveBeenCalledWith('pessimistic_write');
expect(lockedUserQuery.leftJoinAndSelect).toHaveBeenCalledTimes(2);
});
@@ -122,11 +118,7 @@ describe('AdminUsersService', () => {
service.updateRole(actorId, target.id, RoleEnum.user),
).rejects.toBeInstanceOf(ConflictException);
expect(lockQuery.setLock).toHaveBeenCalledWith(
'pessimistic_write',
undefined,
['user'],
);
expect(lockQuery.setLock).toHaveBeenCalledWith('pessimistic_write');
expect(dataSource.transaction).toHaveBeenCalledTimes(1);
expect(userRepository.save).not.toHaveBeenCalled();
});

View File

@@ -269,7 +269,7 @@ export class AdminUsersService {
.andWhere('status.id = :activeStatus', {
activeStatus: StatusEnum.active,
})
.setLock('pessimistic_write', undefined, ['user'])
.setLock('pessimistic_write')
.orderBy('user.id', 'ASC')
.getMany();
}
@@ -283,7 +283,7 @@ export class AdminUsersService {
.leftJoinAndSelect('lockedUser.role', 'role')
.leftJoinAndSelect('lockedUser.status', 'status')
.where('lockedUser.id = :userId', { userId })
.setLock('pessimistic_write', undefined, ['lockedUser'])
.setLock('pessimistic_write')
.getOne();
if (!user) throw new NotFoundException('User not found');
return user;