From 44bb26ea836d95c3c5bc5437553eb633cf0092f1 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Thu, 8 Apr 2021 12:06:21 +0200
Subject: [PATCH] fix: update search filter query
---
src/structures/services/structures.service.ts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/structures/services/structures.service.ts b/src/structures/services/structures.service.ts
index 06856d7d0..45d71a96f 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 },
--
GitLab