fixed account and shout deletion

Author: appinteractive

server/seeder/base/pages.js

@@ -14,8 +14,7 @@ module.exports = (seederstore) => {
           type: 'termsAndConditions',
           key: 'terms-and-conditions',
           content: '<strong>ADD TERMS AND CONDITIONS!</strong>',
-          language: 'en',
-          wasSeeded: true
+          language: 'en'
         }
       },
       {
@@ -25,8 +24,7 @@ module.exports = (seederstore) => {
           type: 'termsAndConditions',
           key: 'terms-and-conditions',
           content: '<strong>FÜGE AGB`s HINZU!</strong>',
-          language: 'de',
-          wasSeeded: true
+          language: 'de'
         }
       },
       {
@@ -36,8 +34,7 @@ module.exports = (seederstore) => {
           type: 'dataPrivacy',
           key: 'data-privacy',
           content: '<strong>ADD PRIVACY POLICY!</strong>',
-          language: 'en',
-          wasSeeded: true
+          language: 'en'
         }
       },
       {
@@ -47,8 +44,7 @@ module.exports = (seederstore) => {
           type: 'dataPrivacy',
           key: 'data-privacy',
           content: '<strong>FÜGE DATENSCHUTZRICHTLINIEN HINZU!</strong>',
-          language: 'de',
-          wasSeeded: true
+          language: 'de'
         }
       },
       {
@@ -58,8 +54,7 @@ module.exports = (seederstore) => {
           type: 'imprint',
           key: 'imprint',
           content: '<strong>ADD IMPRINT!</strong>',
-          language: 'en',
-          wasSeeded: true
+          language: 'en'
         }
       },
       {
@@ -69,8 +64,7 @@ module.exports = (seederstore) => {
           type: 'imprint',
           key: 'imprint',
           content: '<strong>FÜGE EIN IMPRESSUM HINZU!</strong>',
-          language: 'de',
-          wasSeeded: true
+          language: 'de'
         }
       }
     ]

server/services/shouts/hooks/set-shout-count.js

@@ -1,22 +1,27 @@
-// Set done date, when cando is done
-module.exports = () => async hook => {
+const { getItems } = require('feathers-hooks-common');
+const { asyncForEach } = require('../../../helper/seed-helpers');
 
-  // get count of all shouts on this thing
-  const shoutCount = await hook.app.service('shouts').find({
-    query: {
-      foreignService: hook.result.foreignService,
-      foreignId: hook.result.foreignId,
-      $limit: 0
-    }
-  });
-
-  // update the shoud count on the foreign service
-  await hook.app.service(hook.result.foreignService)
-    .patch(hook.result.foreignId, {
-      $set: {
-        shoutCount: shoutCount.total
+module.exports = () => async (hook) => {
+  let items = getItems(hook);
+  if (!Array.isArray(items)) {
+    items = [items];
+  }
+  await asyncForEach(items, async (result) => {
+    // get count of all shouts on this thing
+    const shoutCount = await hook.app.service('shouts').find({
+      query: {
+        foreignService: result.foreignService,
+        foreignId: result.foreignId,
+        $limit: 0
       }
     });
-
+    // update the shout count on the foreign service
+    await hook.app.service(result.foreignService)
+      .patch(result.foreignId, {
+        $set: {
+          shoutCount: shoutCount.total
+        }
+      });
+  });
   return hook;
 };

server/services/users/hooks/remove-all-related-user-data.js

@@ -32,21 +32,26 @@ module.exports = () => {
         type: 'post'
       });
     }
+    delete hook.params.query.deleteContributions;
+
     if (query.deleteCandos === true) {
       await deleteData('contributions', {
         userId: user._id,
         type: 'cando'
       });
     }
+    delete hook.params.query.deleteCandos;
+
     if (query.deleteComments === true) {
       await deleteData('comments', {
         userId: user._id
       });
     }
-    // TODO: find a way to remove shouts without error
-    // await deleteData('shouts', {
-    //   userId: user._id
-    // });
+    delete hook.params.query.deleteComments;
+
+    await deleteData('shouts', {
+      userId: user._id
+    });
     await deleteData('users-candos', {
       userId: user._id
     });
@@ -60,7 +65,6 @@ module.exports = () => {
       email: user.email
     });
 
-    // throw new errors.FeathersError('BOOOM');
     return hook;
   };
 };