add includeSpaces in the query param

libs/common/src/dto/pagination.request.dto.ts

@@ -1,11 +1,24 @@
-import { IsDate, IsOptional } from 'class-validator';
+import { IsBoolean, IsDate, IsOptional } from 'class-validator';
 import { IsPageRequestParam } from '../validators/is-page-request-param.validator';
 import { ApiProperty } from '@nestjs/swagger';
 import { IsSizeRequestParam } from '../validators/is-size-request-param.validator';
 import { Transform } from 'class-transformer';
 import { parseToDate } from '../util/parseToDate';
+import { BooleanValues } from '../constants/boolean-values.enum';
 
 export class PaginationRequestGetListDto {
+  @ApiProperty({
+    example: true,
+    description: 'include spaces',
+    required: false,
+    default: false,
+  })
+  @IsOptional()
+  @IsBoolean()
+  @Transform((value) => {
+    return value.obj.includeSpaces === BooleanValues.TRUE;
+  })
+  public includeSpaces?: boolean = false;
   @IsOptional()
   @IsPageRequestParam({
     message: 'Page must be bigger than 0',

libs/common/src/models/typeOrmCustom.model.ts

@@ -16,6 +16,7 @@ export interface TypeORMCustomModelFindAllQuery {
   where?: { [key: string]: unknown };
   select?: string[];
   includeDisable?: boolean | string;
+  includeSpaces?: boolean;
 }
 interface CustomFindAllQuery {
   page?: number;

src/community/services/community.service.ts

@@ -100,26 +100,29 @@ export class CommunityService {
       const { baseResponseDto, paginationResponseDto } =
         await customModel.findAll(pageable);
 
-      const communitiesWithSpaces = await Promise.all(
+      if (pageable.includeSpaces) {
-        baseResponseDto.data.map(async (community: CommunityDto) => {
+        const communitiesWithSpaces = await Promise.all(
-          const spaces = await this.spaceService.getSpacesHierarchyForCommunity(
+          baseResponseDto.data.map(async (community: CommunityDto) => {
-            {
+            const spaces =
-              communityUuid: community.uuid,
+              await this.spaceService.getSpacesHierarchyForCommunity(
-              projectUuid: param.projectUuid,
+                {
-            },
+                  communityUuid: community.uuid,
-            {
+                  projectUuid: param.projectUuid,
-              onlyWithDevices: false,
+                },
-            },
+                {
-          );
+                  onlyWithDevices: false,
+                },
+              );
 
-          return {
+            return {
-            ...community,
+              ...community,
-            spaces: spaces.data,
+              spaces: spaces.data,
-          };
+            };
-        }),
+          }),
-      );
+        );
 
-      baseResponseDto.data = communitiesWithSpaces;
+        baseResponseDto.data = communitiesWithSpaces;
+      }
 
       return new PageResponse<CommunityDto>(
         baseResponseDto,