ammar/backend
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/backend.git synced 2025-07-10 15:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

add includeSpaces in the query param

Browse Source
This commit is contained in:
faris Aljohari
2025-03-18 10:17:29 +03:00
parent 9902b02700
commit 39ac2e6860
3 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/common/src/dto/pagination.request.dto.ts
View File

@ -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',

1
libs/common/src/models/typeOrmCustom.model.ts
View File

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

39
src/community/services/community.service.ts
View File

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