From bbd07fd0ced527de3a5b29e0f36db37d7ad91dc0 Mon Sep 17 00:00:00 2001
From: "Dale R. Hille" <dalehille@gmail.com>
Date: Mon, 4 Nov 2019 13:51:56 -0500
Subject: [PATCH] use deleted: false instead of $ne: true

It looks like the { $ne: true } was not working but just using `deleted: false` works since items in the resources collection will have `deleted` set to true or false when posting to the razeedash api
---
 imports/api/resource/server/publications.js | 4 ++--
 imports/api/stat/methods.js                 | 2 +-
 imports/both/utils.js                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/imports/api/resource/server/publications.js b/imports/api/resource/server/publications.js
index 59f97c40..0438f020 100644
--- a/imports/api/resource/server/publications.js
+++ b/imports/api/resource/server/publications.js
@@ -26,7 +26,7 @@ Meteor.publish('resources.byCluster', function(orgId, clusterId) {
     return Resources.find({ 
         cluster_id: clusterId,
         org_id: orgId,
-        deleted: { $ne: true } 
+        deleted: false
     });
 });
 
@@ -102,7 +102,7 @@ Meteor.publish('resourcesSearch', function(orgId, searchStr='', limit=50, fromTi
             searchableData: 1
         }
     };
-    let search = {org_id: orgId};
+    let search = {org_id: orgId, deleted: false };
     if (searchStr || fromTime || toTime) {
         search = utils.buildSearchForResourcesName(orgId, searchStr, fromTime, toTime);
         if (!search) {
diff --git a/imports/api/stat/methods.js b/imports/api/stat/methods.js
index 3920cd3f..9ae4cea3 100644
--- a/imports/api/stat/methods.js
+++ b/imports/api/stat/methods.js
@@ -26,7 +26,7 @@ Meteor.methods({
             throw new Meteor.Error('not logged in');
         }
         const clusterCount = Clusters.find({org_id: orgId}).count();
-        const resourceCount = Resources.find({org_id: orgId}).count();
+        const resourceCount = Resources.find({org_id: orgId, deleted: false}).count();
         Stats.update({ org_id: orgId }, { $set: { deploymentCount: resourceCount, clusterCount: clusterCount } } );
     },
 });
diff --git a/imports/both/utils.js b/imports/both/utils.js
index 18dbf9f3..f1469f1c 100644
--- a/imports/both/utils.js
+++ b/imports/both/utils.js
@@ -123,7 +123,7 @@ exports.buildSearchForResourcesName = (orgId, searchStr = '', fromTime, toTime)
     }
     ands.push({
         org_id: orgId,
-        deleted: { $ne: true } 
+        deleted: false
     });
     var search = {
         $and: ands,