fix: refactor body memberships logic

middlewares/memberships.js

@@ -2,7 +2,6 @@ const {
     Permission,
     BodyMembership,
     CircleMembership,
-    JoinRequest,
     User
 } = require('../models');
 const helpers = require('../lib/helpers');
@@ -99,18 +98,6 @@ exports.deleteMembership = async (req, res) => {
         return errors.makeForbiddenError(res, 'Permission delete_member:body is required, but not present.');
     }
 
-    // delete all join requests if any, so a person can reapply
-    await JoinRequest.destroy({
-        where: {
-            user_id: req.currentBodyMembership.user_id,
-            body_id: req.currentBody.id
-        }
-    });
-
-    if (req.currentBodyMembership.user.primary_body_id === req.currentBody.id) {
-        await req.currentBodyMembership.user.update({ primary_body_id: null });
-    }
-
     await req.currentBodyMembership.destroy();
 
     return res.json({
@@ -128,18 +115,6 @@ exports.deleteOwnMembership = async (req, res) => {
         return errors.makeNotFoundError(res, 'You are not a member.');
     }
 
-    // delete all join requests if any, so a person can reapply
-    await JoinRequest.destroy({
-        where: {
-            user_id: req.user.id,
-            body_id: req.currentBody.id
-        }
-    });
-
-    if (req.user.primary_body_id === req.currentBody.id) {
-        await req.user.update({ primary_body_id: null });
-    }
-
     await bodyMembership.destroy();
 
     return res.json({

migrations/20200408165836-add-primary-body-id-to-users.js

@@ -0,0 +1,16 @@
+module.exports = {
+    up: (queryInterface, Sequelize) => queryInterface.addColumn(
+        'users',
+        'primary_body_id',
+        {
+            type: Sequelize.INTEGER,
+            allowNull: true,
+            references: {
+                model: 'bodies',
+                key: 'id'
+            },
+            onDelete: 'SET NULL'
+        },
+    ),
+    down: (queryInterface) => queryInterface.removeColumn('users', 'primary_body_id')
+};

models/BodyMembership.js

@@ -1,7 +1,9 @@
 const { Sequelize, sequelize } = require('../lib/sequelize');
 const logger = require('../lib/logger');
 const Body = require('./Body');
+const User = require('./User');
 const Circle = require('./Circle');
+const JoinRequest = require('./JoinRequest');
 const CircleMembership = require('./CircleMembership');
 
 const BodyMembership = sequelize.define('body_membership', {
@@ -56,4 +58,24 @@ BodyMembership.afterDestroy(async (membership) => {
     });
 });
 
+// Deleting all the join requests after leaving the body.
+BodyMembership.afterDestroy(async (membership) => {
+    await JoinRequest.destroy({
+        where: {
+            user_id: membership.user_id,
+            body_id: membership.body_id
+        }
+    });
+});
+
+// Unsetting primary body for user if needed.
+BodyMembership.afterDestroy(async (membership) => {
+    const user = await User.findByPk(membership.user_id);
+
+    if (user.primary_body_id === membership.body_id) {
+        await user.update({ primary_body_id: null });
+    }
+});
+
+
 module.exports = BodyMembership;