From dc966afe8e0c5d81f62b6f006657b1969b678366 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 16 Dec 2016 17:06:56 -0700
Subject: [PATCH] adjusted query style

---
 routes/api/assets/index.js | 42 +++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/routes/api/assets/index.js b/routes/api/assets/index.js
index a661d64e8..e92eab72e 100644
--- a/routes/api/assets/index.js
+++ b/routes/api/assets/index.js
@@ -16,36 +16,47 @@ router.get('/', (req, res, next) => {
     search = ''
   } = req.query;
 
-  const assets = (filter, search) => {
+  const FilterOpenAssets = (query, filter) => {
     switch(filter) {
     case 'open':
-      return Asset.search(search)
-        .find({
-          $or: [
-              {closedAt: null},
-              {closedAt: {$gt: Date.now()}}
-          ]
-        });
+      return query.merge({
+        $or: [
+          {
+            closedAt: null
+          },
+          {
+            closedAt: {
+              $gt: Date.now()
+            }
+          }
+        ]
+      });
     case 'closed':
-      return Asset.search(search)
-        .find({
-          closedAt: {$lt: Date.now()}
-        });
+      return query.merge({
+        closedAt: {
+          $lt: Date.now()
+        }
+      });
     default:
-      return Asset.search(search);
+      return query;
     }
   };
 
   // Find all the assets.
   Promise.all([
-    assets(filter, search)
+
+    // Find the actuall assets.
+    FilterOpenAssets(Asset.search(search), filter)
       .sort({[field]: (sort === 'asc') ? 1 : -1})
       .skip(parseInt(skip))
       .limit(parseInt(limit)),
-    assets(filter, search)
+
+    // Get the count of actual assets.
+    FilterOpenAssets(Asset.search(search), filter)
       .count()
   ])
   .then(([result, count]) => {
+
     // Send back the asset data.
     res.json({
       result,
@@ -124,7 +135,6 @@ router.put('/:asset_id/status', (req, res, next) => {
       }
     })
     .then(() => {
-
       res.status(204).json();
     })
     .catch((err) => {