From 69862254c54d5382e27459ed84313568b6ebbdef Mon Sep 17 00:00:00 2001
From: Sebastian Mihalache <sebastian.mihalache@gmail.con>
Date: Wed, 8 Aug 2018 11:39:29 +0300
Subject: [PATCH] feat(eic-role): send emails to multiple eics
---
.../src/routes/emails/notifications.js | 2 +-
.../src/services/User.js | 11 +++--
.../emails/notifications.js | 3 +-
.../emails/notifications.js | 3 +-
.../fragments/notifications/notifications.js | 16 ++++---
.../notifications/notifications.js | 48 +++++++++----------
.../notifications/notifications.js | 28 ++++++-----
.../src/PackageManager.js | 1 +
.../fragmentsUsers/emails/notifications.js | 4 +-
9 files changed, 62 insertions(+), 54 deletions(-)
diff --git a/packages/component-email/src/routes/emails/notifications.js b/packages/component-email/src/routes/emails/notifications.js
index 23fea64c8..e5783fd5e 100644
--- a/packages/component-email/src/routes/emails/notifications.js
+++ b/packages/component-email/src/routes/emails/notifications.js
@@ -11,7 +11,7 @@ const { getEmailCopy } = require('./emailCopy')
module.exports = {
async sendNotifications({ user, baseUrl, role, UserModel }) {
const userHelper = new User({ UserModel })
- const { firstName, lastName } = await userHelper.getEditorInChief()
+ const { firstName, lastName } = await userHelper.getEditorsInChief()
const eicName = `${firstName} ${lastName}`
const email = new Email({
diff --git a/packages/component-helper-service/src/services/User.js b/packages/component-helper-service/src/services/User.js
index 074414d59..2eb092cee 100644
--- a/packages/component-helper-service/src/services/User.js
+++ b/packages/component-helper-service/src/services/User.js
@@ -41,12 +41,11 @@ class User {
return newUser
}
- async getEditorInChief() {
+ async getEditorsInChief() {
const { UserModel } = this
const users = await UserModel.all()
- const eic = users.find(user => user.editorInChief || user.admin)
- return eic
+ return users.filter(user => user.editorInChief)
}
async updateUserTeams({ userId, teamId }) {
@@ -65,6 +64,12 @@ class User {
return authors.filter(author => activeUsers.includes(author.id))
}
+
+ async getEiCName() {
+ const editorsInChief = await this.getEditorsInChief()
+ const { firstName, lastName } = editorsInChief[0]
+ return `${firstName} ${lastName}`
+ }
}
module.exports = User
diff --git a/packages/component-invite/src/routes/collectionsInvitations/emails/notifications.js b/packages/component-invite/src/routes/collectionsInvitations/emails/notifications.js
index 44c00f685..90df1a7ce 100644
--- a/packages/component-invite/src/routes/collectionsInvitations/emails/notifications.js
+++ b/packages/component-invite/src/routes/collectionsInvitations/emails/notifications.js
@@ -36,7 +36,8 @@ module.exports = {
} ${submittingAuthor.lastName}`
const userHelper = new User({ UserModel })
- const eic = await userHelper.getEditorInChief()
+ const eics = await userHelper.getEditorsInChief()
+ const eic = eics[0]
const eicName = `${eic.firstName} ${eic.lastName}`
const subjectBaseText = `${collection.customId}: Manuscript `
diff --git a/packages/component-invite/src/routes/fragmentsInvitations/emails/notifications.js b/packages/component-invite/src/routes/fragmentsInvitations/emails/notifications.js
index 12cad6a9d..9eeb709b6 100644
--- a/packages/component-invite/src/routes/fragmentsInvitations/emails/notifications.js
+++ b/packages/component-invite/src/routes/fragmentsInvitations/emails/notifications.js
@@ -37,8 +37,7 @@ module.exports = {
const handlingEditor = get(collection, 'handlingEditor')
const userHelper = new User({ UserModel })
- const { firstName, lastName } = await userHelper.getEditorInChief()
- const eicName = `${firstName} ${lastName}`
+ const eicName = await userHelper.getEiCName()
const subjectBaseText = isCanceled
? `${collection.customId}: Reviewer `
: `${collection.customId}: Manuscript `
diff --git a/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js b/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js
index 012113ffd..ee0f6f291 100644
--- a/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js
+++ b/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js
@@ -49,9 +49,7 @@ module.exports = {
})
const userHelper = new User({ UserModel })
- const eic = await userHelper.getEditorInChief()
- const eicName = `${eic.firstName} ${eic.lastName}`
-
+ const eicName = await userHelper.getEiCName()
if (isNewVersion) {
sendHandlingEditorEmail({
email,
@@ -76,8 +74,8 @@ module.exports = {
if (isTechnicalCheck) {
sendEQSEmail({
- eic,
email,
+ eicName,
baseUrl,
collection,
subjectBaseText,
@@ -157,7 +155,13 @@ const sendReviewersEmail = async ({
})
}
-const sendEQSEmail = ({ eic, email, baseUrl, collection, subjectBaseText }) => {
+const sendEQSEmail = ({
+ email,
+ eicName,
+ baseUrl,
+ collection,
+ subjectBaseText,
+}) => {
const emailType = 'eqs-manuscript-submitted'
email.toUser = {
@@ -166,7 +170,7 @@ const sendEQSEmail = ({ eic, email, baseUrl, collection, subjectBaseText }) => {
}
email.content.unsubscribeLink = baseUrl
- email.content.signatureName = `${eic.firstName} ${eic.lastName}`
+ email.content.signatureName = eicName
email.content.subject = `${subjectBaseText} Submitted`
email.content.ctaLink = services.createUrl(
baseUrl,
diff --git a/packages/component-manuscript-manager/src/routes/fragmentsRecommendations/notifications/notifications.js b/packages/component-manuscript-manager/src/routes/fragmentsRecommendations/notifications/notifications.js
index 97195facf..b31859583 100644
--- a/packages/component-manuscript-manager/src/routes/fragmentsRecommendations/notifications/notifications.js
+++ b/packages/component-manuscript-manager/src/routes/fragmentsRecommendations/notifications/notifications.js
@@ -47,12 +47,6 @@ module.exports = {
})
const userHelper = new User({ UserModel })
- const {
- email: eicEmail,
- firstName,
- lastName,
- } = await userHelper.getEditorInChief()
- const eicName = `${firstName} ${lastName}`
let comments
if (isEditorInChief) {
@@ -71,7 +65,7 @@ module.exports = {
// the request came from either the Editor in Chief or a reviewer, so the HE needs to be notified
sendHandlingEditorEmail({
email,
- eicName,
+ eicName: await userHelper.getEiCName(),
baseUrl,
comments,
titleText,
@@ -110,11 +104,10 @@ module.exports = {
handlingEditorName: get(collection, 'handlingEditor.name', 'N/A'),
})
- sendEiCEmail({
+ sendEiCsEmail({
email,
baseUrl,
- eicName,
- eicEmail,
+ userHelper,
titleText,
subjectBaseText,
recommendation: newRecommendation,
@@ -331,20 +324,18 @@ const sendReviewersEmail = async ({
},
)
const { html, text } = email.getBody({
- body: { paragraph: reviewer.paragraph },
- hasLink: reviewer.hasLink,
+ body: { paragraph: reviewer.paragraph, hasLink: reviewer.hasLink },
})
email.sendEmail({ html, text })
})
}
-const sendEiCEmail = ({
+const sendEiCsEmail = async ({
email,
- eicName,
- eicEmail,
titleText,
- recommendation: { recommendation, comments: recComments = [] },
+ userHelper,
subjectBaseText,
+ recommendation: { recommendation, comments: recComments = [] },
}) => {
let emailType
@@ -364,22 +355,29 @@ const sendEiCEmail = ({
throw new Error(`undefined recommendation: ${recommendation} `)
}
- email.toUser = {
- email: eicEmail,
- name: eicName,
- }
-
- const privateNote = recComments.find(comm => comm.private)
+ const privateNote = recComments.find(comm => !comm.public)
const content = get(privateNote, 'content')
const comments = content ? `Note to Editor: "${content}"` : ''
- const { html, text } = email.getBody({
- body: getEmailCopy({
+
+ const editors = (await userHelper.getEditorsInChief()).map(eic => ({
+ ...eic,
+ ...getEmailCopy({
emailType,
titleText,
comments,
}),
+ }))
+
+ editors.forEach(eic => {
+ email.toUser = {
+ email: eic.email,
+ name: `${eic.firstName} ${eic.lastName}`,
+ }
+ const { html, text } = email.getBody({
+ body: { paragraph: eic.paragraph, hasLink: eic.hasLink },
+ })
+ email.sendEmail({ html, text })
})
- email.sendEmail({ html, text })
}
const getSubjectByRecommendation = recommendation =>
diff --git a/packages/component-manuscript-manager/src/routes/technicalChecks/notifications/notifications.js b/packages/component-manuscript-manager/src/routes/technicalChecks/notifications/notifications.js
index 0da35cdfd..782cdbb0c 100644
--- a/packages/component-manuscript-manager/src/routes/technicalChecks/notifications/notifications.js
+++ b/packages/component-manuscript-manager/src/routes/technicalChecks/notifications/notifications.js
@@ -27,18 +27,9 @@ module.exports = {
} ${submittingAuthor.lastName}`
const userHelper = new User({ UserModel })
- const {
- lastName,
- firstName,
- email: eicEmail,
- } = await userHelper.getEditorInChief()
const email = new Email({
type: 'user',
- toUser: {
- email: eicEmail,
- name: `${firstName} ${lastName}`,
- },
content: {
subject: `${collection.customId}: Manuscript Passed Technical Checks`,
signatureName: 'EQS Team',
@@ -51,12 +42,23 @@ module.exports = {
},
})
- const { html, text } = email.getBody({
- body: getEmailCopy({
- titleText,
+ const editors = (await userHelper.getEditorsInChief()).map(eic => ({
+ ...eic,
+ ...getEmailCopy({
emailType: 'eqs-manuscript-accepted',
+ titleText,
}),
+ }))
+
+ editors.forEach(eic => {
+ email.toUser = {
+ email: eic.email,
+ name: `${eic.firstName} ${eic.lastName}`,
+ }
+ const { html, text } = email.getBody({
+ body: { paragraph: eic.paragraph, hasLink: eic.hasLink },
+ })
+ email.sendEmail({ html, text })
})
- email.sendEmail({ html, text })
},
}
diff --git a/packages/component-mts-package/src/PackageManager.js b/packages/component-mts-package/src/PackageManager.js
index 2bbed4fbd..967985f3a 100644
--- a/packages/component-mts-package/src/PackageManager.js
+++ b/packages/component-mts-package/src/PackageManager.js
@@ -56,6 +56,7 @@ const createFilesPackage = (s3Config, archiver = nodeArchiver) => {
})
archive.on('error', err => {
+ logger.error(err)
throw err
})
archive.on('end', err => {
diff --git a/packages/component-user-manager/src/routes/fragmentsUsers/emails/notifications.js b/packages/component-user-manager/src/routes/fragmentsUsers/emails/notifications.js
index 8ee396d52..413ea4967 100644
--- a/packages/component-user-manager/src/routes/fragmentsUsers/emails/notifications.js
+++ b/packages/component-user-manager/src/routes/fragmentsUsers/emails/notifications.js
@@ -33,8 +33,6 @@ module.exports = {
} ${submittingAuthor.lastName}`
const userHelper = new User({ UserModel })
- const { firstName, lastName } = await userHelper.getEditorInChief()
- const eicName = `${firstName} ${lastName}`
const subjectBaseText = `${collection.customId}: Manuscript`
const email = new Email({
@@ -42,7 +40,7 @@ module.exports = {
content: {
ctaLink: baseUrl,
ctaText: 'VIEW DASHBOARD',
- signatureName: eicName,
+ signatureName: await userHelper.getEiCName(),
},
})
--
GitLab