fix(*): fix jobs circular dependency

config/default.js

@@ -22,6 +22,7 @@ module.exports = {
     },
     tempFolderPath: path.join(process.cwd(), 'temp'),
     useFileStorage: true,
+    useJobQueue: true,
   },
   pubsweet: {
     components,

src/app.js

@@ -21,7 +21,6 @@ const registerComponents = require('./registerComponents')
 const healthcheck = require('./healthcheck')
 const createCORSConfig = require('./corsConfig')
 const { connectToFileStorage } = require('./services/fileStorage')
-const { subscribeJobsToQueue } = require('./jobs')
 
 const configureApp = app => {
   const models = require('@pubsweet/models')
@@ -159,7 +158,7 @@ const configureApp = app => {
     }
 
     if (useJobQueue) {
-      const { startJobQueue } = require('./jobs')
+      const { startJobQueue, subscribeJobsToQueue } = require('./jobs')
       await startJobQueue() // Manage job queue
       await subscribeJobsToQueue() // Subscribe job callbacks to the queue
     }

src/index.js

@@ -10,9 +10,9 @@ const authentication = require('./authentication')
 const { File } = require('./models')
 const { createFile, deleteFiles } = require('./models/file/file.controller')
 
+const { boss, connectToJobQueue } = require('./jobs')
 const app = require('./app')
 const startServer = require('./startServer')
-const { boss, connectToJobQueue } = require('./jobs')
 const { BaseModel, useTransaction } = require('./models')
 const modelTypes = require('./models/_helpers/types')
 

src/jobs.js

@@ -3,7 +3,7 @@ const logger = require('@pubsweet/logger')
 const db = require('@pubsweet/db-manager/src/db')
 
 const pubsubManager = require('./graphql/pubsub')
-const { jobs } = require('./services')
+const { REFRESH_TOKEN_EXPIRED } = require('./services/jobs/jobs.identifiers')
 
 const {
   subscriptions: { USER_UPDATED },
@@ -150,7 +150,7 @@ const defaultJobs = [
   //   },
   // },
   {
-    name: jobs.REFRESH_TOKEN_EXPIRED,
+    name: REFRESH_TOKEN_EXPIRED,
     callback: async job => {
       try {
         const pubsub = await pubsubManager.getPubsub()
@@ -163,7 +163,7 @@ const defaultJobs = [
         })
         job.done()
       } catch (e) {
-        logger.error(`Job ${jobs.REFRESH_TOKEN_EXPIRED}: defer error:`, e)
+        logger.error(`Job ${REFRESH_TOKEN_EXPIRED}: defer error:`, e)
         throw e
       }
     },

src/models/user/user.controller.js

@@ -27,10 +27,11 @@ const {
   requestResetPasswordEmailNotFound,
 } = require('../_helpers/emailTemplates')
 
+const notify = require('../../services/notify')
+
 const {
-  notify,
   notificationTypes: { EMAIL },
-} = require('../../services')
+} = require('../../services/constants')
 
 const {
   labels: { USER_CONTROLLER },

src/services/__tests__/jobs.service.test.js

-const { boss } = require('../jobs')
+const { boss } = require('../../jobs')
 const { defer: deferJob } = require('../jobs')
 
 // Mock boss.<publish, subscribe>
-jest.mock('../jobs', () => {
-  const originalModule = jest.requireActual('../jobs')
+jest.mock('../../jobs', () => {
+  const originalModule = jest.requireActual('../../jobs')
   return {
     __esModule: true,
     ...originalModule,