Skip to content
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: 0 additions & 2 deletions src/server/api/lib/send-message.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ export const sendMessage = async (
.join("campaign", "campaign_contact.campaign_id", "campaign.id")
.where({ "campaign_contact.id": parseInt(campaignContactId, 10) })
.whereRaw("campaign_contact.archived = false")
.where({ "campaign.is_archived": false })
.leftJoin("assignment", "campaign_contact.assignment_id", "assignment.id");

if (config.ENABLE_MONTHLY_ORG_MESSAGE_LIMITS) {
Expand All @@ -133,7 +132,6 @@ export const sendMessage = async (
"campaign_contact.assignment_id as assignment_id",
"campaign_contact.message_status as cc_message_status",
"campaign.id as campaign_id",
"campaign.is_archived as is_archived",
"campaign.organization_id as organization_id",
"campaign.timezone as c_timezone",
"campaign.texting_hours_start as c_texting_hours_start",
Expand Down
6 changes: 2 additions & 4 deletions src/server/api/root-mutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1559,10 +1559,9 @@ const rootMutations = {
const contactUpdates = r
.knex("campaign_contact")
.transacting(trx)
.leftJoin("campaign", "campaign_contact.campaign_id", "campaign.id")
.where({
"campaign_contact.cell": cell,
"campaign.is_archived": false
"campaign_contact.archived": false
})
.pluck("campaign_contact.id")
.then((contactIdsRes) => {
Expand Down Expand Up @@ -2243,10 +2242,9 @@ const rootMutations = {
set
assignment_id = null
from
assignment, campaign
assignment
where
campaign_contact.campaign_id = ?
and campaign.id = campaign_contact.campaign_id
and assignment.id = campaign_contact.assignment_id
and is_opted_out = false
and message_status = ?
Expand Down
Loading