refactor: the whole role and permission flow

src/modules/payments/payments.controller.ts

@@ -11,11 +11,11 @@ import { VerifyParamDto, VerifyQueryDto } from "./DTO/verify-payment.dto";
 import { PaymentsService } from "./providers/payments.service";
 import { AuthGuards } from "../../common/decorators/auth-guard.decorator";
 import { Pagination } from "../../common/decorators/pagination.decorator";
-import { Roles } from "../../common/decorators/roles.decorator";
+import { PermissionsDec } from "../../common/decorators/permission.decorator";
 import { UserDec } from "../../common/decorators/user.decorator";
 import { PaginationDto } from "../../common/DTO/pagination.dto";
 import { ParamDto } from "../../common/DTO/param.dto";
-import { RoleEnum } from "../users/enums/role.enum";
+import { PermissionEnum } from "../users/enums/permission.enum";
 
 @Controller("payments")
 @ApiTags("Payments")
@@ -31,7 +31,6 @@ export class PaymentsController {
 
   @ApiOperation({ summary: "Charge wallet ==> user route" })
   @AuthGuards()
-  @Roles(RoleEnum.USER)
   @Post("deposit/gateway")
   chargeWalletWithGateway(@Body() chargeDto: GatewayDepositDto, @UserDec("id") userId: string) {
     return this.paymentsService.chargeWalletWithGateway(chargeDto, userId);
@@ -39,50 +38,49 @@ export class PaymentsController {
 
   @ApiOperation({ summary: "charge wallet with transfer ==> user route" })
   @AuthGuards()
-  @Roles(RoleEnum.USER)
   @Post("deposit/transfer")
   chargeWalletWithTransfer(@Body() depositDto: TransferDepositDto, @UserDec("id") userId: string) {
     return this.paymentsService.chargeWalletWithTransfer(depositDto, userId);
   }
 
   @ApiOperation({ summary: "get deposit request of users ==> admin route" })
+  @PermissionsDec(PermissionEnum.PAYMENTS)
   @AuthGuards()
   @Pagination()
-  @Roles(RoleEnum.ADMIN)
   @Get("deposit/transfer")
   getDepositRequests(@Query() queryDto: PaymentTransactionQueryDto) {
     return this.paymentsService.getDepositRequests(queryDto);
   }
 
   @ApiOperation({ summary: "get deposit gateway payment ==> admin route" })
+  @PermissionsDec(PermissionEnum.PAYMENTS)
   @AuthGuards()
   @Pagination()
-  @Roles(RoleEnum.ADMIN)
   @Get("deposit/gateway")
   getDepositGatewayPayment(@Query() queryDto: PaginationDto) {
     return this.paymentsService.getDepositGatewayPayment(queryDto);
   }
 
   @ApiOperation({ summary: "approve deposit request ==> admin route" })
+  @PermissionsDec(PermissionEnum.PAYMENTS)
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN)
   @Post("deposit/transfer/approve/:id")
   approverDepositRequest(@Param() paramDto: ParamDto) {
     return this.paymentsService.approverDepositRequest(paramDto.id);
   }
 
   @ApiOperation({ summary: "reject deposit request ==> admin route" })
+  @PermissionsDec(PermissionEnum.PAYMENTS)
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN)
   @Post("deposit/transfer/reject/:id")
   rejectDepositRequest(@Param() paramDto: ParamDto, @Body() rejectDto: RejectDepositRequestDto) {
     return this.paymentsService.rejectDepositRequest(paramDto.id, rejectDto);
   }
 
   @ApiOperation({ summary: "get transaction for admin" })
+  @PermissionsDec(PermissionEnum.PAYMENTS)
   @AuthGuards()
   @Pagination()
-  @Roles(RoleEnum.ADMIN)
   @Get("transactions")
   getTransaction(@Query() queryDto: SearchTransactionQueryDto) {
     return this.paymentsService.getTransactions(queryDto);
@@ -96,7 +94,7 @@ export class PaymentsController {
   ///------------------- bank account -----------------------------
 
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN)
+  @PermissionsDec(PermissionEnum.PAYMENTS, PermissionEnum.BANK_ACCOUNTS)
   @ApiOperation({ summary: "add bank account for transfer and deposit ==> admin route" })
   @Post("bank-account")
   addBankAccount(@Body() createDto: CreateBankAccountDto) {
@@ -104,7 +102,6 @@ export class PaymentsController {
   }
 
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN, RoleEnum.USER)
   @ApiOperation({ summary: "get bank account by id" })
   @Get("bank-account/:id")
   getBankAccountById(@Param() paramDto: ParamDto) {
@@ -112,19 +109,18 @@ export class PaymentsController {
   }
 
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN)
   @ApiOperation({ summary: "update bank account with its id" })
+  @PermissionsDec(PermissionEnum.PAYMENTS, PermissionEnum.BANK_ACCOUNTS)
   @Patch("bank-account/:id")
   updateBankAccount(@Body() updateDto: UpdateBankAccountDto, @Param() paramDto: ParamDto) {
     return this.paymentsService.updateBankAccount(updateDto, paramDto.id);
   }
 
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN, RoleEnum.USER)
   @ApiOperation({ summary: "get bank account" })
   @Get("bank-account")
-  getBankAccounts(@UserDec("roles") roles: RoleEnum[]) {
-    return this.paymentsService.getBankAccounts(roles);
+  getBankAccounts(@UserDec("isAdmin") isAdmin: boolean) {
+    return this.paymentsService.getBankAccounts(isAdmin);
   }
 
   ///------------------- Deposit transfer -----------------------------