Merge pull request #36 from marmelab/fix-metas-filters

[RFR] Fix meta queries filter parameter

Author: fzaninotto

src/introspection/getSchemaFromData.js

@@ -62,9 +62,9 @@ import { getRelatedType } from '../nameConverter';
  * //
  * // type Query {
  * //     Post(id: ID!): Post
- * //     allPosts(page: Int, perPage: Int, sortField: String, sortOrder: String, filter: String): [Post]
+ * //     allPosts(page: Int, perPage: Int, sortField: String, sortOrder: String, filter: PostFilter): [Post]
  * //     User(id: ID!): User
- * //     allUsers(page: Int, perPage: Int, sortField: String, sortOrder: String, filter: String): [User]
+ * //     allUsers(page: Int, perPage: Int, sortField: String, sortOrder: String, filter: UserFilter): [User]
  * // }
  * //
  * // type Mutation {
@@ -116,7 +116,7 @@ export default data => {
                 args: {
                     page: { type: GraphQLInt },
                     perPage: { type: GraphQLInt },
-                    filter: { type: GraphQLString },
+                    filter: { type: filterTypesByName[type.name] },
                 },
             };
             return fields;

src/resolver/Query/meta.js

@@ -1,44 +1,41 @@
-export default entityData => (_, { page, perPage = 25, filter = '{}' }) => {
-    const filters = JSON.parse(filter);
+export default entityData => (_, { page, perPage = 25, filter = {} }) => {
     let items = [...entityData];
 
-    if (filters.ids) {
-        items = items.filter(d => filters.ids.includes(d.id.toString()));
+    if (filter.ids) {
+        items = items.filter(d => filter.ids.includes(d.id.toString()));
     } else {
-        Object.keys(filters).filter(key => key !== 'q').forEach(key => {
+        Object.keys(filter).filter(key => key !== 'q').forEach(key => {
             if (key.indexOf('_lte') !== -1) {
                 // less than or equal
                 const realKey = key.replace(/(_lte)$/, '');
-                items = items.filter(d => d[realKey] <= filters[key]);
+                items = items.filter(d => d[realKey] <= filter[key]);
                 return;
             }
             if (key.indexOf('_gte') !== -1) {
                 // less than or equal
                 const realKey = key.replace(/(_gte)$/, '');
-                items = items.filter(d => d[realKey] >= filters[key]);
+                items = items.filter(d => d[realKey] >= filter[key]);
                 return;
             }
             if (key.indexOf('_lt') !== -1) {
                 // less than or equal
                 const realKey = key.replace(/(_lt)$/, '');
-                items = items.filter(d => d[realKey] < filters[key]);
+                items = items.filter(d => d[realKey] < filter[key]);
                 return;
             }
             if (key.indexOf('_gt') !== -1) {
                 // less than or equal
                 const realKey = key.replace(/(_gt)$/, '');
-                items = items.filter(d => d[realKey] > filters[key]);
+                items = items.filter(d => d[realKey] > filter[key]);
                 return;
             }
 
-            items = items.filter(d => d[key] == filters[key]);
+            items = items.filter(d => d[key] == filter[key]);
         });
 
-        if (filters.q) {
+        if (filter.q) {
             items = items.filter(d =>
-                Object.keys(d).some(key =>
-                    d[key].toString().includes(filters.q)
-                )
+                Object.keys(d).some(key => d[key].toString().includes(filter.q))
             );
         }
     }