@forestadmin/datasource-sequelize 1.3.4 → 1.3.5
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.
- package/dist/collection.js +22 -19
- package/dist/utils/query-converter.d.ts +1 -3
- package/dist/utils/query-converter.js +12 -13
- package/package.json +1 -1
package/dist/collection.js
CHANGED
|
@@ -31,24 +31,32 @@ class SequelizeCollection extends datasource_toolkit_1.BaseCollection {
|
|
|
31
31
|
return records.map(record => serializer_1.default.serialize(record.get({ plain: true })));
|
|
32
32
|
}
|
|
33
33
|
async list(caller, filter, projection) {
|
|
34
|
-
let include = this.queryConverter.getIncludeWithAttributesFromProjection(projection);
|
|
35
|
-
if (filter.conditionTree) {
|
|
36
|
-
include = include.concat(this.queryConverter.getIncludeFromProjection(filter.conditionTree.projection));
|
|
37
|
-
}
|
|
38
|
-
if (filter.sort) {
|
|
39
|
-
include = include.concat(this.queryConverter.getIncludeFromProjection(filter.sort.projection));
|
|
40
|
-
}
|
|
41
34
|
const query = {
|
|
42
35
|
attributes: projection.columns,
|
|
43
36
|
where: this.queryConverter.getWhereFromConditionTree(filter.conditionTree),
|
|
44
|
-
include
|
|
37
|
+
include: this.queryConverter.getIncludeFromProjection(
|
|
38
|
+
// Bugfix [CU-860rc94dq](https://app.clickup.com/t/860rc94dq)
|
|
39
|
+
// When we provide sequelize with an include which has empty `.attributes` in it, it stops
|
|
40
|
+
// there and doesn't go further in the include tree.
|
|
41
|
+
// To ensure that no `.attributes` are not empty, we add the pk of each collection in the
|
|
42
|
+
// projection.
|
|
43
|
+
//
|
|
44
|
+
// include: [{
|
|
45
|
+
// association: 'users',
|
|
46
|
+
// attributes: [],
|
|
47
|
+
// include: { association: 'posts', attributes: ['i_want_this_field'] }
|
|
48
|
+
// }]
|
|
49
|
+
projection.withPks(this), new datasource_toolkit_1.Projection().union(filter.conditionTree?.projection, filter.sort?.projection)),
|
|
45
50
|
limit: filter.page?.limit,
|
|
46
51
|
offset: filter.page?.skip,
|
|
47
52
|
order: this.queryConverter.getOrderFromSort(filter.sort),
|
|
48
53
|
subQuery: false,
|
|
49
54
|
};
|
|
50
55
|
const records = await this.model.findAll(query);
|
|
51
|
-
|
|
56
|
+
const rawRecords = records.map(record => serializer_1.default.serialize(record.get({ plain: true })));
|
|
57
|
+
// Use projection to filter out the unwanted primary keys that were added to the projection
|
|
58
|
+
// so that sequelize can do its job.
|
|
59
|
+
return projection.apply(rawRecords);
|
|
52
60
|
}
|
|
53
61
|
async update(caller, filter, patch) {
|
|
54
62
|
const options = {
|
|
@@ -78,19 +86,14 @@ class SequelizeCollection extends datasource_toolkit_1.BaseCollection {
|
|
|
78
86
|
aggregationFunction,
|
|
79
87
|
this.aggregationUtils.aggregateFieldName,
|
|
80
88
|
];
|
|
81
|
-
const { groups, attributes
|
|
82
|
-
let include = this.queryConverter.getIncludeFromProjection(aggregation.projection);
|
|
83
|
-
if (filter.conditionTree) {
|
|
84
|
-
include = include.concat(this.queryConverter.getIncludeFromProjection(filter.conditionTree.projection));
|
|
85
|
-
}
|
|
86
|
-
const order = this.aggregationUtils.getOrder(aggregationFunction);
|
|
89
|
+
const { groups, attributes } = this.aggregationUtils.getGroupAndAttributesFromAggregation(aggregation.groups);
|
|
87
90
|
const query = {
|
|
88
|
-
attributes: [...
|
|
91
|
+
attributes: [...attributes, aggregationAttribute],
|
|
89
92
|
group: groups,
|
|
90
93
|
where: this.queryConverter.getWhereFromConditionTree(filter.conditionTree),
|
|
91
|
-
include,
|
|
94
|
+
include: this.queryConverter.getIncludeFromProjection(new datasource_toolkit_1.Projection(), aggregation.projection.union(filter.conditionTree?.projection)),
|
|
92
95
|
limit,
|
|
93
|
-
order: [
|
|
96
|
+
order: [this.aggregationUtils.getOrder(aggregationFunction)],
|
|
94
97
|
subQuery: false,
|
|
95
98
|
raw: true,
|
|
96
99
|
};
|
|
@@ -99,4 +102,4 @@ class SequelizeCollection extends datasource_toolkit_1.BaseCollection {
|
|
|
99
102
|
}
|
|
100
103
|
}
|
|
101
104
|
exports.default = SequelizeCollection;
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
105
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9jb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsd0VBYXlDO0FBR3pDLHNFQUFtRDtBQUNuRCwwRUFBaUQ7QUFDakQsd0hBQTBFO0FBQzFFLDhFQUFxRDtBQUNyRCxvRUFBNEM7QUFFNUMsTUFBcUIsbUJBQW9CLFNBQVEsbUNBQWM7SUFTN0QsWUFDRSxJQUFZLEVBQ1osVUFBc0I7SUFDdEIsOERBQThEO0lBQzlELEtBQTZCLEVBQzdCLE1BQWU7UUFFZixLQUFLLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBRXhCLElBQUksQ0FBQyxLQUFLO1lBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1FBRTlELElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDO1FBQ3BDLElBQUksQ0FBQyxFQUFFLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDO1FBRWxDLElBQUksQ0FBQyxnQkFBZ0IsR0FBRyxJQUFJLHFCQUFnQixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsY0FBYyxHQUFHLElBQUkseUJBQWMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFckQsTUFBTSxXQUFXLEdBQUcsOENBQWMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQztRQUUvRCxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDbkIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDbkMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLENB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
|
|
@@ -13,9 +13,7 @@ export default class QueryConverter {
|
|
|
13
13
|
private makeLikeWhereClause;
|
|
14
14
|
getWhereFromConditionTreeToByPassInclude(conditionTree?: ConditionTree): Promise<WhereOptions>;
|
|
15
15
|
getWhereFromConditionTree(conditionTree?: ConditionTree): WhereOptions;
|
|
16
|
-
|
|
17
|
-
getIncludeFromProjection(projection: Projection): IncludeOptions[];
|
|
18
|
-
getIncludeWithAttributesFromProjection(projection: Projection): IncludeOptions[];
|
|
16
|
+
getIncludeFromProjection(attrProjection: Projection, tableProjection?: Projection): IncludeOptions[];
|
|
19
17
|
getOrderFromSort(sort: Sort): OrderItem[];
|
|
20
18
|
}
|
|
21
19
|
//# sourceMappingURL=query-converter.d.ts.map
|
|
@@ -99,7 +99,9 @@ class QueryConverter {
|
|
|
99
99
|
* This method is developed to by pass this problem.
|
|
100
100
|
*/
|
|
101
101
|
async getWhereFromConditionTreeToByPassInclude(conditionTree) {
|
|
102
|
-
const include = conditionTree
|
|
102
|
+
const include = conditionTree
|
|
103
|
+
? this.getIncludeFromProjection(new datasource_toolkit_1.Projection(), conditionTree.projection)
|
|
104
|
+
: [];
|
|
103
105
|
const whereOptions = this.getWhereFromConditionTree(conditionTree);
|
|
104
106
|
if (include.length === 0) {
|
|
105
107
|
return whereOptions;
|
|
@@ -139,21 +141,18 @@ class QueryConverter {
|
|
|
139
141
|
}
|
|
140
142
|
return sequelizeWhereClause;
|
|
141
143
|
}
|
|
142
|
-
|
|
143
|
-
|
|
144
|
+
getIncludeFromProjection(attrProjection, tableProjection = new datasource_toolkit_1.Projection()) {
|
|
145
|
+
const projection = attrProjection.union(tableProjection);
|
|
146
|
+
return Object.keys(projection.relations).map(name => {
|
|
147
|
+
const relAttrProjection = attrProjection.relations[name] ?? new datasource_toolkit_1.Projection();
|
|
148
|
+
const relTableProjection = tableProjection.relations[name] ?? new datasource_toolkit_1.Projection();
|
|
144
149
|
return {
|
|
145
|
-
association:
|
|
146
|
-
attributes:
|
|
147
|
-
include: this.
|
|
150
|
+
association: name,
|
|
151
|
+
attributes: relAttrProjection.columns,
|
|
152
|
+
include: this.getIncludeFromProjection(relAttrProjection, relTableProjection),
|
|
148
153
|
};
|
|
149
154
|
});
|
|
150
155
|
}
|
|
151
|
-
getIncludeFromProjection(projection) {
|
|
152
|
-
return this.computeIncludeFromProjection(projection, false);
|
|
153
|
-
}
|
|
154
|
-
getIncludeWithAttributesFromProjection(projection) {
|
|
155
|
-
return this.computeIncludeFromProjection(projection);
|
|
156
|
-
}
|
|
157
156
|
getOrderFromSort(sort) {
|
|
158
157
|
return (sort ?? []).map(({ field, ascending }) => {
|
|
159
158
|
const path = field.split(':');
|
|
@@ -162,4 +161,4 @@ class QueryConverter {
|
|
|
162
161
|
}
|
|
163
162
|
}
|
|
164
163
|
exports.default = QueryConverter;
|
|
165
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
164
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query-converter.js","sourceRoot":"","sources":["../../src/utils/query-converter.ts"],"names":[],"mappings":"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"}
|