Handle aggregate for discriminators

dsanel · Jun 12, 2023 · 2e8fd0d · 2e8fd0d
1 parent 842c8f2
commit 2e8fd0d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -137,12 +137,16 @@ module.exports = function (schema, options) {
 
         if (finalList.indexOf('aggregate') > -1) {
             schema.pre('aggregate', function() {
-                var firsMatchStr = JSON.stringify(this.pipeline()[0]);
+                var firstMatch = this.pipeline()[0];
 
-                if ( firsMatchStr !== '{"$match":{"deleted":{"$ne":false}}}' ) {
-                    if (firsMatchStr === '{"$match":{"showAllDocuments":"true"}}') {
+                if(firstMatch.$match?.deleted?.$ne !== false){
+                    if(firstMatch.$match?.showAllDocuments === 'true'){
+                        var {showAllDocuments, ...replacement} = firstMatch.$match;
                         this.pipeline().shift();
-                    } else {
+                        if(Object.keys(replacement).length > 0){
+                            this.pipeline().unshift({ $match: replacement });
+                        }
+                    }else{
                         this.pipeline().unshift({ $match: { deleted: { '$ne': true } } });
                     }
                 }

diff --git a/test/index.js b/test/index.js
@@ -1653,11 +1653,13 @@ describe("check usage of $ne operator", function () {
 });
 
 describe("aggregate methods: { overrideMethods: ['aggregate'] }", function () {
-    var TestSchema = new Schema({ name: String }, { collection: 'mongoose_delete_test_aggregate' });
+    var TestSchema = new Schema({ name: String }, { collection: 'mongoose_delete_test_aggregate', discriminatorKey:'kind' });
     TestSchema.plugin(mongoose_delete, { overrideMethods: ['aggregate'] });
 
     var TestModel = mongoose.model('Test5_Aggregate', TestSchema);
 
+    var DiscriminatorTestModel = TestModel.discriminator('DiscriminatorTest',new Schema({ age: Number }))
+
     beforeEach(async function () {
         await TestModel.create(
           [
@@ -1743,6 +1745,25 @@ describe("aggregate methods: { overrideMethods: ['aggregate'] }", function () {
             should.not.exist(err);
         }
     });
+
+
+    it("aggregateWithDeleted([{$project : {name : 1, age :1} }]) -> should return deleted documents from discriminator (pipeline)", async function () {
+        try {
+            await DiscriminatorTestModel.create(
+                [
+                    { name: 'Lando Calrissian', age: 46, deleted: true },
+                    { name: 'Han Solo', age:44 },
+                    { name: 'Jabba Desilijic Tiure', age:617, deleted: true }
+                ]);
+            var documents = await DiscriminatorTestModel
+                .aggregateWithDeleted([{$match:{age:{$gte:50}}}])
+                .project({ name : 1, age:1 });
+
+            documents.length.should.equal(1);
+        } catch (err) {
+            should.not.exist(err);
+        }
+    });
 });
 
 describe("mongoose_delete find method overridden with populate", function () {