Skip to content
This repository was archived by the owner on Nov 21, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/__tests__/activityLogQueries.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ describe('activityLogQueries', () => {
await conversationFactory({ customerId: customer._id });
await internalNoteFactory({ contentTypeId: customer._id });
await engageMessageFactory({ customerIds: [customer._id], method: 'email' });
await engageMessageFactory({ customerIds: [customer._id], method: 'sms' });

const dataSources = { IntegrationsAPI: new IntegrationsAPI() };
const spy = jest.spyOn(dataSources.IntegrationsAPI, 'fetchApi');
Expand All @@ -150,6 +151,7 @@ describe('activityLogQueries', () => {
{ type: 'email', content: 'email' },
{ type: 'internal_note', content: 'internal_note' },
{ type: 'task', content: 'task' },
{ type: 'sms', content: 'sms' },
];

for (const activityType of activityTypes) {
Expand Down
4 changes: 4 additions & 0 deletions src/data/resolvers/mutations/engageUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ const sendEmailOrSms = async (
shortMessage: engageMessage.shortMessage || {},
};

const customerIds = customerInfos.map(c => c._id);

await EngageMessages.setCustomerIds(engageMessage._id, customerIds);

const chunks = chunkArray(customerInfos, 3000);

for (const chunk of chunks) {
Expand Down
10 changes: 10 additions & 0 deletions src/data/resolvers/queries/activityLogs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@ const activityLogQueries = {
collectItems(await EmailDeliveries.find({ customerId: contentId }), 'email');
};

const collectEngageSms = async () => {
collectItems(await EngageMessages.find({ customerIds: contentId, method: 'sms' }), 'engage-sms');
collectItems(await EmailDeliveries.find({ customerId: contentId }), 'sms');
};

const collectTasks = async () => {
if (contentType !== 'task') {
collectItems(
Expand Down Expand Up @@ -127,12 +132,17 @@ const activityLogQueries = {
await collectEngageMessages();
break;

case 'sms':
await collectEngageSms();
break;

default:
await collectConversations();
await collectActivityLogs();
await collectInternalNotes();
await collectEngageMessages();
await collectTasks();
await collectEngageSms();

break;
}
Expand Down
11 changes: 11 additions & 0 deletions src/db/models/Engages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export interface IEngageMessageModel extends Model<IEngageMessageDocument> {
createEngageMessage(doc: IEngageMessage): Promise<IEngageMessageDocument>;

updateEngageMessage(_id: string, doc: IEngageMessage): Promise<IEngageMessageDocument>;
setCustomerIds(_id: string, customerIds: string[]): Promise<IEngageMessageDocument>;

engageMessageSetLive(_id: string): Promise<IEngageMessageDocument>;
engageMessageSetPause(_id: string): Promise<IEngageMessageDocument>;
Expand Down Expand Up @@ -100,6 +101,16 @@ export const loadClass = () => {
return EngageMessages.findOne({ _id });
}

/**
* set engage message customerIds
*/

public static async setCustomerIds(_id: string, customerIds: string[]) {
await EngageMessages.updateOne({ _id }, { $set: { customerIds } });

return EngageMessages.findOne({ _id });
}

/**
* Engage message set live
*/
Expand Down