#1153, #1223

server/xpub-model/entities/team/index.js

@@ -26,8 +26,10 @@ const TeamManager = {
           'reviewer',
           trx,
         )
-        if (existing && existing.userId !== userId) {
-          await Team.update({ id: existing.id, userId }, userId, trx)
+        if (existing) {
+          if (existing.userId !== userId) {
+            await Team.update({ id: existing.id, userId }, userId, trx)
+          }
         } else {
           await Team.insert(
             {
@@ -53,12 +55,12 @@ const TeamManager = {
           message = `/submission/${manuscriptId}/${
             man.status === 'in-review' ? 'submit' : 'review'
           }`
+          await trx.commit()
           if (submitter && submitter.userId === userId) {
             if (man.status === 'in-review') {
               await Manuscript.update(
                 { id: manuscriptId, status: 'submitted' },
                 userId,
-                trx,
               )
               return {
                 success: false,
@@ -66,7 +68,6 @@ const TeamManager = {
               }
             }
           }
-          await trx.commit()
         }
         return { success: true, message }
       }