Omit deleted resources from applyQueryFields results

adamkingit · adamkingit · commit 95a451ace9ab · 2021-05-21T15:33:58.000-04:00
diff --git a/app/apollo/utils/applyQueryFields.js b/app/apollo/utils/applyQueryFields.js
@@ -249,7 +249,7 @@ const applyQueryFieldsToSubscriptions = async(subs, queryFields={}, args, contex
     });
   }
   if(queryFields.resources){
-    const search = { org_id: orgId, 'searchableData.subscription_id': { $in: subUuids } };
+    const search = { org_id: orgId, 'searchableData.subscription_id': { $in: subUuids }, deleted: false };
     if (servSub) delete search.org_id; // service subscriptions push resources to different orgs
     var resources = await loadResourcesWithSearchAndArgs({
       search,
diff --git a/app/routes/index.js b/app/routes/index.js
@@ -207,8 +207,8 @@ async function initialize(){
           options: { name: 'org_id.cluster_id.subid.deleted', }
         },
         {
-          keys: { 'searchableData.subscription_id': 1},
-          options: { name: 'searchableData.subscription_id', }
+          keys: { 'searchableData.subscription_id': 1, deleted: 1},
+          options: { name: 'searchableData.subscription_id.deleted', }
         },
         {
           keys: { org_id: 1, cluster_id: 1, 'searchableData.kind': 1, 'searchableData.children': 1, deleted: 1 },

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ const applyQueryFieldsToSubscriptions = async(subs, queryFields={}, args, contex`
`249`	`249`	`});`
`250`	`250`	`}`
`251`	`251`	`if(queryFields.resources){`
`252`		`- const search = { org_id: orgId, 'searchableData.subscription_id': { $in: subUuids } };`
	`252`	`+ const search = { org_id: orgId, 'searchableData.subscription_id': { $in: subUuids }, deleted: false };`
`253`	`253`	`if (servSub) delete search.org_id; // service subscriptions push resources to different orgs`
`254`	`254`	`var resources = await loadResourcesWithSearchAndArgs({`
`255`	`255`	`search,`
Original file line number	Diff line number	Diff line change
`@@ -207,8 +207,8 @@ async function initialize(){`
`207`	`207`	`options: { name: 'org_id.cluster_id.subid.deleted', }`
`208`	`208`	`},`
`209`	`209`	`{`
`210`		`- keys: { 'searchableData.subscription_id': 1},`
`211`		`- options: { name: 'searchableData.subscription_id', }`
	`210`	`+ keys: { 'searchableData.subscription_id': 1, deleted: 1},`
	`211`	`+ options: { name: 'searchableData.subscription_id.deleted', }`
`212`	`212`	`},`
`213`	`213`	`{`
`214`	`214`	`keys: { org_id: 1, cluster_id: 1, 'searchableData.kind': 1, 'searchableData.children': 1, deleted: 1 },`