Revert "hotfix: verify whether the list of returned documents is null or empty"

Author: nour-karoui

package-lock.json

@@ -25,19 +25,16 @@ export const softDeletePlugin = (schema: mongoose.Schema) => {
     },
   });
 
-  // Add query middleware to filter out soft deleted documents
-  QUERY_HOOK_METHODS.forEach(method => {
-    schema.pre(method, function(next) {
-      const filter = this.getFilter();
-      if (filter.isDeleted === true) {
+  // @ts-ignore
+  schema.pre(QUERY_HOOK_METHODS,
+    async function (this, next: (err?: CallbackError) => void) {
+      if (this.getFilter().isDeleted === true) {
         return next();
       }
-      // Modify the filter to exclude soft deleted documents
-      const newFilter = { ...filter, isDeleted: { $ne: true } };
-      this.setQuery(newFilter);
+      this.setQuery({ ...this.getFilter(), isDeleted: { $ne: true } });
       next();
-    });
-  });
+    },
+  );
 
   schema.pre('aggregate', function (next) {
     if (this.options.skipHook) return next();
@@ -50,19 +47,21 @@ export const softDeletePlugin = (schema: mongoose.Schema) => {
   });
 
   schema.static('restore', async function (query) {
+
     // add {isDeleted: true} because the method find is set to filter the non deleted documents only,
     // so if we don't add {isDeleted: true}, it won't be able to find it
     const updatedQuery = {
       ...query,
       isDeleted: true
     };
     const deletedTemplates = await this.find(updatedQuery);
-    if (!deletedTemplates || deletedTemplates.length === 0) {
-      return { restored: 0 };
+    if (!deletedTemplates) {
+      return Error('element not found');
     }
     let restored = 0;
     for (const deletedTemplate of deletedTemplates) {
       if (deletedTemplate.isDeleted) {
+        deletedTemplate.$isDeleted(false);
         deletedTemplate.isDeleted = false;
         deletedTemplate.deletedAt = null;
         await deletedTemplate.save().then(() => restored++).catch((e: mongoose.Error) => { throw new Error(e.name + ' ' + e.message) });
@@ -73,12 +72,13 @@ export const softDeletePlugin = (schema: mongoose.Schema) => {
 
   schema.static('softDelete', async function (query, options?: SaveOptions) {
     const templates = await this.find(query);
-    if (!templates || templates.length === 0) {
-      return { deleted: 0 };
+    if (!templates) {
+      return Error('Element not found');
     }
     let deleted = 0;
     for (const template of templates) {
       if (!template.isDeleted) {
+        template.$isDeleted(true);
         template.isDeleted = true;
         template.deletedAt = new Date();
         await template.save(options).then(() => deleted++).catch((e: mongoose.Error) => { throw new Error(e.name + ' ' + e.message) });

src/soft-delete-plugin.ts

@@ -26,6 +26,7 @@ const commentSchema = new mongoose.Schema({
   }
 });
 commentSchema.plugin(softDeletePlugin);
+const commentModel = mongoose.model<Comment, SoftDeleteModel<Comment>>('Comment', commentSchema);
 
 describe('utils', () => {
   beforeAll(async () => {
@@ -50,6 +51,9 @@ describe('utils', () => {
     ]);
   });
 
+  it('should overwrite lookup stage with isDeleted query', () => {
+    const pipeline: PipelineStage[] = [];
+  });
   afterAll(async () => {
     await mongoose.disconnect();
   })