feat: allow existing project member to be invited as copilot

.circleci/config.yml

@@ -149,7 +149,7 @@ workflows:
           context : org-global
           filters:
             branches:
-              only: ['develop', 'migration-setup', 'pm-1497']
+              only: ['develop', 'migration-setup', 'pm-1506']
       - deployProd:
           context : org-global
           filters:

src/routes/projectMemberInvites/create.js

@@ -322,17 +322,19 @@ module.exports = [
         const errorMessageForAlreadyMemberUser = 'User with such handle is already a member of the team.';
 
         if (inviteUserIds) {
-        // remove members already in the team
-          _.remove(inviteUserIds, u => _.some(members, (m) => {
-            const isPresent = m.userId === u;
-            if (isPresent) {
-              failed.push(_.assign({}, {
-                handle: getUserHandleById(m.userId, inviteUsers),
-                message: errorMessageForAlreadyMemberUser,
-              }));
-            }
-            return isPresent;
-          }));
+          if (invite.role !== PROJECT_MEMBER_ROLE.COPILOT) {
+            // remove members already in the team
+            _.remove(inviteUserIds, u => _.some(members, (m) => {
+              const isPresent = m.userId === u;
+              if (isPresent) {
+                failed.push(_.assign({}, {
+                  handle: getUserHandleById(m.userId, inviteUsers),
+                  message: errorMessageForAlreadyMemberUser,
+                }));
+              }
+              return isPresent;
+            }));
+          }
 
           // for each user invited by `handle` (userId) we have to load they Topcoder Roles,
           // so we can check if such a user can be invited with desired Project Role

src/util.js

@@ -937,7 +937,25 @@ const projectServiceUtils = {
 
     // check if member is already registered
     const existingMember = _.find(members, m => m.userId === member.userId);
-    if (existingMember) {
+    // if (existingMember) {
+    //   const err = new Error(`User already registered for role: ${existingMember.role}`);
+    //   err.status = 400;
+    //   return Promise.reject(err);
+    // }
+
+    if (existingMember
+        && member.role === PROJECT_MEMBER_ROLE.COPILOT
+        && existingMember.role === PROJECT_MEMBER_ROLE.OBSERVER) {
+      yield models.ProjectMember
+          .update(
+            { deletedBy: req.authUser.userId },
+            { where: { userId: existingMember.userId }, transaction}
+          );
+      yield models.ProjectMember.destroy({
+        where: { userId: existingMember.userId },
+        transaction
+      });
+    } else if (existingMember) {
       const err = new Error(`User already registered for role: ${existingMember.role}`);
       err.status = 400;
       return Promise.reject(err);