feat(component-user-manager): add test for get/post submitting,corresponding

packages/component-user-manager/src/helpers/Collection.js

@@ -2,7 +2,22 @@ const mailService = require('pubsweet-component-mail-service')
 const logger = require('@pubsweet/logger')
 
 module.exports = {
-  addAuthor: async (collection, user, res, url) => {
+  addAuthor: async (
+    collection,
+    user,
+    res,
+    url,
+    isSubmitting,
+    isCorresponding,
+  ) => {
+    collection.authors = collection.authors || []
+    const author = {
+      userId: user.id,
+      isSubmitting,
+      isCorresponding,
+    }
+    collection.authors.push(author)
+    await collection.save()
     if (collection.owners.includes(user.id)) {
       return res.status(200).json(user)
     }

packages/component-user-manager/src/routes/collectionsUsers/delete.js

@@ -14,6 +14,9 @@ module.exports = models => async (req, res) => {
       models.Team,
     )
 
+    collection.authors = collection.authors.filter(
+      author => author.userId !== userId,
+    )
     await collection.save()
     await teamHelper.removeTeamMember(team.id, userId, models.Team)
     user.teams = user.teams.filter(userTeamId => team.id !== userTeamId)

packages/component-user-manager/src/routes/collectionsUsers/get.js

@@ -5,7 +5,7 @@ module.exports = models => async (req, res) => {
   // TO DO: add authsom
   const { collectionId } = req.params
   try {
-    await models.Collection.find(collectionId)
+    const collection = await models.Collection.find(collectionId)
     const members = await teamHelper.getTeamMembersByCollection(
       collectionId,
       'author',
@@ -18,8 +18,17 @@ module.exports = models => async (req, res) => {
       })
       return
     }
-
-    const membersData = members.map(async member => models.User.find(member))
+    const membersData = members.map(async member => {
+      const user = await models.User.find(member)
+      const matchingAuthor = collection.authors.find(
+        author => author.userId === user.id,
+      )
+      return {
+        ...user,
+        isSubmitting: matchingAuthor.isSubmitting,
+        isCorresponding: matchingAuthor.isCorresponding,
+      }
+    })
 
     const resBody = await Promise.all(membersData)
     res.status(200).json(resBody)

packages/component-user-manager/src/routes/collectionsUsers/post.js

@@ -6,9 +6,11 @@ const teamHelper = require('../../helpers/Team')
 const userHelper = require('../../helpers/User')
 
 module.exports = models => async (req, res) => {
-  const { email, role } = req.body
+  const { email, role, isSubmitting, isCorresponding } = req.body
 
-  if (!helpers.checkForUndefinedParams(email, role)) {
+  if (
+    !helpers.checkForUndefinedParams(email, role, isSubmitting, isCorresponding)
+  ) {
     res.status(400).json({ error: 'Email and role are required' })
     logger.error('Email and role are missing')
     return
@@ -29,12 +31,28 @@ module.exports = models => async (req, res) => {
   try {
     let user = await models.User.findByEmail(email)
 
-    await teamHelper.setupManuscriptTeam(models, user, collectionId, role)
-
-    // get updated user from DB
-    user = await models.User.find(user.id)
     if (role === 'author') {
-      return collectionHelper.addAuthor(collection, user, res, url)
+      await teamHelper.setupManuscriptTeam(models, user, collectionId, role)
+      // get updated user from DB
+      user = await models.User.find(user.id)
+      if (collection.authors !== undefined) {
+        const match = collection.authors.find(
+          author => author.userId === user.id,
+        )
+        if (match) {
+          return res.status(400).json({
+            error: `User ${user.email} is already an author`,
+          })
+        }
+      }
+      return await collectionHelper.addAuthor(
+        collection,
+        user,
+        res,
+        url,
+        isSubmitting,
+        isCorresponding,
+      )
     }
     return res.status(400).json({
       error: `${role} is not defined`,
@@ -61,7 +79,14 @@ module.exports = models => async (req, res) => {
         })
       }
       await teamHelper.setupManuscriptTeam(models, newUser, collectionId, role)
-      return res.status(200).json(newUser)
+      return collectionHelper.addAuthor(
+        collection,
+        newUser,
+        res,
+        url,
+        isSubmitting,
+        isCorresponding,
+      )
     }
     return res.status(e.status).json({
       error: 'Something went wrong',

packages/component-user-manager/src/tests/collectionsUsers/get.test.js

@@ -21,6 +21,8 @@ describe('Get collections users route handler', () => {
     expect(res.statusCode).toBe(200)
     const data = JSON.parse(res._getData())
     expect(data).toHaveLength(1)
+    expect(data[0].isSubmitting).toBeDefined()
+    expect(data[0].type).toBe('user')
   })
   it('should return an error when the collection does not exist', async () => {
     const req = httpMocks.createRequest()

packages/component-user-manager/src/tests/collectionsUsers/post.test.js

@@ -23,6 +23,8 @@ const postPath = '../../routes/collectionsUsers/post'
 const body = {
   email: chance.email(),
   role: 'author',
+  isSubmitting: true,
+  isCorresponding: false,
 }
 describe('Post collections users route handler', () => {
   it('should return success when an author adds a new user to a collection', async () => {
@@ -38,6 +40,10 @@ describe('Post collections users route handler', () => {
     const data = JSON.parse(res._getData())
     expect(data.email).toEqual(body.email)
     expect(data.invitations).toBeUndefined()
+    const matchingAuthor = standardCollection.authors.find(
+      author => author.userId === data.id,
+    )
+    expect(matchingAuthor).toBeDefined()
   })
   it('should return success when an author adds an existing user as co author to a collection', async () => {
     body.email = author.email
@@ -52,6 +58,26 @@ describe('Post collections users route handler', () => {
     expect(res.statusCode).toBe(200)
     const data = JSON.parse(res._getData())
     expect(data.email).toEqual(body.email)
+    const matchingAuthor = standardCollection.authors.find(
+      auth => auth.userId === author.id,
+    )
+    expect(matchingAuthor).toBeDefined()
+  })
+  it('should return an error when the an author is added to the same collection', async () => {
+    body.email = submittingAuthor.email
+    const req = httpMocks.createRequest({
+      body,
+    })
+    req.user = submittingAuthor.id
+    req.params.collectionId = standardCollection.id
+    const res = httpMocks.createResponse()
+    await require(postPath)(models)(req, res)
+
+    expect(res.statusCode).toBe(400)
+    const data = JSON.parse(res._getData())
+    expect(data.error).toEqual(
+      `User ${submittingAuthor.email} is already an author`,
+    )
   })
   it('should return an error when params are missing', async () => {
     delete body.email

packages/component-user-manager/src/tests/fixtures/collections.js

@@ -10,6 +10,13 @@ module.exports = {
     fragments: [],
     owners: [submittingAuthor.id],
     save: jest.fn(),
+    authors: [
+      {
+        userId: submittingAuthor.id,
+        isSubmitting: true,
+        isCorresponding: false,
+      },
+    ],
   },
   authorsCollection: {
     id: chance.guid(),

packages/component-user-manager/src/tests/fixtures/teams.js

@@ -3,7 +3,7 @@ const collections = require('./collections')
 const { authorTeamID } = require('./teamIDs')
 
 const { standardCollection } = collections
-const { author } = users
+const { submittingAuthor } = users
 const teams = {
   authorTeam: {
     teamType: {
@@ -16,7 +16,7 @@ const teams = {
       type: 'collection',
       id: standardCollection.id,
     },
-    members: [author.id],
+    members: [submittingAuthor.id],
     save: jest.fn(() => teams.authorTeam),
     updateProperties: jest.fn(() => teams.authorTeam),
     id: authorTeamID,

packages/xpub-faraday/config/validations.js

@@ -9,7 +9,8 @@ module.exports = {
     status: Joi.string(),
     reviewers: Joi.array(),
     customId: Joi.string(),
-    assignedPeople: Joi.array(),
+    authors: Joi.array(),
+    invitations: Joi.array(),
   },
   fragment: [
     {
@@ -95,7 +96,6 @@ module.exports = {
     lastName: Joi.string().allow(''),
     affiliation: Joi.string().allow(''),
     title: Joi.string().allow(''),
-    invitations: Joi.array(),
     teams: Joi.array(),
     editorInChief: Joi.boolean(),
     handlingEditor: Joi.boolean(),