update browse algorithm

genediazjr · Oct 26, 2019 · dc005c3 · dc005c3
1 parent 34cdfbc
commit dc005c3
Showing 1 changed file with 12 additions and 34 deletions.
diff --git a/lib/queries.js b/lib/queries.js
@@ -88,47 +88,25 @@ exports.defaults = function (schema) {
             return cached;
         }
 
-        if (!query.all && query.perPage && query.page && query.custom) {
+        const fetchOpts = Object.assign({
+            withRelated: schema.references.browse
+        }, opts);
 
-            res = await schema.model
-                .forge()
-                .query(query.custom)
-                .orderBy(query.sort, query.order)
-                .fetchPage(Object.assign({
-                    withRelated: schema.references.browse,
-                    pageSize: query.perPage,
-                    page: query.page
-                }, opts));
-        }
-        else if (!query.all && query.perPage && query.page) {
+        const fetch = schema.model.forge().orderBy(query.sort, query.order);
 
-            res = await schema.model
-                .forge()
-                .orderBy(query.sort, query.order)
-                .fetchPage(Object.assign({
-                    withRelated: schema.references.browse,
-                    pageSize: query.perPage,
-                    page: query.page
-                }, opts));
+        if (query.custom) {
+            fetch.query(query.custom);
         }
-        else if (query.custom) {
 
-            res = await schema.model
-                .forge()
-                .query(query.custom)
-                .orderBy(query.sort, query.order)
-                .fetchAll(Object.assign({
-                    withRelated: schema.references.browse
-                }, opts));
+        if (query.perPage && query.page) {
+            fetchOpts.pageSize = query.perPage;
+            fetchOpts.page = query.page;
+
+            res = await fetch.fetchPage(fetchOpts);
         }
         else {
 
-            res = await schema.model
-                .forge()
-                .orderBy(query.sort, query.order)
-                .fetchAll(Object.assign({
-                    withRelated: schema.references.browse
-                }, opts));
+            res = await fetch.fetchAll(fetchOpts);
         }
 
         const result = {