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

fix: add space filter to "join" operation instead of "and" operation (#405)

Browse Source
This commit is contained in:
ZaydSkaff
2025-06-11 16:28:33 +03:00
committed by GitHub
parent 8503ee728d
commit ea9a65178d
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,18 +105,19 @@ export class CommunityService {
*/ */
pageable.where = {}; pageable.where = {};
let qb: undefined | SelectQueryBuilder<CommunityEntity> = undefined; let qb: undefined | SelectQueryBuilder<CommunityEntity> = undefined;
qb = this.communityRepository
.createQueryBuilder('c')
.leftJoin('c.spaces', 's', 's.disabled = false')
.where('c.project = :projectUuid', { projectUuid })
.andWhere(`c.name != '${ORPHAN_COMMUNITY_NAME}-${project.name}'`)
.distinct(true);
if (pageable.search) { if (pageable.search) {
qb = this.communityRepository qb.andWhere(
.createQueryBuilder('c') `c.name ILIKE '%${pageable.search}%' OR s.space_name ILIKE '%${pageable.search}%'`,
.leftJoin('c.spaces', 's') );
.where('c.project = :projectUuid', { projectUuid })
.andWhere(`c.name != '${ORPHAN_COMMUNITY_NAME}-${project.name}'`)
.andWhere('s.disabled = false')
.andWhere(
`c.name ILIKE '%${pageable.search}%' OR s.space_name ILIKE '%${pageable.search}%'`,
)
.distinct(true);
} }
const customModel = TypeORMCustomModel(this.communityRepository); const customModel = TypeORMCustomModel(this.communityRepository);
const { baseResponseDto, paginationResponseDto } = const { baseResponseDto, paginationResponseDto } =