pangea-server 1.0.49 → 1.0.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -26,7 +26,7 @@ class Db {
|
|
|
26
26
|
}
|
|
27
27
|
return scopedModel.findOne({
|
|
28
28
|
...baseOptions,
|
|
29
|
-
...getIncludeAndWhere(model, include, filters),
|
|
29
|
+
...getIncludeAndWhere(model, include, undefined, filters),
|
|
30
30
|
order: getFinalOrder(order),
|
|
31
31
|
});
|
|
32
32
|
}
|
|
@@ -86,7 +86,7 @@ class Db {
|
|
|
86
86
|
const deletedAtWhere = paranoid === 'deleted' ? { deletedAt: { [_1.Ops.not]: null } } : {};
|
|
87
87
|
return {
|
|
88
88
|
attributes: getFinalAttributes(attributes),
|
|
89
|
-
...getIncludeAndWhere(model, include, { ...where, ...searchWhere, ...deletedAtWhere }),
|
|
89
|
+
...getIncludeAndWhere(model, include, { withoutAttributes: !!attributes }, { ...where, ...searchWhere, ...deletedAtWhere }),
|
|
90
90
|
...(group && { group: group.map(pangea_helpers_1.camelToSnake) }),
|
|
91
91
|
order: [...getFinalOrder(order), ...(!group ? [['createdAt', 'DESC']] : [])],
|
|
92
92
|
paranoid: paranoid === 'active',
|
|
@@ -227,7 +227,7 @@ function convertWhereKeys(obj) {
|
|
|
227
227
|
}
|
|
228
228
|
return obj;
|
|
229
229
|
}
|
|
230
|
-
function getIncludeAndWhere(model, includeItems, where, relDepth = new Map()) {
|
|
230
|
+
function getIncludeAndWhere(model, includeItems, config = {}, where, relDepth = new Map()) {
|
|
231
231
|
const includeOptions = [];
|
|
232
232
|
const cleanWhere = { ...where };
|
|
233
233
|
for (const [relName, rel] of Object.entries(model.Relations)) {
|
|
@@ -247,9 +247,10 @@ function getIncludeAndWhere(model, includeItems, where, relDepth = new Map()) {
|
|
|
247
247
|
includeOptions.push({
|
|
248
248
|
model: relModel,
|
|
249
249
|
as: relName,
|
|
250
|
+
attributes: !config.withoutAttributes ? undefined : [],
|
|
250
251
|
required: rel.required,
|
|
251
252
|
paranoid: rel.paranoid,
|
|
252
|
-
...getIncludeAndWhere(relModel, nestedIncludeItems, relWhere, newRelDepth),
|
|
253
|
+
...getIncludeAndWhere(relModel, nestedIncludeItems, config, relWhere, newRelDepth),
|
|
253
254
|
});
|
|
254
255
|
}
|
|
255
256
|
return {
|