Merge branch 'dev' into SP-201-be-handle-roles-new

src/room/controllers/room.controller.ts

@@ -17,6 +17,7 @@ import { CheckUnitTypeGuard } from 'src/guards/unit.type.guard';
 import { CheckUserRoomGuard } from 'src/guards/user.room.guard';
 import { AdminRoleGuard } from 'src/guards/admin.role.guard';
 import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
+import { RoomPermissionGuard } from 'src/guards/room.permission.guard';
 
 @ApiTags('Room Module')
 @Controller({
@@ -32,7 +33,12 @@ export class RoomController {
   async addRoom(@Body() addRoomDto: AddRoomDto) {
     try {
       const room = await this.roomService.addRoom(addRoomDto);
-      return { message: 'Room added successfully', uuid: room.uuid };
+      return {
+        statusCode: HttpStatus.CREATED,
+        success: true,
+        message: 'Room added successfully',
+        data: room,
+      };
     } catch (error) {
       throw new HttpException(
         error.message || 'Internal server error',
@@ -42,7 +48,7 @@ export class RoomController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, RoomPermissionGuard)
   @Get(':roomUuid')
   async getRoomByUuid(@Param('roomUuid') roomUuid: string) {
     try {
@@ -57,7 +63,7 @@ export class RoomController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, RoomPermissionGuard)
   @Get('parent/:roomUuid')
   async getRoomParentByUuid(@Param('roomUuid') roomUuid: string) {
     try {
@@ -76,7 +82,11 @@ export class RoomController {
   async addUserRoom(@Body() addUserRoomDto: AddUserRoomDto) {
     try {
       await this.roomService.addUserRoom(addUserRoomDto);
-      return { message: 'user room added successfully' };
+      return {
+        statusCode: HttpStatus.CREATED,
+        success: true,
+        message: 'user room added successfully',
+      };
     } catch (error) {
       throw new HttpException(
         error.message || 'Internal server error',
@@ -99,7 +109,7 @@ export class RoomController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, RoomPermissionGuard)
   @Put('rename/:roomUuid')
   async renameRoomByUuid(
     @Param('roomUuid') roomUuid: string,