From afcef0c521567401aecf2464bc70a2929b800fd0 Mon Sep 17 00:00:00 2001 From: Thomas Cottee Meldrum Date: Tue, 10 Feb 2026 11:41:37 +0000 Subject: [PATCH 1/2] fix: fap reviewer filter --- apps/backend/src/datasources/postgres/ReviewDataSource.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/apps/backend/src/datasources/postgres/ReviewDataSource.ts b/apps/backend/src/datasources/postgres/ReviewDataSource.ts index 2b728aac7a..3a23b1e19a 100644 --- a/apps/backend/src/datasources/postgres/ReviewDataSource.ts +++ b/apps/backend/src/datasources/postgres/ReviewDataSource.ts @@ -381,9 +381,6 @@ export default class PostgresReviewDataSource implements ReviewDataSource { } if (active) { - qb.join('proposals', { - 'proposals.proposal_pk': 'fap_reviews.proposal_pk', - }); qb.join('call', { 'call.call_id': 'proposals.call_id', }); From 6b6c3cd694b8d05f81aed775a0fc80fbb65ef6fb Mon Sep 17 00:00:00 2001 From: Thomas Cottee Meldrum Date: Tue, 10 Feb 2026 12:13:43 +0000 Subject: [PATCH 2/2] fix: fap reviewers sql for conditional missing proposals join --- .../src/datasources/postgres/ReviewDataSource.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/apps/backend/src/datasources/postgres/ReviewDataSource.ts b/apps/backend/src/datasources/postgres/ReviewDataSource.ts index 3a23b1e19a..2adee69cae 100644 --- a/apps/backend/src/datasources/postgres/ReviewDataSource.ts +++ b/apps/backend/src/datasources/postgres/ReviewDataSource.ts @@ -360,11 +360,12 @@ export default class PostgresReviewDataSource implements ReviewDataSource { qb.where('user_id', userId); } + qb.join('proposals', { + 'proposals.proposal_pk': 'fap_reviews.proposal_pk', + }); + // sometimes the ID 0 is sent as a equivalent of all if (callId) { - qb.join('proposals', { - 'proposals.proposal_pk': 'fap_reviews.proposal_pk', - }); qb.where('proposals.call_id', callId); } @@ -432,10 +433,10 @@ export default class PostgresReviewDataSource implements ReviewDataSource { .select('fap_reviews.*') .from('fap_reviews') .modify((qb) => { + qb.join('proposals', { + 'proposals.proposal_pk': 'fap_reviews.proposal_pk', + }); if (callId) { - qb.join('proposals', { - 'proposals.proposal_pk': 'fap_reviews.proposal_pk', - }); qb.where('proposals.call_id', callId); } if (instrumentId) { @@ -451,9 +452,6 @@ export default class PostgresReviewDataSource implements ReviewDataSource { } if (active) { - qb.join('proposals', { - 'proposals.proposal_pk': 'fap_reviews.proposal_pk', - }); qb.join('call', { 'call.call_id': 'proposals.call_id', });