Additional tweaks for payment report

Author: jmgasper

sql/reports/sfdc/payments.sql

@@ -20,6 +20,10 @@ WITH resolved_payment_references AS (
             ELSE c.name
         END AS challenge_name,
         c.status AS challenge_status,
+        CASE
+            WHEN w.category = 'ENGAGEMENT_PAYMENT' THEN 'COMPLETED'
+            ELSE c.status
+        END AS reported_challenge_status,
         m.handle,
         m."userId",
         m."firstName",
@@ -49,7 +53,7 @@ SELECT
     category,
     (category = 'TASK_PAYMENT') AS "isTask",
     challenge_name AS "challengeName",
-    challenge_status AS "challengeStatus",
+    reported_challenge_status AS "challengeStatus",
     handle AS "winnerHandle",
     "userId" as "winnerId",
     "firstName" as "winnerFirstName",
@@ -73,6 +77,6 @@ WHERE
     AND ($8::timestamptz IS NULL OR created_at <= $8::timestamptz)
     AND ($9::numeric IS NULL OR total_amount >= $9::numeric)
     AND ($10::numeric IS NULL OR total_amount <= $10::numeric)
-    AND ($11::text[] IS NULL OR challenge_status::text = ANY($11::text[]))
+    AND ($11::text[] IS NULL OR reported_challenge_status::text = ANY($11::text[]))
     AND ($12::text[] IS NULL OR payment_status::text = ANY($12::text[]))
 ORDER BY created_at DESC

src/reports/member/member-search.service.spec.ts

@@ -106,9 +106,7 @@ describe("MemberSearchService", () => {
     expect(dataSql).toContain(
       'ORDER BY m.handle ASC, "matchIndex" DESC NULLS LAST',
     );
-    expect(dataSql).toContain(
-      'LOWER(m."homeCountryCode") = ANY($1::text[])',
-    );
+    expect(dataSql).toContain('LOWER(m."homeCountryCode") = ANY($1::text[])');
     expect(dataParams).toEqual([["us"], 5, 5]);
     expect(countParams).toEqual([["us"]]);
   });

src/reports/sfdc/sfdc-reports.dto.ts

@@ -343,7 +343,7 @@ export class PaymentsReportResponse {
   paymentAmount: number;
   @ApiProperty({
     description:
-      'Challenge status from challenges."Challenge".status. Null for ENGAGEMENT_PAYMENT rows and challenge-backed rows whose external reference cannot be resolved.',
+      "Normalized challenge status label for challenge-backed payments. ENGAGEMENT_PAYMENT rows are always reported as Completed; challenge-backed rows whose external reference cannot be resolved remain null.",
     nullable: true,
     type: String,
   })

src/reports/sfdc/sfdc-reports.service.spec.ts

@@ -314,6 +314,12 @@ describe("SfdcReportsService - getPaymentsReport", () => {
     expect(paymentsSql).toContain(
       "WHEN w.category = 'ENGAGEMENT_PAYMENT' THEN ea.\"engagementId\"",
     );
+    expect(paymentsSql).toContain(
+      "WHEN w.category = 'ENGAGEMENT_PAYMENT' THEN 'COMPLETED'",
+    );
+    expect(paymentsSql).toContain(
+      "reported_challenge_status::text = ANY($11::text[])",
+    );
     expect(paymentsSql).toContain(
       "($3::text[] IS NULL AND $4::text[] IS NULL)",
     );
@@ -354,7 +360,7 @@ describe("SfdcReportsService - getPaymentsReport", () => {
       expect.objectContaining({
         category: "ENGAGEMENT_PAYMENT",
         challengeName: "Customer Support Engagement",
-        challengeStatus: null,
+        challengeStatus: "Completed",
       }),
       expect.objectContaining({
         category: "CHALLENGE_PAYMENT",

src/reports/sfdc/sfdc-reports.service.ts

@@ -130,7 +130,10 @@ export class SfdcReportsService {
 
     return payments.map((payment) => ({
       ...payment,
-      challengeStatus: normalizeChallengeStatus(payment.challengeStatus),
+      challengeStatus:
+        payment.category === "ENGAGEMENT_PAYMENT"
+          ? "Completed"
+          : normalizeChallengeStatus(payment.challengeStatus),
     }));
   }
 

src/reports/sfdc/test-helpers/mock-data.ts

@@ -172,7 +172,10 @@ export const normalizedChallengeData = mockChallengeData.map((challenge) => ({
 
 export const normalizedPaymentData = mockPaymentData.map((payment) => ({
   ...payment,
-  challengeStatus: normalizeChallengeStatus(payment.challengeStatus),
+  challengeStatus:
+    payment.category === "ENGAGEMENT_PAYMENT"
+      ? "Completed"
+      : normalizeChallengeStatus(payment.challengeStatus),
 }));
 
 export const mockBaFeesData: BaFeesReportResponse[] = [