Merge pull request #40 from marmelab/refactor_filters

[RFR] Ensure filters are applied the same way for queries and metas

Author: fzaninotto

src/resolver/Query/all.js

@@ -1,3 +1,5 @@
+import applyFilters from './applyFilters';
+
 export default (entityData = []) => (
     _,
     { sortField, sortOrder = 'asc', page, perPage = 25, filter = {} }
@@ -16,56 +18,8 @@ export default (entityData = []) => (
             return 0;
         });
     }
-    if (filter.ids) {
-        items = items.filter(d => filter.ids.includes(d.id.toString()));
-    } else {
-        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] <= filter[key]);
-                return;
-            }
-            if (key.indexOf('_gte') !== -1) {
-                // less than or equal
-                const realKey = key.replace(/(_gte)$/, '');
-                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] < filter[key]);
-                return;
-            }
-            if (key.indexOf('_gt') !== -1) {
-                // less than or equal
-                const realKey = key.replace(/(_gt)$/, '');
-                items = items.filter(d => d[realKey] > filter[key]);
-                return;
-            }
-
-            items = items.filter(
-                d =>
-                    filter[key] instanceof Date
-                        ? +d[key] == +filter[key]
-                        : d[key] == filter[key]
-            );
-        });
 
-        if (filter.q) {
-            items = items.filter(d =>
-                Object.keys(d).some(
-                    key =>
-                        d[key] &&
-                        d[key]
-                            .toString()
-                            .toLowerCase()
-                            .includes(filter.q.toLowerCase())
-                )
-            );
-        }
-    }
+    items = applyFilters(items, filter);
 
     if (page !== undefined && perPage) {
         items = items.slice(page * perPage, page * perPage + perPage);

src/resolver/Query/applyFilters.js

@@ -0,0 +1,56 @@
+export default (entityData, filter = {}) => {
+    let items = [...entityData];
+
+    if (filter.ids) {
+        items = items.filter(d => filter.ids.includes(d.id.toString()));
+    } else {
+        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] <= filter[key]);
+                return;
+            }
+            if (key.indexOf('_gte') !== -1) {
+                // less than or equal
+                const realKey = key.replace(/(_gte)$/, '');
+                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] < filter[key]);
+                return;
+            }
+            if (key.indexOf('_gt') !== -1) {
+                // less than or equal
+                const realKey = key.replace(/(_gt)$/, '');
+                items = items.filter(d => d[realKey] > filter[key]);
+                return;
+            }
+
+            items = items.filter(
+                d =>
+                    filter[key] instanceof Date
+                        ? +d[key] == +filter[key]
+                        : d[key] == filter[key]
+            );
+        });
+
+        if (filter.q) {
+            items = items.filter(d =>
+                Object.keys(d).some(
+                    key =>
+                        d[key] &&
+                        d[key]
+                            .toString()
+                            .toLowerCase()
+                            .includes(filter.q.toLowerCase())
+                )
+            );
+        }
+    }
+
+    return items;
+};

src/resolver/Query/meta.js

@@ -1,48 +1,7 @@
-export default entityData => (_, { page, perPage = 25, filter = {} }) => {
-    let items = [...entityData];
+import applyFilters from './applyFilters';
 
-    if (filter.ids) {
-        items = items.filter(d => filter.ids.includes(d.id.toString()));
-    } else {
-        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] <= filter[key]);
-                return;
-            }
-            if (key.indexOf('_gte') !== -1) {
-                // less than or equal
-                const realKey = key.replace(/(_gte)$/, '');
-                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] < filter[key]);
-                return;
-            }
-            if (key.indexOf('_gt') !== -1) {
-                // less than or equal
-                const realKey = key.replace(/(_gt)$/, '');
-                items = items.filter(d => d[realKey] > filter[key]);
-                return;
-            }
-
-            items = items.filter(d => d[key] == filter[key]);
-        });
-
-        if (filter.q) {
-            items = items.filter(d =>
-                Object.keys(d).some(key => d[key].toString().includes(filter.q))
-            );
-        }
-    }
-
-    if (page !== undefined && perPage) {
-        items = items.slice(page * perPage, page * perPage + perPage);
-    }
+export default entityData => (_, { filter = {} }) => {
+    let items = applyFilters(entityData, filter);
 
     return { count: items.length };
 };