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

src/floor/controllers/floor.controller.ts

@@ -19,6 +19,7 @@ import { CheckBuildingTypeGuard } from 'src/guards/building.type.guard';
 import { CheckUserFloorGuard } from 'src/guards/user.floor.guard';
 import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
 import { AdminRoleGuard } from 'src/guards/admin.role.guard';
+import { FloorPermissionGuard } from 'src/guards/floor.permission.guard';
 
 @ApiTags('Floor Module')
 @Controller({
@@ -34,7 +35,12 @@ export class FloorController {
   async addFloor(@Body() addFloorDto: AddFloorDto) {
     try {
       const floor = await this.floorService.addFloor(addFloorDto);
-      return { message: 'Floor added successfully', uuid: floor.uuid };
+      return {
+        statusCode: HttpStatus.CREATED,
+        success: true,
+        message: 'Floor added successfully',
+        data: floor,
+      };
     } catch (error) {
       throw new HttpException(
         error.message || 'Internal server error',
@@ -44,7 +50,7 @@ export class FloorController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, FloorPermissionGuard)
   @Get(':floorUuid')
   async getFloorByUuid(@Param('floorUuid') floorUuid: string) {
     try {
@@ -59,7 +65,7 @@ export class FloorController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, FloorPermissionGuard)
   @Get('child/:floorUuid')
   async getFloorChildByUuid(
     @Param('floorUuid') floorUuid: string,
@@ -79,7 +85,7 @@ export class FloorController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, FloorPermissionGuard)
   @Get('parent/:floorUuid')
   async getFloorParentByUuid(@Param('floorUuid') floorUuid: string) {
     try {
@@ -99,7 +105,11 @@ export class FloorController {
   async addUserFloor(@Body() addUserFloorDto: AddUserFloorDto) {
     try {
       await this.floorService.addUserFloor(addUserFloorDto);
-      return { message: 'user floor added successfully' };
+      return {
+        statusCode: HttpStatus.CREATED,
+        success: true,
+        message: 'user floor added successfully',
+      };
     } catch (error) {
       throw new HttpException(
         error.message || 'Internal server error',
@@ -123,7 +133,7 @@ export class FloorController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, FloorPermissionGuard)
   @Put('rename/:floorUuid')
   async renameFloorByUuid(
     @Param('floorUuid') floorUuid: string,