fix(Email): Merge with origin

packages/component-helper-service/src/services/User.js

@@ -67,7 +67,7 @@ class User {
   async updateUserTeams({ userId, teamId }) {
     const user = await this.UserModel.find(userId)
     user.teams.push(teamId)
-    user.save()
+    await user.save()
   }
 
   async getActiveAuthors({ fragmentAuthors }) {

packages/component-manuscript-manager/src/routes/fragments/patch.js

 const {
   Team,
+  User,
   services,
   Fragment,
   Collection,
@@ -43,6 +44,7 @@ module.exports = models => async (req, res) => {
 
     const collectionHelper = new Collection({ collection })
     const fragmentHelper = new Fragment({ fragment })
+    const userHelper = new User({ UserModel: models.User })
 
     const strategies = {
       he: heRequestRevision,
@@ -61,6 +63,7 @@ module.exports = models => async (req, res) => {
     try {
       const newFragment = await strategies[role].execute({
         models,
+        userHelper,
         notification,
         fragmentHelper,
         collectionHelper,

packages/component-manuscript-manager/src/routes/fragments/strategies/eicRequestRevision.js

-const { union } = require('lodash')
-
 module.exports = {
   execute: async ({
     models,
@@ -7,6 +5,7 @@ module.exports = {
     fragmentHelper,
     collectionHelper,
     notification,
+    userHelper,
   }) => {
     const eicRequestToRevision = fragmentHelper.getLatestEiCRequestToRevision()
     if (!eicRequestToRevision) {
@@ -24,26 +23,16 @@ module.exports = {
       fragmentId: newFragment.id,
     })
 
-    const authorIds = newFragment.authors.map(auth => {
-      const { id } = auth
-      return id
-    })
+    const authorIds = newFragment.authors.map(auth => auth.id)
 
-    let authorsTeam = await teamHelper.getTeam({
+    const { id: teamId } = await teamHelper.createTeam({
       role: 'author',
+      members: authorIds,
       objectType: 'fragment',
     })
-
-    if (!authorsTeam) {
-      authorsTeam = await teamHelper.createTeam({
-        role: 'author',
-        members: authorIds,
-        objectType: 'fragment',
-      })
-    } else {
-      authorsTeam.members = union(authorsTeam.members, authorIds)
-      await authorsTeam.save()
-    }
+    authorIds.forEach(id => {
+      userHelper.updateUserTeams({ userId: id, teamId })
+    })
 
     await collectionHelper.updateStatus({ newStatus: 'submitted' })
 

packages/component-manuscript-manager/src/routes/fragments/strategies/heRequestRevision.js

-const { union } = require('lodash')
-
 module.exports = {
   execute: async ({
     models,
+    userHelper,
     TeamHelper,
     notification,
     fragmentHelper,
@@ -36,26 +35,16 @@ module.exports = {
       await newFragment.save()
     }
 
-    const authorIds = newFragment.authors.map(auth => {
-      const { id } = auth
-      return id
-    })
+    const authorIds = newFragment.authors.map(auth => auth.id)
 
-    let authorsTeam = await teamHelper.getTeam({
+    const { id: teamId } = await teamHelper.createTeam({
       role: 'author',
+      members: authorIds,
       objectType: 'fragment',
     })
-
-    if (!authorsTeam) {
-      authorsTeam = await teamHelper.createTeam({
-        role: 'author',
-        members: authorIds,
-        objectType: 'fragment',
-      })
-    } else {
-      authorsTeam.members = union(authorsTeam.members, authorIds)
-      await authorsTeam.save()
-    }
+    authorIds.forEach(id => {
+      userHelper.updateUserTeams({ userId: id, teamId })
+    })
 
     const fragments = await collectionHelper.getAllFragments({
       FragmentModel: models.Fragment,