nodester 0.7.14 → 0.7.15
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/lib/body/extract.js +16 -4
- package/package.json +1 -1
package/lib/body/extract.js
CHANGED
|
@@ -22,9 +22,7 @@ module.exports = extract;
|
|
|
22
22
|
* @access public
|
|
23
23
|
* @return {Object} filteredBody
|
|
24
24
|
*/
|
|
25
|
-
function extract(body, filter=null, model) {
|
|
26
|
-
|
|
27
|
-
const sequelize = model.sequelize;
|
|
25
|
+
function extract(body, filter = null, model) {
|
|
28
26
|
const modelAttributes = Object.keys(model.tableAttributes);
|
|
29
27
|
const availableIncludes = Object.keys(model.associations);
|
|
30
28
|
|
|
@@ -87,6 +85,20 @@ function extract(body, filter=null, model) {
|
|
|
87
85
|
const association = model.associations[key];
|
|
88
86
|
|
|
89
87
|
// Mutliple includes:
|
|
88
|
+
if (association.associationType === 'BelongsToMany') {
|
|
89
|
+
const targetPkField = association.target.primaryKeyField;
|
|
90
|
+
|
|
91
|
+
if (Array.isArray(value)) {
|
|
92
|
+
filteredBody[key] = value.map(item => ({ [targetPkField]: item[targetPkField] }));
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
filteredBody[key] = { [targetPkField]: value[targetPkField] };
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
// HasMany / HasOne — recursive extraction:
|
|
90
102
|
if (Array.isArray(value)) {
|
|
91
103
|
filteredBody[key] = [];
|
|
92
104
|
|
|
@@ -111,7 +123,7 @@ function extract(body, filter=null, model) {
|
|
|
111
123
|
|
|
112
124
|
// Set all static attributes:
|
|
113
125
|
const staticAttributeEntries = Object.entries(staticAttributes);
|
|
114
|
-
for (const [
|
|
126
|
+
for (const [key, value] of staticAttributeEntries) {
|
|
115
127
|
filteredBody[key] = staticAttributes[key];
|
|
116
128
|
}
|
|
117
129
|
|