refactor(ReviewerNumbering): Reviewer numbers now assigned on submit instead of autosave

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

@@ -116,7 +116,7 @@ class Collection {
     return allCollectionFragments
   }
 
-  async getReviewerNumber({ reqUser, FragmentModel }) {
+  async getReviewerNumber({ userId, FragmentModel }) {
     const allCollectionFragments = await this.getAllCollectionFragments({
       FragmentModel,
     })
@@ -124,7 +124,7 @@ class Collection {
       allCollectionFragments.map(fragment => fragment.invitations),
     )
     const allNumberedInvitationsForUser = allCollectionInvitations
-      .filter(invite => invite.userId === reqUser.id)
+      .filter(invite => invite.userId === userId)
       .filter(invite => invite.reviewerNumber)
 
     if (isEmpty(allNumberedInvitationsForUser)) {

packages/component-helper-service/src/tests/collection.test.js

@@ -56,7 +56,7 @@ describe('Collection helper', () => {
       const FragmentModel = models.Fragment
 
       const reviewerNumber = await collectionHelper.getReviewerNumber({
-        reqUser: reviewer,
+        userId: reviewer.id,
         FragmentModel,
       })
 
@@ -71,7 +71,7 @@ describe('Collection helper', () => {
       const FragmentModel = models.Fragment
 
       const reviewerNumber = await collectionHelper.getReviewerNumber({
-        reqUser: reviewer,
+        userId: reviewer.id,
         FragmentModel,
       })
 
@@ -86,7 +86,7 @@ describe('Collection helper', () => {
       const FragmentModel = models.Fragment
 
       const reviewerNumber = await collectionHelper.getReviewerNumber({
-        reqUser: answerReviewer,
+        userId: answerReviewer.id,
         FragmentModel,
       })
 
@@ -101,7 +101,7 @@ describe('Collection helper', () => {
       const FragmentModel = models.Fragment
 
       const reviewerNumber = await collectionHelper.getReviewerNumber({
-        reqUser: reviewer,
+        userId: reviewer.id,
         FragmentModel,
       })
 

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

+const { findIndex } = require('lodash')
 const {
   services,
   authsome: authsomeHelper,
@@ -64,6 +65,22 @@ module.exports = models => async (req, res) => {
       }
     }
 
+    if (req.body.submittedOn) {
+      const collectionHelper = new Collection({ collection })
+      const invitationIndex = findIndex(fragment.invitations, [
+        'userId',
+        req.authInfo.id,
+      ])
+      if (invitationIndex >= 0) {
+        const FragmentModel = models.Fragment
+        const reviewerNumber = await collectionHelper.getReviewerNumber({
+          userId: req.authInfo.id,
+          FragmentModel,
+        })
+        fragment.invitations[invitationIndex].reviewerNumber = reviewerNumber
+      }
+    }
+
     fragment.save()
 
     return res.status(200).json(recommendation)

packages/component-manuscript-manager/src/routes/fragmentsRecommendations/post.js

 const uuid = require('uuid')
-const { pick, get, set, has, isEmpty, last, findIndex } = require('lodash')
+const { pick, get, set, has, isEmpty, last } = require('lodash')
 const config = require('config')
 const { v4 } = require('uuid')
 
@@ -197,18 +197,6 @@ module.exports = models => async (req, res) => {
     }
   }
 
-  const invitationIndex = findIndex(fragment.invitations, [
-    'userId',
-    reqUser.id,
-  ])
-  if (invitationIndex >= 0) {
-    const FragmentModel = models.Fragment
-    const reviewerNumber = await collectionHelper.getReviewerNumber({
-      reqUser,
-      FragmentModel,
-    })
-    fragment.invitations[invitationIndex].reviewerNumber = reviewerNumber
-  }
   fragment.recommendations.push(newRecommendation)
   fragment.save()