immich-app/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-12-25 17:24:58 +03:00
Code Issues Packages Projects Releases 18 Wiki Activity

fix(server): restore user (#15763)

Browse Source
This commit is contained in:
Jason Rasmussen
2025-01-29 11:49:08 -05:00
committed by GitHub
parent 9033a99587
commit a0aea021a1
9 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/services/user-admin.service.spec.ts
View File

@@ -173,9 +173,9 @@ describe(UserAdminService.name, () => {
it('should restore an user', async () => {
userMock.get.mockResolvedValue(userStub.user1);
userMock.update.mockResolvedValue(userStub.user1);
userMock.restore.mockResolvedValue(userStub.user1);
await expect(sut.restore(authStub.admin, userStub.user1.id)).resolves.toEqual(mapUserAdmin(userStub.user1));
expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, { status: UserStatus.ACTIVE, deletedAt: null });
expect(userMock.restore).toHaveBeenCalledWith(userStub.user1.id);
});
});
});

2
server/src/services/user-admin.service.ts
View File

@@ -102,7 +102,7 @@ export class UserAdminService extends BaseService {
async restore(auth: AuthDto, id: string): Promise<UserAdminResponseDto> {
await this.findOrFail(id, { withDeleted: true });
await this.albumRepository.restoreAll(id);
const user = await this.userRepository.update(id, { deletedAt: null, status: UserStatus.ACTIVE });
const user = await this.userRepository.restore(id);
return mapUserAdmin(user);
}