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

src/community/community.module.ts

@@ -10,6 +10,7 @@ import { UserSpaceRepositoryModule } from '@app/common/modules/user-space/user.s
 import { UserSpaceRepository } from '@app/common/modules/user-space/repositories';
 import { UserRepositoryModule } from '@app/common/modules/user/user.repository.module';
 import { UserRepository } from '@app/common/modules/user/repositories';
+import { SpacePermissionService } from '@app/common/helper/services';
 
 @Module({
   imports: [
@@ -26,7 +27,8 @@ import { UserRepository } from '@app/common/modules/user/repositories';
     SpaceTypeRepository,
     UserSpaceRepository,
     UserRepository,
+    SpacePermissionService,
   ],
-  exports: [CommunityService],
+  exports: [CommunityService, SpacePermissionService],
 })
 export class CommunityModule {}

src/community/controllers/community.controller.ts

@@ -21,6 +21,7 @@ import { UpdateCommunityNameDto } from '../dtos/update.community.dto';
 import { CheckUserCommunityGuard } from 'src/guards/user.community.guard';
 import { AdminRoleGuard } from 'src/guards/admin.role.guard';
 import { JwtAuthGuard } from '@app/common/guards/jwt.auth.guard';
+import { CommunityPermissionGuard } from 'src/guards/community.permission.guard';
 
 @ApiTags('Community Module')
 @Controller({
@@ -37,7 +38,12 @@ export class CommunityController {
     try {
       const community =
         await this.communityService.addCommunity(addCommunityDto);
-      return { message: 'Community added successfully', uuid: community.uuid };
+      return {
+        statusCode: HttpStatus.CREATED,
+        success: true,
+        message: 'Community added successfully',
+        data: community,
+      };
     } catch (error) {
       throw new HttpException(
         error.message || 'Internal server error',
@@ -47,7 +53,7 @@ export class CommunityController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, CommunityPermissionGuard)
   @Get(':communityUuid')
   async getCommunityByUuid(@Param('communityUuid') communityUuid: string) {
     try {
@@ -63,7 +69,7 @@ export class CommunityController {
   }
 
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, CommunityPermissionGuard)
   @Get('child/:communityUuid')
   async getCommunityChildByUuid(
     @Param('communityUuid') communityUuid: string,
@@ -102,7 +108,11 @@ export class CommunityController {
   async addUserCommunity(@Body() addUserCommunityDto: AddUserCommunityDto) {
     try {
       await this.communityService.addUserCommunity(addUserCommunityDto);
-      return { message: 'user community added successfully' };
+      return {
+        statusCode: HttpStatus.CREATED,
+        success: true,
+        message: 'user community added successfully',
+      };
     } catch (error) {
       throw new HttpException(
         error.message || 'Internal server error',
@@ -111,7 +121,7 @@ export class CommunityController {
     }
   }
   @ApiBearerAuth()
-  @UseGuards(JwtAuthGuard)
+  @UseGuards(JwtAuthGuard, CommunityPermissionGuard)
   @Put('rename/:communityUuid')
   async renameCommunityByUuid(
     @Param('communityUuid') communityUuid: string,