diff --git a/app/apollo/utils/applyQueryFields.js b/app/apollo/utils/applyQueryFields.js index 3800f8726..eebd672a6 100644 --- a/app/apollo/utils/applyQueryFields.js +++ b/app/apollo/utils/applyQueryFields.js @@ -329,7 +329,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 const resources = await loadResourcesWithSearchAndArgs({ search, diff --git a/app/routes/index.js b/app/routes/index.js index fc7ce6ed8..ed8180ef5 100644 --- a/app/routes/index.js +++ b/app/routes/index.js @@ -213,8 +213,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 },