soft delete contributions / test delete by object

Author: visualjerk

server/hooks/hide-deleted-data.js renamed to server/hooks/keep-deleted-data-fields.js

@@ -3,17 +3,29 @@ const alterItems = require('../helper/alter-items');
 
 const defaults = {
   fields: [
-    'content'
+    'content',
+    'cando'
   ]
 };
 
 module.exports = (options = defaults) => alterItems(handleItem(options));
 
 const handleItem = options => item => {
   if (item.deleted) {
-    options.fields.forEach(field => {
-      item[field] = 'DELETED';
-    });
+    if (Array.isArray(options.fields)) {
+      options.fields.forEach(field => {
+        item[field] = 'DELETED';
+      });
+    } else {
+      options.fields.entries.forEach(field => {
+        const [key, value] = field;
+        if (typeof value === 'object') {
+          item[key] = handleItem(options[key])(item[key]);
+        } else {
+          item[field] = 'DELETED';
+        }
+      });
+    }
   }
   return item;
 };

server/hooks/null-deleted-data.js

@@ -75,6 +75,7 @@ module.exports = function (app) {
         }
       }
     },
+    deleted: { type: Boolean, default: false },
     createdAt: { type: Date, default: Date.now },
     updatedAt: { type: Date, default: Date.now },
     wasSeeded: { type: Boolean }

server/models/contributions.model.js

@@ -9,7 +9,7 @@ const {
 const { isVerified } = require('feathers-authentication-management').hooks;
 const createExcerpt = require('../../hooks/create-excerpt');
 const nullDeletedData = require('../../hooks/null-deleted-data');
-const hideDeletedData = require('../../hooks/hide-deleted-data');
+const keepDeletedDataFields = require('../../hooks/keep-deleted-data-fields');
 const createNotifications = require('./hooks/create-notifications');
 const createMentionNotifications = require('./hooks/create-mention-notifications');
 const _ = require('lodash');
@@ -91,7 +91,7 @@ module.exports = {
     all: [
       populate({ schema: userSchema }),
       xss({ fields: xssFields }),
-      hideDeletedData()
+      keepDeletedDataFields()
     ],
     find: [
       discard('content', 'user.coverImg', 'badgeIds')

server/services/comments/comments.hooks.js

@@ -1,5 +1,5 @@
 const { authenticate } = require('feathers-authentication').hooks;
-const { when, unless, isProvider, populate } = require('feathers-hooks-common');
+const { when, unless, isProvider, populate, softDelete, setNow } = require('feathers-hooks-common');
 const {
   //queryWithCurrentUser,
   associateCurrentUser,
@@ -9,6 +9,8 @@ const { isVerified } = require('feathers-authentication-management').hooks;
 const createSlug = require('../../hooks/create-slug');
 const saveRemoteImages = require('../../hooks/save-remote-images');
 const createExcerpt = require('../../hooks/create-excerpt');
+const nullDeletedData = require('../../hooks/null-deleted-data');
+const keepDeletedDataFields = require('../../hooks/keep-deleted-data-fields');
 const search = require('feathers-mongodb-fuzzy-search');
 const thumbnails = require('../../hooks/thumbnails');
 const isModerator = require('../../hooks/is-moderator-boolean');
@@ -98,7 +100,8 @@ module.exports = {
     get: [
       unless(isModerator(),
         excludeDisabled()
-      )
+      ),
+      softDelete()
     ],
     create: [
       authenticate('jwt'),
@@ -109,7 +112,8 @@ module.exports = {
       associateCurrentUser(),
       createSlug({ field: 'title' }),
       saveRemoteImages(['teaserImg']),
-      createExcerpt()
+      createExcerpt(),
+      softDelete()
     ],
     update: [
       authenticate('jwt'),
@@ -121,7 +125,9 @@ module.exports = {
         restrictToOwner()
       ),
       saveRemoteImages(['teaserImg']),
-      createExcerpt()
+      createExcerpt(),
+      softDelete(),
+      setNow('updatedAt')
     ],
     patch: [
       authenticate('jwt'),
@@ -133,15 +139,21 @@ module.exports = {
         restrictToOwner()
       ),
       saveRemoteImages(['teaserImg']),
-      createExcerpt()
+      createExcerpt(),
+      softDelete(),
+      setNow('updatedAt'),
+      // SoftDelete uses patch to delete items
+      // Make changes to deleted items here
+      nullDeletedData({ fields: [ 'content', 'contentExcerpt' ]})
     ],
     remove: [
       authenticate('jwt'),
       isVerified(),
       unless(isModerator(),
         excludeDisabled(),
         restrictToOwner()
-      )
+      ),
+      softDelete()
     ]
   },
 
@@ -151,7 +163,13 @@ module.exports = {
       populate({ schema: userSchema }),
       populate({ schema: categoriesSchema }),
       populate({ schema: candosSchema }),
-      populate({ schema: commentsSchema })
+      populate({ schema: commentsSchema }),
+      keepDeletedDataFields({ fields: [
+        '_id',
+        'deleted',
+        'createdAt',
+        'updatedAt'
+      ]})
     ],
     find: [
       when(isSingleItem(),