chore: user announcement

src/modules/announcements/announcement.controller.ts

@@ -5,7 +5,10 @@ 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 { 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";
 
 @ApiTags("Announcements")
@@ -24,13 +27,33 @@ export class AnnouncementController {
   }
 
   @AuthGuards()
-  @Roles(RoleEnum.ADMIN)
+  @Roles(RoleEnum.ADMIN, RoleEnum.USER)
   @ApiProperty({
     description: "Get all announcements ===> login as admin",
   })
   @Get()
-  async getAllAnnouncements(@Query() queryDto: SearchCriticismQueryDto) {
-    return await this.announcementService.getAllAnnouncements(queryDto);
+  async getAllAnnouncements(@Query() queryDto: SearchCriticismQueryDto, @UserDec() user: User) {
+    return await this.announcementService.getAllAnnouncements(queryDto, user.id);
+  }
+
+  @AuthGuards()
+  @Roles(RoleEnum.ADMIN, RoleEnum.USER, RoleEnum.VISITOR)
+  @ApiProperty({
+    description: "Get all announcements ===> login as user",
+  })
+  @Get("user")
+  async getAllAnnouncementsByUser(@Query() queryDto: SearchCriticismQueryDto, @UserDec() user: User) {
+    return await this.announcementService.getAllAnnouncementsByUser(queryDto, user.id);
+  }
+
+  @AuthGuards()
+  @Roles(RoleEnum.ADMIN, RoleEnum.USER, RoleEnum.VISITOR)
+  @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()
@@ -46,7 +69,7 @@ export class AnnouncementController {
   @ApiProperty({
     description: "Get all public announcements",
   })
-  @Get(":serviceId")
+  @Get("/service/:serviceId")
   async getAnnouncementsByService(@Query() queryDto: SearchCriticismQueryDto, @Param("serviceId") serviceId: string) {
     return await this.announcementService.getAnnouncementByService(queryDto, serviceId);
   }