Skip to content

Fix resolving nested json attributes #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kbarbounakis wants to merge 8 commits into
base: lts
Choose a base branch
from
Open

Fix resolving nested json attributes #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3d41f8e
resolving join attributes of type json
kbarbounakis Feb 4, 2025
c4e83fb
use open data parser for $select, $orderby and $groupby system query …
kbarbounakis Feb 4, 2025
fe0ab78
use open data parser on DataModel.filter()
kbarbounakis Feb 4, 2025
c6b274c
validate data view filter
kbarbounakis Feb 5, 2025
8bb8090
validate data views
kbarbounakis Feb 5, 2025
ca5df04
extract view params
kbarbounakis Feb 5, 2025
47066dd
update data mapping extensions
kbarbounakis Feb 6, 2025
28e8a2e
get values when passing objects (#204)
kbarbounakis Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 39 additions & 5 deletions data-mapping-extensions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ var {QueryEntity} = require('@themost/query');
var {QueryField} = require('@themost/query');
var Q = require('q');
var {hasOwnProperty} = require('./has-own-property');
var {isObjectDeep} = require('./is-object');

class DataMappingExtender {
constructor(mapping) {
Expand Down Expand Up @@ -342,9 +343,20 @@ class DataMappingExtender {
if (_.isNil(childField)) {
return reject('The specified field cannot be found on child model');
}
var childFieldType = thisQueryable.model.context.model(childField.type);
var values = _.intersection(_.map(_.filter(arr, function(x) {
return hasOwnProperty(x, keyField);
}), function (x) { return x[keyField];}));
}), function (x) { return x[keyField];})).map(function(x) {
if (isObjectDeep(x)) {
if (childFieldType) {
return x[childFieldType.primaryKey];
}
throw new Error('The child item is an object but its type cannot determined.');
}
return x;
}).filter(function(x) {
return x != null;
});
if (values.length===0) {
return resolve();
}
Expand Down Expand Up @@ -421,9 +433,20 @@ class DataMappingExtender {
return reject('The specified field cannot be found on parent model');
}
var keyField = parentField.property || parentField.name;
var parentFieldType = thisQueryable.model.context.model(parentField.type);
var values = _.intersection(_.map(_.filter(arr, function(x) {
return hasOwnProperty(x, keyField);
}), function (x) { return x[keyField];}));
}), function (x) { return x[keyField];})).map(function(x) {
if (isObjectDeep(x)) {
if (parentFieldType) {
return x[parentFieldType.primaryKey];
}
throw new Error('The parent item is an object but its type cannot determined.');
}
return x;
}).filter(function(x) {
return x != null;
});
if (values.length===0) {
return resolve();
}
Expand Down Expand Up @@ -528,7 +551,7 @@ class DataMappingExtender {
});
return resolve();
}).catch(function(err) {
return resolve(err);
return reject(err);
});
});
});
Expand Down Expand Up @@ -872,11 +895,22 @@ class DataMappingOptimizedExtender extends DataMappingExtender {
return reject('The specified field cannot be found on parent model');
}
var keyField = parentField.property || parentField.name;
var parentFieldType = thisQueryable.model.context.model(parentField.type);
var values = _.intersection(_.map(_.filter(arr, function(x) {
return hasOwnProperty(x, keyField);
}), function (x) {
return x[keyField];
}));
})).map(function(x) {
if (isObjectDeep(x)) {
if (parentFieldType) {
return x[parentFieldType.primaryKey];
}
throw new Error('The parent item is an object but its type cannot determined.');
}
return x;
}).filter(function(x) {
return x != null;
});;
if (values.length===0) {
return resolve();
}
Expand Down Expand Up @@ -977,7 +1011,7 @@ class DataMappingOptimizedExtender extends DataMappingExtender {
});
return resolve();
}).catch(function(err) {
return resolve(err);
return reject(err);
});
});
});
Expand Down
Loading