refactor: the whole role and permission flow

src/modules/invoices/invoices.controller.ts

@@ -7,18 +7,18 @@ import { InvoicesSearchQueryDto, UserInvoicesSearchQueryDto } from "./DTO/invoic
 import { InvoicesService } from "./providers/invoices.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 { ParamDto } from "../../common/DTO/param.dto";
-import { RoleEnum } from "../users/enums/role.enum";
+import { PermissionEnum } from "../users/enums/permission.enum";
 
 @Controller("invoices")
 export class InvoicesController {
   constructor(private readonly invoiceService: InvoicesService) {}
 
   @ApiOperation({ summary: "create an invoice ==> admin route" })
+  @PermissionsDec(PermissionEnum.INVOICES)
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN)
   @Post()
   createInvoice(@Body() createDto: CreateInvoiceDto) {
     return this.invoiceService.createInvoiceAdmin(createDto);
@@ -26,8 +26,8 @@ export class InvoicesController {
 
   @ApiOperation({ summary: "get all invoices ==> admin route" })
   @AuthGuards()
+  @PermissionsDec(PermissionEnum.INVOICES)
   @Pagination()
-  @Roles(RoleEnum.ADMIN)
   @Get()
   getInvoices(@Query() queryDto: InvoicesSearchQueryDto) {
     return this.invoiceService.getInvoices(queryDto);
@@ -35,7 +35,6 @@ export class InvoicesController {
 
   @ApiOperation({ summary: "get all user invoices" })
   @AuthGuards()
-  @Roles(RoleEnum.USER)
   @Pagination()
   @Get("user")
   getUserInvoices(@Query() queryDto: UserInvoicesSearchQueryDto, @UserDec("id") userId: string) {
@@ -44,10 +43,9 @@ export class InvoicesController {
 
   @ApiOperation({ summary: "get single invoice by Id " })
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN, RoleEnum.USER)
   @Get(":id")
-  getInvoiceById(@Param() paramDto: ParamDto, @UserDec("roles") roles: RoleEnum[], @UserDec("id") userId: string) {
-    return this.invoiceService.getInvoiceById(paramDto.id, roles, userId);
+  getInvoiceById(@Param() paramDto: ParamDto, @UserDec("isAdmin") isAdmin: boolean, @UserDec("id") userId: string) {
+    return this.invoiceService.getInvoiceById(paramDto.id, isAdmin, userId);
   }
 
   @Post(":id/apply-discount")

src/modules/invoices/providers/invoices.service.ts

@@ -6,7 +6,6 @@ import { QueryRunner } from "typeorm";
 import { InvoiceMessage } from "../../../common/enums/message.enum";
 import { DiscountRepository } from "../../discounts/repositories/discount.repository";
 import { SubscriptionPlan } from "../../subscriptions/entities/subscription.entity";
-import { RoleEnum } from "../../users/enums/role.enum";
 import { PaginationUtils } from "../../utils/providers/pagination.utils";
 import { ApplyDiscountDto } from "../DTO/apply-discount-invoice.dto";
 import { CreateInvoiceDto } from "../DTO/create-invoice.dto";
@@ -126,10 +125,10 @@ export class InvoicesService {
   }
 
   //*********************************** */
-  async getInvoiceById(invoiceId: string, roles: RoleEnum[], userId: string) {
+  async getInvoiceById(invoiceId: string, isAdmin: boolean, userId: string) {
     let invoice: Invoice | null;
 
-    if (roles.includes(RoleEnum.ADMIN)) {
+    if (isAdmin) {
       invoice = await this.invoiceRepository.findOne({
         where: { id: invoiceId },
         relations: { items: { subscriptionPlan: true }, user: true },