From 89cf13b4cf872628090d16f9028fd328698f4ea1 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Fri, 16 Jun 2017 15:05:22 -0300 Subject: [PATCH] Updates --- graph/loaders/assets.js | 4 ++-- graph/resolvers/root_query.js | 4 +--- graph/typeDefs.graphql | 2 +- services/assets.js | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js index b32b37b60..7e924e14a 100644 --- a/graph/loaders/assets.js +++ b/graph/loaders/assets.js @@ -26,8 +26,8 @@ const genAssetsByID = (context, ids) => AssetModel.find({ * @param {Number} limit limit the number of results * @return {Promise} resolves the assets */ -const getAssetsByQuery = (context, value, limit) => { - return AssetsService.search(value, null, limit); +const getAssetsByQuery = (context, query) => { + return AssetsService.search(query); }; /** diff --git a/graph/resolvers/root_query.js b/graph/resolvers/root_query.js index 637af9018..9889b62f2 100644 --- a/graph/resolvers/root_query.js +++ b/graph/resolvers/root_query.js @@ -11,9 +11,7 @@ const RootQuery = { return null; } - const {value = '', limit} = query; - - return Assets.search(value, limit); + return Assets.search(query); }, asset(_, query, {loaders: {Assets}}) { if (query.id) { diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql index a4c4b8c5c..c946cca94 100644 --- a/graph/typeDefs.graphql +++ b/graph/typeDefs.graphql @@ -634,7 +634,7 @@ type RootQuery { comment(id: ID!): Comment # All assets. Requires the `ADMIN` role. - assets(query: AssetsQuery!): [Asset] + assets(query: AssetsQuery): [Asset] # Find or create an asset by url, or just find with the ID. asset(id: ID, url: String): Asset diff --git a/services/assets.js b/services/assets.js index b81513b72..5a5b924f3 100644 --- a/services/assets.js +++ b/services/assets.js @@ -109,7 +109,7 @@ module.exports = class AssetsService { * @param {String} value string to search by. * @return {Promise} */ - static search(value = '', skip = null, limit = null) { + static search({value = '', skip = null, limit = null}) { if (value.length === 0) { return AssetsService.all(skip, limit); } else {