diff --git a/src/structures/services/structures.service.ts b/src/structures/services/structures.service.ts index 06856d7d0f4792192b070e54fa3fad565cc1637b..45d71a96f2db9e5e4600b3b361b265b3a995ea35 100644 --- a/src/structures/services/structures.service.ts +++ b/src/structures/services/structures.service.ts @@ -58,7 +58,7 @@ export class StructuresService { .exec(); } else if (filters) { return this.structureModel - .find({ $and: [{ $or: this.parseFilter(filters), deletedAt: { $exists: false }, accountVerified: true }] }) + .find({ $and: [{ $and: this.parseFilter(filters), deletedAt: { $exists: false }, accountVerified: true }] }) .exec(); } else { return this.structureModel @@ -191,13 +191,13 @@ export class StructuresService { const uniqueElements = await this.structureModel.distinct(key).exec(); return await Promise.all( uniqueElements.map(async (value) => { - let keyList: FilterQuery<DocumentDefinition<StructureDocument>>[] = []; + const keyList: FilterQuery<DocumentDefinition<StructureDocument>>[] = []; keyList.push({ [key]: { $elemMatch: { $eq: value } }, deletedAt: { $exists: false }, }); if (selected && selected.length > 0) { - for (let val of selected) { + for (const val of selected) { keyList.push({ [val.text]: { $elemMatch: { $eq: val.id } }, deletedAt: { $exists: false },