feat(reviewer-reminders): cancel reminders

packages/component-invite/src/routes/fragmentsInvitations/decline.js

@@ -6,6 +6,7 @@ const {
 } = require('pubsweet-component-helper-service')
 
 const notifications = require('./emails/notifications')
+const { cancelReviewerJobs } = require('./jobs/cancelReviewerJobs')
 
 module.exports = models => async (req, res) => {
   const { collectionId, invitationId, fragmentId } = req.params
@@ -67,6 +68,8 @@ module.exports = models => async (req, res) => {
       error: 'Unauthorized.',
     })
 
+  await cancelReviewerJobs(user.id)
+
   invitation.respondedOn = Date.now()
   invitation.hasAnswer = true
   invitation.isAccepted = false

packages/component-invite/src/routes/fragmentsInvitations/delete.js

@@ -6,6 +6,7 @@ const {
 } = require('pubsweet-component-helper-service')
 
 const notifications = require('./emails/notifications')
+const { cancelReviewerJobs } = require('./jobs/cancelReviewerJobs')
 
 module.exports = models => async (req, res) => {
   const { collectionId, invitationId, fragmentId } = req.params
@@ -79,6 +80,8 @@ module.exports = models => async (req, res) => {
       UserModel: models.User,
     })
 
+    await cancelReviewerJobs(user.id)
+
     return res.status(200).json({ fragment })
   } catch (e) {
     const notFoundError = await services.handleNotFoundError(e, 'collection')

packages/component-invite/src/routes/fragmentsInvitations/emails/invitations.js

@@ -26,7 +26,6 @@ module.exports = {
     baseUrl,
     fragment,
     UserModel,
-    TeamModel,
     timestamp,
     collection,
     invitation,
@@ -124,6 +123,7 @@ module.exports = {
       scheduleReminderJob({
         days,
         email,
+        userId: invitedUser.id,
         timeUnit,
         subject: `${subjectBaseText} reminder`,
         titleText: `the manuscript titled "${title}" by ${authorName}`,
@@ -135,6 +135,7 @@ module.exports = {
       timeUnit,
       invitation,
       days: removalDays,
+      userId: invitedUser.id,
       fragmentId: fragment.id,
       collectionId: collection.id,
     })

packages/component-invite/src/routes/fragmentsInvitations/jobs/cancel.js

-const moment = require('moment')
-const logger = require('@pubsweet/logger')
-const { Team, Collection } = require('pubsweet-component-helper-service')
-const {
-  Team: TeamModel,
-  User: UserModel,
-  Fragment: FragmentModel,
-  Collection: CollectionModel,
-} = require('pubsweet-server')
-
-const { jobs: { connectToJobQueue } } = require('pubsweet-server/src')
-
-const cancelJob = async ({ name }) => {
-  const queue = `reviewer-removal`
-
-  const jobQueue = await connectToJobQueue()
-
-  // Subscribe to the job queue with an async handler
-  await jobQueue.subscribe(queue, jobHandler)
-
-  await jobQueue.onComplete(queue, job => {
-    console.log(job.data.response.value)
-    logger.info(job.data.response.value)
-  })
-}

packages/component-invite/src/routes/fragmentsInvitations/jobs/cancelReviewerJobs.js

+const logger = require('@pubsweet/logger')
+
+const { jobs: { connectToJobQueue } } = require('pubsweet-server/src')
+
+const cancelReviewerJobs = async userId => {
+  const removalQueue = `reviewer-removal-${userId}`
+  const remindersQueue = `reviewer-reminders-${userId}`
+
+  const jobQueue = await connectToJobQueue()
+
+  await jobQueue.unsubscribe(remindersQueue)
+  await jobQueue.unsubscribe(removalQueue)
+
+  logger.info(`Canceled queue for reviewer ${userId}`)
+}
+
+module.exports = { cancelReviewerJobs }

packages/component-invite/src/routes/fragmentsInvitations/jobs/reminders.js

@@ -9,6 +9,7 @@ const Email = require('@pubsweet/component-email-templating')
 const scheduleReminderJob = async ({
   days,
   email,
+  userId,
   subject,
   timeUnit,
   titleText,
@@ -18,7 +19,7 @@ const scheduleReminderJob = async ({
     .add(days, timeUnit)
     .toISOString()
 
-  const queue = `reviewer-reminders-${days}-${executionDate}`
+  const queue = `reviewer-reminders-${userId}`
 
   const jobQueue = await connectToJobQueue()
 
@@ -32,7 +33,7 @@ const scheduleReminderJob = async ({
   email.content.subject = subject
 
   // Add job to the queue
-  const jobId = await jobQueue.publishAfter(
+  await jobQueue.publishAfter(
     queue,
     {
       days,
@@ -43,13 +44,11 @@ const scheduleReminderJob = async ({
     {},
     executionDate,
   )
-  console.log(`published job ${jobId} for the ${days} ${timeUnit} reminder`)
 
   // Subscribe to the job queue with an async handler
   await jobQueue.subscribe(queue, jobHandler)
 
   await jobQueue.onComplete(queue, job => {
-    console.log(job.data.response.value)
     logger.info(job.data.response.value)
   })
 }

packages/component-invite/src/routes/fragmentsInvitations/jobs/removals.js

@@ -12,6 +12,7 @@ const { jobs: { connectToJobQueue } } = require('pubsweet-server/src')
 
 const scheduleRemovalJob = async ({
   days,
+  userId,
   timeUnit,
   invitation,
   fragmentId,
@@ -21,7 +22,7 @@ const scheduleRemovalJob = async ({
     .add(days, timeUnit)
     .toISOString()
 
-  const queue = `reviewer-removal`
+  const queue = `reviewer-removal-${userId}`
 
   const jobQueue = await connectToJobQueue()
 
@@ -44,7 +45,6 @@ const scheduleRemovalJob = async ({
   await jobQueue.subscribe(queue, jobHandler)
 
   await jobQueue.onComplete(queue, job => {
-    console.log(job.data.response.value)
     logger.info(job.data.response.value)
   })
 }

packages/component-invite/src/routes/fragmentsInvitations/patch.js

@@ -6,6 +6,7 @@ const {
   authsome: authsomeHelper,
 } = require('pubsweet-component-helper-service')
 
+const { cancelReviewerJobs } = require('./jobs/cancelReviewerJobs')
 const notifications = require('./emails/notifications')
 
 module.exports = models => async (req, res) => {
@@ -48,6 +49,8 @@ module.exports = models => async (req, res) => {
         error: 'Unauthorized.',
       })
 
+    await cancelReviewerJobs(user.id)
+
     const collectionHelper = new Collection({ collection })
     const baseUrl = services.getBaseUrl(req)
 

packages/component-invite/src/routes/fragmentsInvitations/post.js

@@ -123,7 +123,6 @@ module.exports = models => async (req, res) => {
         invitation,
         invitedUser: user,
         UserModel: models.User,
-        TeamModel: models.Team,
         timestamp: invitation.invitedOn,
       })
     }
@@ -187,7 +186,6 @@ module.exports = models => async (req, res) => {
       invitation,
       invitedUser: newUser,
       UserModel: models.User,
-      TeamModel: models.Team,
       timestamp: invitation.invitedOn,
     })
 

packages/component-invite/src/tests/fragmentsInvitations/decline.test.js

@@ -10,6 +10,16 @@ const cloneDeep = require('lodash/cloneDeep')
 jest.mock('@pubsweet/component-send-email', () => ({
   send: jest.fn(),
 }))
+jest.mock('pubsweet-server/src', () => ({
+  jobs: {
+    connectToJobQueue: () => ({
+      unsubscribe: jest.fn(),
+      publishAfter: jest.fn(),
+      subscribe: jest.fn(),
+      onComplete: jest.fn(),
+    }),
+  },
+}))
 
 const reqBody = {
   invitationToken: fixtures.users.reviewer.accessTokens.invitation,

packages/component-invite/src/tests/fragmentsInvitations/delete.test.js

@@ -9,6 +9,16 @@ const { Model, fixtures } = fixturesService
 jest.mock('@pubsweet/component-send-email', () => ({
   send: jest.fn(),
 }))
+jest.mock('pubsweet-server/src', () => ({
+  jobs: {
+    connectToJobQueue: () => ({
+      unsubscribe: jest.fn(),
+      publishAfter: jest.fn(),
+      subscribe: jest.fn(),
+      onComplete: jest.fn(),
+    }),
+  },
+}))
 
 const path = '../routes/fragmentsInvitations/delete'
 const route = {

packages/component-invite/src/tests/fragmentsInvitations/patch.test.js

@@ -10,6 +10,17 @@ jest.mock('@pubsweet/component-send-email', () => ({
   send: jest.fn(),
 }))
 
+jest.mock('pubsweet-server/src', () => ({
+  jobs: {
+    connectToJobQueue: () => ({
+      unsubscribe: jest.fn(),
+      publishAfter: jest.fn(),
+      subscribe: jest.fn(),
+      onComplete: jest.fn(),
+    }),
+  },
+}))
+
 const reqBody = {
   isAccepted: true,
 }

packages/component-invite/src/tests/fragmentsInvitations/post.test.js

@@ -11,6 +11,16 @@ const { Model, fixtures } = fixturesService
 jest.mock('@pubsweet/component-send-email', () => ({
   send: jest.fn(),
 }))
+jest.mock('pubsweet-server/src', () => ({
+  jobs: {
+    connectToJobQueue: () => ({
+      unsubscribe: jest.fn(),
+      publishAfter: jest.fn(),
+      subscribe: jest.fn(),
+      onComplete: jest.fn(),
+    }),
+  },
+}))
 
 const chance = new Chance()
 const reqBody = {