Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

option to send message send error details in email #14

Merged
merged 2 commits into from
Oct 8, 2020
Merged

option to send message send error details in email #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a77f9bb
option to send message send error details in email
codygordon Oct 8, 2020
616a3d0
Merge branch 'main' into send-error-emails
codygordon Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 74 additions & 6 deletions src/server/api/mutations/sendMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,52 @@ import { jobRunner } from "../../../extensions/job-runners";
import { Tasks } from "../../../workers/tasks";
import { updateContactTags } from "./updateContactTags";

import { sendEmail } from "../../mail";
import { log } from "../../../lib";

const JOBS_SAME_PROCESS = !!(
process.env.JOBS_SAME_PROCESS || global.JOBS_SAME_PROCESS
);

const newError = (message, code) => {
const newError = (message, code, details = {}) => {
const err = new GraphQLError(message);
err.code = code;
if (process.env.DEBUGGING_EMAILS) {
sendEmail({
to: process.env.DEBUGGING_EMAILS.split(","),
subject: `Spoke Send Message Error`,
html: `
<body>
<div><b>ERROR CODE: ${code}</b></div>
<div>ERROR MESSAGE: ${message}</div>
<br />
<div>DETAILS</div>
<pre>${JSON.stringify(
{
...details.message,
campaignContactId: details.campaignContactId,
user: details.user
? {
id: details.user.id,
name: `${details.user.first_name} ${details.user.last_name}`
}
: undefined,
campaign: details.campaign
? {
id: details.campaign.id,
title: details.campaign.title,
organizationId: details.campaign.organization_id
}
: undefined
},
null,
2
)}
</pre>
</body>
`
}).catch(emailErr => log.debug(emailErr));
}
return err;
};

Expand All @@ -25,12 +64,18 @@ export const sendMessage = async (
// contact is mutated, so we don't use a loader
let contact = await cacheableData.campaignContact.load(campaignContactId);
const campaign = await loaders.campaign.load(contact.campaign_id);

if (
contact.assignment_id !== parseInt(message.assignmentId) ||
campaign.is_archived
) {
console.error("Error: assignment changed");
throw newError("Your assignment has changed", "SENDERR_ASSIGNMENTCHANGED");
throw newError("Your assignment has changed", "SENDERR_ASSIGNMENTCHANGED", {
message,
campaignContactId,
user,
campaign
});
}
const organization = await loaders.organization.load(
campaign.organization_id
Expand All @@ -45,7 +90,13 @@ export const sendMessage = async (
if (optOut) {
throw newError(
"Skipped sending because this contact was already opted out",
"SENDERR_OPTEDOUT"
"SENDERR_OPTEDOUT",
{
message,
campaignContactId,
user,
campaign
}
);
}
// const zipData = await r.table('zip_code')
Expand All @@ -68,7 +119,12 @@ export const sendMessage = async (
const { text } = message;

if (text.length > (process.env.MAX_MESSAGE_LENGTH || 99999)) {
throw newError("Message was longer than the limit", "SENDERR_MAXLEN");
throw newError("Message was longer than the limit", "SENDERR_MAXLEN", {
message,
campaignContactId,
user,
campaign
});
}

const replaceCurlyApostrophes = rawText =>
Expand Down Expand Up @@ -102,7 +158,13 @@ export const sendMessage = async (
if (sendBeforeDate && sendBeforeDate <= Date.now()) {
throw newError(
"Outside permitted texting time for this recipient",
"SENDERR_OFFHOURS"
"SENDERR_OFFHOURS",
{
message,
campaignContactId,
user,
campaign
}
);
}
const serviceName =
Expand Down Expand Up @@ -139,7 +201,13 @@ export const sendMessage = async (
if (!saveResult.message) {
throw newError(
`Message send error ${saveResult.texterError || ""}`,
"SENDERR_SAVEFAIL"
"SENDERR_SAVEFAIL",
{
message,
campaignContactId,
user,
campaign
}
);
}
contact.message_status = saveResult.contactStatus;
Expand Down
26 changes: 16 additions & 10 deletions src/server/mail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,23 @@ const nodeMailerConfig = {
const sender =
getConfig("MAILGUN_API_KEY") && getConfig("MAILGUN_DOMAIN")
? {
sendMail: ({ from, to, subject, replyTo, text }) =>
mailgun.messages().send({
from,
"h:Reply-To": replyTo,
to,
subject,
text
})
sendMail: ({ from, to, subject, replyTo, text, html }) =>
mailgun.messages().send(
{
from,
"h:Reply-To": replyTo,
to,
subject,
...(html ? { html } : { text })
},
err => {
if (err) log.debug(err.message);
}
)
}
: nodemailer.createTransport(nodeMailerConfig);

export const sendEmail = async ({ to, subject, text, replyTo }) => {
export const sendEmail = async ({ to, subject, text, html, replyTo }) => {
log.info(`Sending e-mail to ${to} with subject ${subject}.`);

if (process.env.NODE_ENV === "development") {
Expand All @@ -50,7 +55,8 @@ export const sendEmail = async ({ to, subject, text, replyTo }) => {
from: getConfig("EMAIL_FROM"),
to,
subject,
text
text,
html
};

if (replyTo) {
Expand Down