Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 14 Pull requests Projects Releases 29 Packages Wiki Activity Actions

patches v1.5.4 #104

Merged
jkeffects merged 3 commits from fix/queryBuilder into main 2025-05-22 08:03:29 +00:00
Conversation 0 Commits 3 Files changed 1 +22 -3
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a96c5266b8 - Show all commits

25
src/helpers/dynamicQueryBuilder.ts
View file

@ -272,8 +272,15 @@ export default abstract class DynamicQueryBuilder {
});
});
results = tempResults;
} else if (value && typeof value === "object" && !Array.isArray(value) && !(value instanceof Date)) {
const objResults = flatten(value as QueryResult, newKey);
} else if (
value &&
typeof value === "object" &&
!Array.isArray(value) &&
!(value instanceof Date) &&
!(value instanceof Buffer) &&
!Object.keys(value).every((k) => ["years", "months", "days"].includes(k))
) {
const objResults = flatten(value, newKey);
const tempResults: Array<{ [key: string]: FieldType }> = [];
results.forEach((res) => {
objResults.forEach((objRes) => {
@ -283,7 +290,19 @@ export default abstract class DynamicQueryBuilder {
results = tempResults;
} else {
results.forEach((res) => {
if (String(value) != "undefined") res[newKey] = String(value);
if (typeof value === "object" && value instanceof Date) {
res[newKey] = new Date(value).toISOString();
} else if (typeof value === "object" && !Array.isArray(value) && !(value instanceof Buffer)) {
let string = "";
for (const key of Object.keys(value)) {
string += `${value[key]} ${key} `;
}
res[newKey] = string.trim();
// JSON.stringify(value).replace(/["\\{}]/g, "").replaceAll(",", ", ");
} else if (String(value) != "undefined") {
res[newKey] = String(value);
}
});
}
}