refactor: the whole role and permission flow

src/modules/announcements/announcement.controller.ts

@@ -4,12 +4,12 @@ import { ApiProperty, ApiTags } from "@nestjs/swagger";
 import { AnnouncementService } from "./announcement.service";
 import { CreateAnnouncementDto } from "./DTO/create-announcement.dto";
 import { AuthGuards } from "../../common/decorators/auth-guard.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 { SearchCriticismQueryDto } from "../criticisms/DTO/search-criticism-query.dto";
 import { User } from "../users/entities/user.entity";
-import { RoleEnum } from "../users/enums/role.enum";
+import { PermissionEnum } from "../users/enums/permission.enum";
 
 @ApiTags("Announcements")
 @Controller("announcements")
@@ -17,27 +17,21 @@ export class AnnouncementController {
   constructor(private readonly announcementService: AnnouncementService) {}
 
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN)
-  @ApiProperty({
-    description: "Create a new announcement ===> login as admin",
-  })
+  @ApiProperty({ description: "Create a new announcement ===> login as admin" })
   @Post()
   async create(@Body() createAnnouncementDto: CreateAnnouncementDto) {
     return await this.announcementService.createAnnouncement(createAnnouncementDto);
   }
 
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN, RoleEnum.USER)
-  @ApiProperty({
-    description: "Get all announcements ===> login as admin",
-  })
+  @ApiProperty({ description: "Get all announcements ===> login as admin" })
+  @PermissionsDec(PermissionEnum.ANNOUNCEMENTS)
   @Get()
   async getAllAnnouncements(@Query() queryDto: SearchCriticismQueryDto, @UserDec() user: User) {
     return await this.announcementService.getAllAnnouncements(queryDto, user.id);
   }
 
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN, RoleEnum.USER)
   @ApiProperty({
     description: "Get all announcements ===> login as user",
   })
@@ -47,28 +41,21 @@ export class AnnouncementController {
   }
 
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN, RoleEnum.USER)
-  @ApiProperty({
-    description: "Get one announcements with id",
-  })
+  @ApiProperty({ description: "Get one announcements with id" })
   @Get(":id")
   getAnnouncement(@Param() paramDto: ParamDto, @UserDec() user: User) {
     return this.announcementService.getOneAnnouncement(paramDto.id, user.id);
   }
 
   @AuthGuards()
-  @ApiProperty({
-    description: "Get all public announcements",
-  })
+  @ApiProperty({ description: "Get all public announcements" })
   @Get("public")
   async getPublicAnnouncements() {
     return await this.announcementService.getPublicAnnouncements();
   }
 
   @AuthGuards()
-  @ApiProperty({
-    description: "Get all public announcements",
-  })
+  @ApiProperty({ description: "Get all public announcements" })
   @Get("/service/:serviceId")
   async getAnnouncementsByService(@Query() queryDto: SearchCriticismQueryDto, @Param("serviceId") serviceId: string) {
     return await this.announcementService.getAnnouncementByService(queryDto, serviceId);