From 87142aa8d78324cf911c4149a415fbd0e9549484 Mon Sep 17 00:00:00 2001 From: Yannick1712 <52333989+Yannick1712@users.noreply.github.com> Date: Wed, 1 Apr 2026 15:16:38 +0200 Subject: [PATCH] [NOTASK] delete user deactivated --- .../generic/user/models/user/user.controller.ts | 12 ++++++++++-- .../generic/user/models/user/user.service.ts | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/subdomains/generic/user/models/user/user.controller.ts b/src/subdomains/generic/user/models/user/user.controller.ts index c6ea8037a4..7f822d28dd 100644 --- a/src/subdomains/generic/user/models/user/user.controller.ts +++ b/src/subdomains/generic/user/models/user/user.controller.ts @@ -146,7 +146,11 @@ export class UserController { @Delete() @ApiBearerAuth() - @UseGuards(AuthGuard(), RoleGuard(UserRole.USER), UserActiveGuard()) + @UseGuards( + AuthGuard(), + RoleGuard(UserRole.USER), + UserActiveGuard([UserStatus.BLOCKED, UserStatus.DELETED], [UserDataStatus.BLOCKED]), + ) @ApiOkResponse() @ApiOperation({ deprecated: true }) async deleteUser(@GetJwt() jwt: JwtPayload): Promise { @@ -297,7 +301,11 @@ export class UserV2Controller { @Delete('addresses/:address') @ApiBearerAuth() - @UseGuards(AuthGuard(), RoleGuard(UserRole.ACCOUNT), UserActiveGuard()) + @UseGuards( + AuthGuard(), + RoleGuard(UserRole.ACCOUNT), + UserActiveGuard([UserStatus.BLOCKED, UserStatus.DELETED], [UserDataStatus.BLOCKED]), + ) @ApiOkResponse() async deleteAddress(@GetJwt() jwt: JwtPayload, @Param('address') address: string): Promise { return this.userService.deactivateUser(jwt.account, address); diff --git a/src/subdomains/generic/user/models/user/user.service.ts b/src/subdomains/generic/user/models/user/user.service.ts index af0795dcbb..2ef6cd09c9 100644 --- a/src/subdomains/generic/user/models/user/user.service.ts +++ b/src/subdomains/generic/user/models/user/user.service.ts @@ -425,7 +425,6 @@ export class UserService { relations: { users: true, kycSteps: true }, }); if (!userData) throw new NotFoundException('User account not found'); - if (userData.isBlockedOrDeactivated) throw new BadRequestException('User account already deactivated'); if (address) { const user = userData.users.find((u) => u.address === address); @@ -436,6 +435,7 @@ export class UserService { return; } + if (userData.isBlockedOrDeactivated) throw new BadRequestException('User account already deactivated'); await this.userDataService.deactivateUserData(userData); }