yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-22 23:09:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Jim LAURIE 2018-11-10 12:47:01 +01:00 committed by GitHub
commit e9c847adbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/strapi-plugin-graphql/services/Resolvers.js
View File

@ -398,25 +398,23 @@ module.exports = {
queryOpts.skip = convertedParams.start; queryOpts.skip = convertedParams.start;
switch (association.nature) { switch (association.nature) {
case 'manyToMany': case 'manyToMany': {
if (association.dominant) { const arrayOfIds = (obj[association.alias] || []).map(
const arrayOfIds = (obj[association.alias] || []).map( related => {
related => { return related[ref.primaryKey] || related;
return related[ref.primaryKey] || related; },
}, );
);
// Where. // Where.
queryOpts.query = strapi.utils.models.convertParams(name, { queryOpts.query = strapi.utils.models.convertParams(name, {
// Construct the "where" query to only retrieve entries which are // Construct the "where" query to only retrieve entries which are
// related to this entry. // related to this entry.
[ref.primaryKey]: arrayOfIds, [ref.primaryKey]: arrayOfIds,
...where.where, ...where.where,
}).where; }).where;
break;
// falls through
}
break; break;
// falls through
}
default: default:
// Where. // Where.
queryOpts.query = strapi.utils.models.convertParams(name, { queryOpts.query = strapi.utils.models.convertParams(name, {
@ -428,6 +426,14 @@ module.exports = {
} }
} }
if (queryOpts.hasOwnProperty('query') &&
queryOpts.query.hasOwnProperty('id') &&
queryOpts.query.id.hasOwnProperty('value') &&
Array.isArray(queryOpts.query.id.value)
){
queryOpts.query.id.symbol = 'IN';
}
const value = await (association.model const value = await (association.model
? resolvers.fetch(params, association.plugin, []) ? resolvers.fetch(params, association.plugin, [])
: resolvers.fetchAll(params, { ...queryOpts, populate: [] })); : resolvers.fetchAll(params, { ...queryOpts, populate: [] }));