Skip to content

Commit 7708250

Browse files
committedFeb 20, 2020
fix: current assignment targets returning multiple pairings per team
1 parent 73d2279 commit 7708250

File tree

1 file changed

+30
-13
lines changed

1 file changed

+30
-13
lines changed
 

‎src/server/api/assignment.js

+30-13
Original file line numberDiff line numberDiff line change
@@ -225,11 +225,14 @@ export async function allCurrentAssignmentTargets(organizationId) {
225225
teams.assignment_type,
226226
campaign.id as id, campaign.title
227227
from needs_message_teams as teams
228-
join campaign_team on campaign_team.team_id = teams.id
229228
join campaign on campaign.id = (
230229
select id
231230
from assignable_campaigns_with_needs_message as campaigns
232-
where campaigns.id = campaign_team.campaign_id
231+
where campaigns.id in (
232+
select campaign_id
233+
from campaign_team
234+
where team_id = teams.id
235+
)
233236
order by id asc
234237
limit 1
235238
)
@@ -243,11 +246,14 @@ export async function allCurrentAssignmentTargets(organizationId) {
243246
teams.assignment_type,
244247
campaign.id as id, campaign.title
245248
from needs_reply_teams as teams
246-
join campaign_team on campaign_team.team_id = teams.id
247249
join campaign on campaign.id = (
248250
select id
249251
from assignable_campaigns_with_needs_reply as campaigns
250-
where campaigns.id = campaign_team.campaign_id
252+
where campaigns.id in (
253+
select campaign_id
254+
from campaign_team
255+
where team_id = teams.id
256+
)
251257
order by id asc
252258
limit 1
253259
)
@@ -447,11 +453,14 @@ const memoizedMyCurrentAssignmentTargets = memoizer.memoize(
447453
teams.max_request_count,
448454
campaign.id as id, campaign.title
449455
from needs_message_teams as teams
450-
join campaign_team on campaign_team.team_id = teams.id
451456
join campaign on campaign.id = (
452457
select id
453458
from assignable_campaigns_with_needs_message as campaigns
454-
where campaigns.id = campaign_team.campaign_id
459+
where campaigns.id in (
460+
select campaign_id
461+
from campaign_team
462+
where team_id = teams.id
463+
)
455464
order by id asc
456465
limit 1
457466
)
@@ -466,11 +475,14 @@ const memoizedMyCurrentAssignmentTargets = memoizer.memoize(
466475
teams.max_request_count,
467476
campaign.id as id, campaign.title
468477
from needs_reply_teams as teams
469-
join campaign_team on campaign_team.team_id = teams.id
470478
join campaign on campaign.id = (
471479
select id
472480
from assignable_campaigns_with_needs_reply as campaigns
473-
where campaigns.id = campaign_team.campaign_id
481+
where campaigns.id in (
482+
select campaign_id
483+
from campaign_team
484+
where team_id = teams.id
485+
)
474486
order by id asc
475487
limit 1
476488
)
@@ -627,11 +639,14 @@ export async function myCurrentAssignmentTargets(
627639
teams.max_request_count,
628640
campaign.id as id, campaign.title
629641
from needs_message_teams as teams
630-
join campaign_team on campaign_team.team_id = teams.id
631642
join campaign on campaign.id = (
632643
select id
633644
from assignable_campaigns_with_needs_message as campaigns
634-
where campaigns.id = campaign_team.campaign_id
645+
where campaigns.id in (
646+
select campaign_id
647+
from campaign_team
648+
where team_id = teams.id
649+
)
635650
order by id asc
636651
limit 1
637652
)
@@ -646,11 +661,14 @@ export async function myCurrentAssignmentTargets(
646661
teams.max_request_count,
647662
campaign.id as id, campaign.title
648663
from needs_reply_teams as teams
649-
join campaign_team on campaign_team.team_id = teams.id
650664
join campaign on campaign.id = (
651665
select id
652666
from assignable_campaigns_with_needs_reply as campaigns
653-
where campaigns.id = campaign_team.campaign_id
667+
where campaigns.id in (
668+
select campaign_id
669+
from campaign_team
670+
where team_id = teams.id
671+
)
654672
order by id asc
655673
limit 1
656674
)
@@ -944,7 +962,6 @@ export async function giveUserMoreTexts(
944962
: countLeftToUpdate - countUpdatedInLoop;
945963

946964
countUpdated = countUpdated + countUpdatedInLoop;
947-
948965
if (countUpdatedInLoop === 0) {
949966
if (countUpdated === 0) {
950967
throw new AutoassignError(

0 commit comments

Comments
 (0)
Please sign in to comment.