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.

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

Merge staging into prod post-QA #20

Merged
merged 18 commits into from
Jun 6, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Add test for dynamicReassign method
sjwmoveon committed May 3, 2024
commit 4be13a6037abb6630fa435cdd423da79fe651677
102 changes: 102 additions & 0 deletions __test__/server/api/campaign/campaign.test.js
Original file line number Diff line number Diff line change
@@ -37,6 +37,7 @@ import {
sleep,
startCampaign
} from "../../../test_helpers";
import { dynamicReassignMutation } from "../../../../src/containers/AssignReplies";

let testAdminUser;
let testInvite;
@@ -828,6 +829,8 @@ describe("Reassignments", () => {
},
testTexterUser2
);
// TEXTER 1 (60 needsMessage, 2 needsResponse, 4 messaged)
// TEXTER 2 (25 needsMessage, 3 convo, 1 messaged)
expect(texterCampaignDataResults.data.assignment.contacts.length).toEqual(
2
);
@@ -840,6 +843,105 @@ describe("Reassignments", () => {
expect(texterCampaignDataResults2.data.assignment.allContactsCount).toEqual(
29
);
await runGql(
dynamicReassignMutation,
{
organizationUuid: testCampaign.joinToken,
campaignId: testCampaign.id,
},
testTexterUser2
);
// TEXTER 1 (60 needsMessage, 4 messaged)
// TEXTER 2 (25 needsMessage, 2 needsResponse, 3 convo, 1 messaged)
texterCampaignDataResults = await runGql(
TexterTodoQuery,
{
contactsFilter: {
messageStatus: "needsResponse",
isOptedOut: false,
validTimezone: true
},
assignmentId,
organizationId
},
testTexterUser
);

texterCampaignDataResults2 = await runGql(
TexterTodoQuery,
{
contactsFilter: {
messageStatus: "needsResponse",
isOptedOut: false,
validTimezone: true
},
assignmentId: assignmentId2,
organizationId
},
testTexterUser2
);
expect(texterCampaignDataResults.data.assignment.contacts.length).toEqual(
2
);
expect(texterCampaignDataResults.data.assignment.allContactsCount).toEqual(
66
);
expect(texterCampaignDataResults2.data.assignment.contacts.length).toEqual(
0
);
expect(texterCampaignDataResults2.data.assignment.allContactsCount).toEqual(
29
);
jest.useFakeTimers()
jest.advanceTimersByTime(4000000)
await runGql(
dynamicReassignMutation,
{
organizationUuid: testCampaign.joinToken,
campaignId: testCampaign.id,
},
testTexterUser2
);
jest.useRealTimers()
texterCampaignDataResults = await runGql(
TexterTodoQuery,
{
contactsFilter: {
messageStatus: "needsResponse",
isOptedOut: false,
validTimezone: true
},
assignmentId,
organizationId
},
testTexterUser
);

texterCampaignDataResults2 = await runGql(
TexterTodoQuery,
{
contactsFilter: {
messageStatus: "needsResponse",
isOptedOut: false,
validTimezone: true
},
assignmentId: assignmentId2,
organizationId
},
testTexterUser2
);
expect(texterCampaignDataResults.data.assignment.contacts.length).toEqual(
0
);
expect(texterCampaignDataResults.data.assignment.allContactsCount).toEqual(
64
);
expect(texterCampaignDataResults2.data.assignment.contacts.length).toEqual(
2
);
expect(texterCampaignDataResults2.data.assignment.allContactsCount).toEqual(
31
);
}, 10000); // long test can exceed default 5seconds
});

1 change: 1 addition & 0 deletions __test__/test_helpers.js
Original file line number Diff line number Diff line change
@@ -359,6 +359,7 @@ export async function createCampaign(
const campaignQuery = `mutation createCampaign($input: CampaignInput!) {
createCampaign(campaign: $input) {
id
joinToken
}
}`;
const variables = {
1 change: 1 addition & 0 deletions src/api/schema.js
Original file line number Diff line number Diff line change
@@ -101,6 +101,7 @@ const rootSchema = gql`
inventoryPhoneNumberCounts: [CampaignPhoneNumberInput!]
useDynamicReplies: Boolean
replyBatchSize: Int
joinToken: String
}

input OrganizationInput {
3 changes: 1 addition & 2 deletions src/server/api/schema.js
Original file line number Diff line number Diff line change
@@ -1468,8 +1468,7 @@ const rootMutations = {
if (!organization) {
throw INVALID_REASSIGN();
}

const maxContacts = getConfig("MAX_REPLIES_PER_TEXTER", organization);
const maxContacts = getConfig("MAX_REPLIES_PER_TEXTER", organization) ?? 200;
let d = new Date();
d.setHours(d.getHours() - 1);
const contactsFilter = { messageStatus: 'needsResponse', isOptedOut: false, listSize: maxContacts, orderByRaw: "updated_at DESC", updatedAtLt: d}