Merge pull request #16 from DoctorVoid/fix-irrelevant-entities

fix: query deleted irrelevant entities too
Enigmatis · Jun 3, 2019 · 38eefa9 · 38eefa9
2 parents b2b251c + e083b5b
commit 38eefa9
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/schema-helpers/query-with-irrelevant-wrapper.ts b/src/schema-helpers/query-with-irrelevant-wrapper.ts
@@ -1,6 +1,6 @@
-import { QueryIrrelevantResult } from '@enigmatis/utills';
-import { Model } from 'mongoose';
-import { InnerModelType } from '../types';
+import {QueryIrrelevantResult} from '@enigmatis/utills';
+import {Model} from 'mongoose';
+import {InnerModelType} from '../types';
 
 export const QueryWithIrrelevant = async (
     model: Model<InnerModelType<any>>,
@@ -12,10 +12,11 @@ export const QueryWithIrrelevant = async (
     }
     const irrelevant = await model.find(
         {
-            _id: { $nin: result.map(x => x._id) },
-            dataVersion: { $gt: dataVersion },
+            _id: {$nin: result.map(x => x._id)},
+            dataVersion: {$gt: dataVersion},
+            deleted: {$in: [true, false]}
         },
-        { _id: true },
+        {_id: true},
     );
 
     return new QueryIrrelevantResult(result, irrelevant.map(x => x._id));