From 20209296bf59a6bd5d76d52ef9c03411f7327be2 Mon Sep 17 00:00:00 2001 From: eisbilir Date: Thu, 11 May 2023 10:46:40 +0300 Subject: [PATCH] use different template for challenges without forum --- config/default.js | 3 ++- src/services/ResourceService.js | 13 +++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/config/default.js b/config/default.js index 1098963..ae5a090 100644 --- a/config/default.js +++ b/config/default.js @@ -72,8 +72,9 @@ module.exports = { REGISTRATION_EMAIL: { EMAIL_FROM: process.env.EMAIL_FROM || 'no-reply@topcoder.com', SENDGRID_TEMPLATE_ID: process.env.SENDGRID_TEMPLATE_ID || '', + SENDGRID_TEMPLATE_ID_NO_FORUM: process.env.SENDGRID_TEMPLATE_ID_NO_FORUM || '', SUBMIT_URL: process.env.SUBMIT_URL || 'https://www.topcoder.com/challenges/:id/submit/', - REVIEW_APP_URL: process.env.REVIEW_APP_URL || 'https://software.topcoder.com/review', + REVIEW_APP_URL: process.env.REVIEW_APP_URL || 'https://software.topcoder.com/review/actions/ViewProjectDetails?pid=', HELP_URL: process.env.HELP_URL || 'https://help.topcoder.com', SUPPORT_EMAIL: process.env.SUPPORT_EMAIL || 'support@topcoder.com' }, diff --git a/src/services/ResourceService.js b/src/services/ResourceService.js index 6bf7f31..d60c839 100644 --- a/src/services/ResourceService.js +++ b/src/services/ResourceService.js @@ -359,6 +359,11 @@ async function createResource (currentUser, resource) { logger.debug(`Created resource: ${JSON.stringify(_.pick(ret, payloadFields))}`) await helper.postEvent(config.RESOURCE_CREATE_TOPIC, _.pick(ret, payloadFields)) if (!_.get(challenge, 'task.isTask', false) && resource.roleId === config.SUBMITTER_RESOURCE_ROLE_ID) { + const forumUrl = _.get(challenge, 'discussions[0].url') + let templateId = config.REGISTRATION_EMAIL.SENDGRID_TEMPLATE_ID + if (_.isUndefined(forumUrl)) { + templateId = config.REGISTRATION_EMAIL.SENDGRID_TEMPLATE_ID_NO_FORUM + } await helper.postEvent(config.EMAIL_NOTIFICATIN_TOPIC, { from: config.REGISTRATION_EMAIL.EMAIL_FROM, replyTo: config.REGISTRATION_EMAIL.EMAIL_FROM, @@ -366,14 +371,14 @@ async function createResource (currentUser, resource) { data: { handle, challengeName: challenge.name, - forum: _.get(challenge, 'discussions[0].url'), - submissionEndTime: _.get(_.find(challenge.phases, phase => phase.name === 'Submission'), 'scheduledEndDate'), + forum: forumUrl, + submissionEndTime: new Date(_.get(_.find(challenge.phases, phase => phase.name === 'Submission'), 'scheduledEndDate')).toUTCString(), submitUrl: _.replace(config.REGISTRATION_EMAIL.SUBMIT_URL, ':id', challengeId), - reviewAppUrl: config.REGISTRATION_EMAIL.REVIEW_APP_URL, + reviewAppUrl: config.REGISTRATION_EMAIL.REVIEW_APP_URL + challenge.legacyId, helpUrl: config.REGISTRATION_EMAIL.HELP_URL, support: config.REGISTRATION_EMAIL.SUPPORT_EMAIL }, - sendgrid_template_id: config.REGISTRATION_EMAIL.SENDGRID_TEMPLATE_ID, + sendgrid_template_id: templateId, version: 'v3' }) }