Skip to content

send SMS via notify-gateway #361

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

Draft
L-Storm wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

send SMS via notify-gateway #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions questionnaire/questionnaire-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ const uuidv4 = require('uuid/v4');
const ajvFormatsMobileUk = require('ajv-formats-mobile-uk');
const templates = require('./templates');
const createSqsService = require('../services/sqs');
const createLegacyNotifyService = require('../services/sqs/legacy-sms-message-bus');
const createSlackService = require('../services/slack');
const questionnaireResource = require('./resources/questionnaire-resource');
const createQuestionnaireHelper = require('./questionnaire/questionnaire');
Expand Down Expand Up @@ -572,9 +571,8 @@ function createQuestionnaireService({
});
const permittedActions = questionnaire.getPermittedActions();
const actionResults = permittedActions.map(action => {
const sqsService = createSqsService({logger});
if (action.type === 'sendEmail') {
const sqsService = createSqsService({logger});

const payload = {
templateId: action.data.templateId,
emailAddress: action.data.emailAddress,
Expand All @@ -587,8 +585,6 @@ function createQuestionnaireService({
}

if (action.type === 'sendSms') {
const legacyNotifyService = createLegacyNotifyService({logger});

const payload = {
templateId: action.data.templateId,
phoneNumber: action.data.phoneNumber,
Expand All @@ -597,9 +593,8 @@ function createQuestionnaireService({
},
reference: null
};
return legacyNotifyService.sendSms(payload);
return sqsService.send(payload, process.env.NOTIFY_AWS_SQS_ID);
}

return Promise.reject(Error(`Action type "${action.type}" is not supported`));
});

Expand Down
61 changes: 26 additions & 35 deletions questionnaire/runOnCompleteActions.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,7 @@ jest.doMock('../services/sqs', () => {
return () => notifyServiceMock;
});

jest.doMock('../services/sqs/legacy-sms-message-bus', () => {
const notifyServiceMock = {
sendSms: jest.fn().mockResolvedValue({
some: 'response'
})
};

return () => notifyServiceMock;
});

const mockedSqsService = require('../services/sqs')();
const mockedLegacyMessageBusService = require('../services/sqs/legacy-sms-message-bus')();
const createQuestionnaireService = require('./questionnaire-service');

describe('runOnCompleteActions', () => {
Expand Down Expand Up @@ -92,8 +81,8 @@ describe('runOnCompleteActions', () => {
);

expect(actionResults).toEqual([{status: 'fulfilled', value: {some: 'response'}}]);
expect(mockedLegacyMessageBusService.sendSms).toHaveBeenCalledTimes(1);
expect(mockedLegacyMessageBusService.sendSms).toHaveBeenCalledWith(actionData);
expect(mockedSqsService.send).toHaveBeenCalledTimes(1);
expect(mockedSqsService.send).toHaveBeenCalledWith(actionData, notifySQS);
});
});

Expand Down Expand Up @@ -152,11 +141,11 @@ describe('runOnCompleteActions', () => {
{status: 'fulfilled', value: {some: 'response'}},
{status: 'fulfilled', value: {some: 'response'}}
]);
expect(mockedSqsService.send).toHaveBeenCalledTimes(2);
expect(mockedLegacyMessageBusService.sendSms).toHaveBeenCalledTimes(1);
expect(mockedSqsService.send).toHaveBeenNthCalledWith(1, emailActionData1, notifySQS);
expect(mockedSqsService.send).toHaveBeenNthCalledWith(2, emailActionData2, notifySQS);
expect(mockedLegacyMessageBusService.sendSms).toHaveBeenCalledWith(smsActionData);
expect(mockedSqsService.send).toHaveBeenCalledTimes(3);

expect(mockedSqsService.send).toHaveBeenNthCalledWith(1, smsActionData, notifySQS);
expect(mockedSqsService.send).toHaveBeenNthCalledWith(2, emailActionData1, notifySQS);
expect(mockedSqsService.send).toHaveBeenNthCalledWith(3, emailActionData2, notifySQS);
});
});

Expand Down Expand Up @@ -216,15 +205,16 @@ describe('runOnCompleteActions', () => {
);

expect(actionResults).toEqual([
{status: 'fulfilled', value: {some: 'response'}},
{status: 'rejected', reason: {some: 'error'}},
{status: 'fulfilled', value: {some: 'response'}},
{status: 'fulfilled', value: {some: 'response'}}
]);
expect(mockedLegacyMessageBusService.sendSms).toHaveBeenCalledTimes(1);
expect(mockedSqsService.send).toHaveBeenCalledTimes(2);
expect(mockedLegacyMessageBusService.sendSms).toHaveBeenCalledWith(smsActionData);
expect(mockedSqsService.send).toHaveBeenNthCalledWith(1, emailActionData1, notifySQS);
expect(mockedSqsService.send).toHaveBeenNthCalledWith(2, emailActionData2, notifySQS);

expect(mockedSqsService.send).toHaveBeenCalledTimes(3);

expect(mockedSqsService.send).toHaveBeenNthCalledWith(1, smsActionData, notifySQS);
expect(mockedSqsService.send).toHaveBeenNthCalledWith(2, emailActionData1, notifySQS);
expect(mockedSqsService.send).toHaveBeenNthCalledWith(3, emailActionData2, notifySQS);
});
});
});
Expand Down Expand Up @@ -540,9 +530,10 @@ describe('template', () => {
expect(actionResults).toEqual([
{status: 'fulfilled', value: {some: 'response'}}
]);
expect(mockedLegacyMessageBusService.sendSms).toHaveBeenCalledTimes(1);
expect(mockedLegacyMessageBusService.sendSms).toHaveBeenCalledWith(
expectedActionData
expect(mockedSqsService.send).toHaveBeenCalledTimes(1);
expect(mockedSqsService.send).toHaveBeenCalledWith(
expectedActionData,
notifySQS
);
});
});
Expand Down Expand Up @@ -586,11 +577,11 @@ describe('template', () => {
reference: null
};

expect(mockedLegacyMessageBusService.sendSms).toHaveBeenNthCalledWith(
1,
expectedActionData
expect(mockedSqsService.send).toHaveBeenCalledTimes(1);
expect(mockedSqsService.send).toHaveBeenCalledWith(
expectedActionData,
notifySQS
);
expect(mockedLegacyMessageBusService.sendSms).toHaveBeenCalledTimes(1);
expect(actionResults).toEqual([
{status: 'fulfilled', value: {some: 'response'}}
]);
Expand Down Expand Up @@ -644,11 +635,11 @@ describe('template', () => {
reference: null
};

expect(mockedLegacyMessageBusService.sendSms).toHaveBeenNthCalledWith(
1,
expectedActionData
expect(mockedSqsService.send).toHaveBeenCalledTimes(1);
expect(mockedSqsService.send).toHaveBeenCalledWith(
expectedActionData,
notifySQS
);
expect(mockedLegacyMessageBusService.sendSms).toHaveBeenCalledTimes(1);
expect(actionResults).toEqual([
{status: 'fulfilled', value: {some: 'response'}}
]);
Expand Down
6 changes: 3 additions & 3 deletions services/sqs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ const VError = require('verror');

AWS.config = new AWS.Config();
AWS.config.update({
region: 'eu-west-2',
accessKeyId: process.env.DCS_SQS_ACCESS_KEY_ID,
secretAccessKey: process.env.DCS_SQS_SECRET_ACCESS_KEY
region: process.env.AWS_DEFAULT_REGION,
accessKeyId: process.env.AWS_ACCESS_KEY_ID,
secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY
});

function createSqsService(opts) {
Expand Down
63 changes: 0 additions & 63 deletions services/sqs/legacy-sms-message-bus/index.js
View file
Open in desktop

This file was deleted.

145 changes: 0 additions & 145 deletions services/sqs/legacy-sms-message-bus/index.test.js
View file
Open in desktop

This file was deleted.