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

src/unit/controllers/unit.controller.ts

@@ -19,6 +19,7 @@ import { CheckFloorTypeGuard } from 'src/guards/floor.type.guard';
 import { CheckUserUnitGuard } from 'src/guards/user.unit.guard';
 import { AdminRoleGuard } from 'src/guards/admin.role.guard';
 import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
+import { UnitPermissionGuard } from 'src/guards/unit.permission.guard';
 
 @ApiTags('Unit Module')
 @Controller({
@@ -34,7 +35,12 @@ export class UnitController {
   async addUnit(@Body() addUnitDto: AddUnitDto) {
     try {
       const unit = await this.unitService.addUnit(addUnitDto);
-      return { message: 'Unit added successfully', uuid: unit.uuid };
+      return {
+        statusCode: HttpStatus.CREATED,
+        success: true,
+        message: 'Unit added successfully',
+        data: unit,
+      };
     } catch (error) {
       throw new HttpException(
         error.message || 'Internal server error',
@@ -44,7 +50,7 @@ export class UnitController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, UnitPermissionGuard)
   @Get(':unitUuid')
   async getUnitByUuid(@Param('unitUuid') unitUuid: string) {
     try {
@@ -59,7 +65,7 @@ export class UnitController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, UnitPermissionGuard)
   @Get('child/:unitUuid')
   async getUnitChildByUuid(
     @Param('unitUuid') unitUuid: string,
@@ -76,7 +82,7 @@ export class UnitController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, UnitPermissionGuard)
   @Get('parent/:unitUuid')
   async getUnitParentByUuid(@Param('unitUuid') unitUuid: string) {
     try {
@@ -95,7 +101,11 @@ export class UnitController {
   async addUserUnit(@Body() addUserUnitDto: AddUserUnitDto) {
     try {
       await this.unitService.addUserUnit(addUserUnitDto);
-      return { message: 'user unit added successfully' };
+      return {
+        statusCode: HttpStatus.CREATED,
+        success: true,
+        message: 'user unit added successfully',
+      };
     } catch (error) {
       throw new HttpException(
         error.message || 'Internal server error',
@@ -118,7 +128,7 @@ export class UnitController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, UnitPermissionGuard)
   @Put('rename/:unitUuid')
   async renameUnitByUuid(
     @Param('unitUuid') unitUuid: string,