Skip to content
Snippets Groups Projects
Commit 44bb26ea authored by Hugo SUBTIL's avatar Hugo SUBTIL
Browse files

fix: update search filter query

parent 449eef94
No related branches found
No related tags found
3 merge requests!96release V1.10.0,!62Dev,!58Feat/structure filter
...@@ -58,7 +58,7 @@ export class StructuresService { ...@@ -58,7 +58,7 @@ export class StructuresService {
.exec(); .exec();
} else if (filters) { } else if (filters) {
return this.structureModel 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(); .exec();
} else { } else {
return this.structureModel return this.structureModel
...@@ -191,13 +191,13 @@ export class StructuresService { ...@@ -191,13 +191,13 @@ export class StructuresService {
const uniqueElements = await this.structureModel.distinct(key).exec(); const uniqueElements = await this.structureModel.distinct(key).exec();
return await Promise.all( return await Promise.all(
uniqueElements.map(async (value) => { uniqueElements.map(async (value) => {
let keyList: FilterQuery<DocumentDefinition<StructureDocument>>[] = []; const keyList: FilterQuery<DocumentDefinition<StructureDocument>>[] = [];
keyList.push({ keyList.push({
[key]: { $elemMatch: { $eq: value } }, [key]: { $elemMatch: { $eq: value } },
deletedAt: { $exists: false }, deletedAt: { $exists: false },
}); });
if (selected && selected.length > 0) { if (selected && selected.length > 0) {
for (let val of selected) { for (const val of selected) {
keyList.push({ keyList.push({
[val.text]: { $elemMatch: { $eq: val.id } }, [val.text]: { $elemMatch: { $eq: val.id } },
deletedAt: { $exists: false }, deletedAt: { $exists: false },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment