soft delete contributions / delete related items

visualjerk · visualjerk · commit 64a4f6907a07 · 2018-05-24T23:55:03.000+02:00
diff --git a/server/helper/alter-items.js b/server/helper/alter-items.js
@@ -14,9 +14,9 @@ module.exports = func => hook => {
   }
   let items = getItems(hook);
   if (Array.isArray(items)) {
-    items.map(item => func(item));
+    items.map(item => func(item, hook));
   } else if (items) {
-    items = func(items);
+    items = func(items, hook);
   }
   replaceItems(hook, items);
   return hook;
diff --git a/server/hooks/cleanup-related-items.js b/server/hooks/cleanup-related-items.js
@@ -0,0 +1,31 @@
+// Cleanup all related items by deleting them
+const alterItems = require('../helper/alter-items');
+
+const defaults = {
+  connections: []
+};
+
+module.exports = (options = defaults) => alterItems(handleItem(options));
+
+const handleItem = options => (item, hook) => {
+  options.connections.forEach(connection => {
+    deleteItem(item, connection, hook);
+  });
+  return item;
+};
+
+const deleteItem = async (item, connection, hook) => {
+  if (!item || !connection || !connection.childField || !connection.service) {
+    return;
+  }
+  const parentField = connection.parentField || '_id';
+  let query = connection.query || {};
+  query[connection.childField] = item[parentField];
+  try {
+    await hook.app.service(connection.service)
+      .remove(null, { query });
+  } catch (err) {
+    throw new Error(err);
+  }
+
+};
diff --git a/server/hooks/null-deleted-data.js b/server/hooks/null-deleted-data.js
diff --git a/server/hooks/patch-deleted-data.js b/server/hooks/patch-deleted-data.js
@@ -0,0 +1,17 @@
+// Patch deleted records with given data
+const alterItems = require('../helper/alter-items');
+
+const defaults = {
+  data: {
+    content: 'DELETED'
+  }
+};
+
+module.exports = (options = defaults) => alterItems(handleItem(options));
+
+const handleItem = options => item => {
+  if (item.deleted) {
+    item = {...item, ...options.data};
+  }
+  return item;
+};
diff --git a/server/services/comments/comments.hooks.js b/server/services/comments/comments.hooks.js
@@ -1,14 +1,14 @@
-const { authenticate } = require('feathers-authentication').hooks;
-const { unless, isProvider, populate, discard, softDelete, setNow } = require('feathers-hooks-common');
+const {authenticate} = require('feathers-authentication').hooks;
+const {unless, isProvider, populate, discard, softDelete, setNow} = require('feathers-hooks-common');
 const {
   //queryWithCurrentUser,
   associateCurrentUser,
   // restrictToAuthenticated,
   restrictToOwner
 } = require('feathers-authentication-hooks');
-const { isVerified } = require('feathers-authentication-management').hooks;
+const {isVerified} = require('feathers-authentication-management').hooks;
 const createExcerpt = require('../../hooks/create-excerpt');
-const nullDeletedData = require('../../hooks/null-deleted-data');
+const patchDeletedData = require('../../hooks/patch-deleted-data');
 const keepDeletedDataFields = require('../../hooks/keep-deleted-data-fields');
 const createNotifications = require('./hooks/create-notifications');
 const createMentionNotifications = require('./hooks/create-mention-notifications');
@@ -30,7 +30,7 @@ const xssFields = ['content', 'contentExcerpt'];
 module.exports = {
   before: {
     all: [
-      xss({ fields: xssFields })
+      xss({fields: xssFields})
     ],
     find: [],
     get: [
@@ -43,44 +43,49 @@ module.exports = {
         isVerified()
       ),
       associateCurrentUser(),
-      createExcerpt({ length: 180 }),
+      createExcerpt({length: 180}),
       softDelete()
     ],
     update: [
       authenticate('jwt'),
-      isVerified(),
       unless(isProvider('server'),
+        isVerified(),
         restrictToOwner()
       ),
-      createExcerpt({ length: 180 }),
+      createExcerpt({length: 180}),
       softDelete(),
       setNow('updatedAt')
     ],
     patch: [
       authenticate('jwt'),
-      isVerified(),
       unless(isProvider('server'),
+        isVerified(),
         unless((hook) => {
           // TODO: change that to a more sane method by going through the server with an constum service
           // only allow upvoteCount increment for non owners
           // the data has to be the exact copy of the valid object
           const valid = {$inc: {upvoteCount: 1}};
           return (!_.difference(_.keys(valid), _.keys(hook.data)).length) &&
-                (!_.difference(_.keys(valid.$inc), _.keys(hook.data.$inc)).length) &&
-                (!_.difference(_.values(valid.$inc), _.values(hook.data.$inc)).length);
+            (!_.difference(_.keys(valid.$inc), _.keys(hook.data.$inc)).length) &&
+            (!_.difference(_.values(valid.$inc), _.values(hook.data.$inc)).length);
         }, restrictToOwner())
       ),
-      createExcerpt({ length: 180 }),
+      createExcerpt({length: 180}),
       softDelete(),
       setNow('updatedAt'),
       // SoftDelete uses patch to delete items
       // Make changes to deleted items here
-      nullDeletedData({ fields: [ 'content', 'contentExcerpt' ]})
+      patchDeletedData({
+        data: {
+          content: 'DELETED',
+          contentExcerpt: 'DELETED'
+        }
+      })
     ],
     remove: [
       authenticate('jwt'),
-      isVerified(),
       unless(isProvider('server'),
+        isVerified(),
         restrictToOwner()
       ),
       softDelete()
@@ -89,8 +94,8 @@ module.exports = {
 
   after: {
     all: [
-      populate({ schema: userSchema }),
-      xss({ fields: xssFields }),
+      populate({schema: userSchema}),
+      xss({fields: xssFields}),
       keepDeletedDataFields()
     ],
     find: [
diff --git a/server/services/contributions/contributions.hooks.js b/server/services/contributions/contributions.hooks.js
@@ -1,15 +1,16 @@
-const { authenticate } = require('feathers-authentication').hooks;
-const { when, unless, isProvider, populate, softDelete, setNow } = require('feathers-hooks-common');
+const {authenticate} = require('feathers-authentication').hooks;
+const {when, unless, isProvider, populate, softDelete, setNow} = require('feathers-hooks-common');
 const {
   //queryWithCurrentUser,
   associateCurrentUser,
   restrictToOwner
 } = require('feathers-authentication-hooks');
-const { isVerified } = require('feathers-authentication-management').hooks;
+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 patchDeletedData = require('../../hooks/patch-deleted-data');
+const cleanupRelatedItems = require('../../hooks/cleanup-related-items');
 const keepDeletedDataFields = require('../../hooks/keep-deleted-data-fields');
 const search = require('feathers-mongodb-fuzzy-search');
 const thumbnails = require('../../hooks/thumbnails');
@@ -86,7 +87,7 @@ const xssFields = ['content', 'contentExcerpt', 'cando.reason'];
 module.exports = {
   before: {
     all: [
-      xss({ fields: xssFields })
+      xss({fields: xssFields})
     ],
     find: [
       unless(isModerator(),
@@ -95,7 +96,8 @@ module.exports = {
       search(),
       search({
         fields: ['title', 'content']
-      })
+      }),
+      softDelete()
     ],
     get: [
       unless(isModerator(),
@@ -110,7 +112,7 @@ module.exports = {
         isVerified()
       ),
       associateCurrentUser(),
-      createSlug({ field: 'title' }),
+      createSlug({field: 'title'}),
       saveRemoteImages(['teaserImg']),
       createExcerpt(),
       softDelete()
@@ -144,7 +146,25 @@ module.exports = {
       setNow('updatedAt'),
       // SoftDelete uses patch to delete items
       // Make changes to deleted items here
-      nullDeletedData({ fields: [ 'content', 'contentExcerpt' ]})
+      patchDeletedData({
+        data: {
+          $set: {
+            title: 'DELETED',
+            type: 'DELETED',
+            content: 'DELETED',
+            contentExcerpt: 'DELETED',
+            categoryIds: undefined,
+            teaserImg: undefined,
+            shoutCount: 0,
+            tags: undefined,
+            emotions: undefined
+          },
+          $unset: {
+            cando: '',
+            meta: ''
+          }
+        }
+      })
     ],
     remove: [
       authenticate('jwt'),
@@ -159,17 +179,19 @@ module.exports = {
 
   after: {
     all: [
-      xss({ fields: xssFields }),
-      populate({ schema: userSchema }),
-      populate({ schema: categoriesSchema }),
-      populate({ schema: candosSchema }),
-      populate({ schema: commentsSchema }),
-      keepDeletedDataFields({ fields: [
-        '_id',
-        'deleted',
-        'createdAt',
-        'updatedAt'
-      ]})
+      xss({fields: xssFields}),
+      populate({schema: userSchema}),
+      populate({schema: categoriesSchema}),
+      populate({schema: candosSchema}),
+      populate({schema: commentsSchema}),
+      keepDeletedDataFields({
+        fields: [
+          '_id',
+          'deleted',
+          'createdAt',
+          'updatedAt'
+        ]
+      })
     ],
     find: [
       when(isSingleItem(),
@@ -193,7 +215,35 @@ module.exports = {
       createMentionNotifications(),
       thumbnails(thumbs)
     ],
-    remove: []
+    remove: [
+      cleanupRelatedItems({
+        connections: [
+          {
+            service: 'comments',
+            parentField: '_id',
+            childField: 'contributionId'
+          },
+          {
+            service: 'emotions',
+            parentField: '_id',
+            childField: 'contributionId'
+          },
+          {
+            service: 'shouts',
+            parentField: '_id',
+            childField: 'foreignId',
+            query: {
+              foreignService: 'contributions'
+            }
+          },
+          {
+            service: 'users-candos',
+            parentField: '_id',
+            childField: 'contributionId'
+          }
+        ]
+      })
+    ]
   },
 
   error: {

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ module.exports = func => hook => {`
`14`	`14`	`}`
`15`	`15`	`let items = getItems(hook);`
`16`	`16`	`if (Array.isArray(items)) {`
`17`		`- items.map(item => func(item));`
	`17`	`+ items.map(item => func(item, hook));`
`18`	`18`	`} else if (items) {`
`19`		`- items = func(items);`
	`19`	`+ items = func(items, hook);`
`20`	`20`	`}`
`21`	`21`	`replaceItems(hook, items);`
`22`	`22`	`return hook;`