PM-5839: Correct payment report calendar dates

sql/reports/payment/member-payment-accrual.sql

@@ -1,7 +1,7 @@
 WITH provided_dates AS (
   SELECT
-    NULLIF($1, '')::timestamptz AS start_date,
-    NULLIF($2, '')::timestamptz AS end_date
+    NULLIF($1, '')::date AS start_date,
+    NULLIF($2, '')::date AS end_date
 ),
 params AS (
   SELECT
@@ -50,9 +50,7 @@ recent_payments AS (
   JOIN params pr ON TRUE
   WHERE w.type = 'PAYMENT'
     AND p.created_at >= pr.start_date
-    AND p.created_at < (
-      DATE_TRUNC('day', pr.end_date) + INTERVAL '1 day'
-    )
+    AND p.created_at < (pr.end_date + INTERVAL '1 day')
 ),
 categorized_payments AS (
   SELECT

sql/reports/sfdc/ba-fees-monthly.sql

@@ -20,8 +20,18 @@ WITH filtered_payments AS (
   LEFT JOIN finance.winnings w
     ON w.winning_id = p.winnings_id
   WHERE
-    ($1::timestamptz IS NULL OR p.created_at >= $1::timestamptz)
-    AND ($2::timestamptz IS NULL OR p.created_at < (DATE_TRUNC('day', $2::timestamptz) + INTERVAL '1 day'))
+    (
+      $1::date IS NULL
+      OR p.created_at >= (
+        ($1::date::timestamp AT TIME ZONE 'America/New_York') AT TIME ZONE 'UTC'
+      )
+    )
+    AND (
+      $2::date IS NULL
+      OR p.created_at < (
+        (($2::date + 1)::timestamp AT TIME ZONE 'America/New_York') AT TIME ZONE 'UTC'
+      )
+    )
     AND ($3::text[] IS NULL OR p.billing_account = ANY($3::text[]))
     AND ($4::text[] IS NULL OR p.billing_account != ALL($4::text[]))
 ),
@@ -34,17 +44,17 @@ latest_status AS (
 )
 SELECT
   fp.billing_account AS "billingAccountId",
-  TO_CHAR(DATE_TRUNC('month', fp.created_at AT TIME ZONE 'America/New_York'), 'YYYY-MM') AS "month",
+  TO_CHAR(DATE_TRUNC('month', fp.created_at AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York'), 'YYYY-MM') AS "month",
   COALESCE(SUM(fp.challenge_fee), 0) AS "totalFees",
   COALESCE(SUM(fp.total_amount), 0) AS "totalMemberPayments",
   COUNT(fp.payment_id) AS "paymentCount",
-  MIN(fp.created_at AT TIME ZONE 'America/New_York')::date AS "earliestPaymentDate",
-  MAX(fp.created_at AT TIME ZONE 'America/New_York')::date AS "latestPaymentDate",
+  MIN(fp.created_at AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York')::date AS "earliestPaymentDate",
+  MAX(fp.created_at AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York')::date AS "latestPaymentDate",
   ls.payment_status_desc AS "currentPaymentStatus"
 FROM filtered_payments fp
 LEFT JOIN latest_status ls ON ls.billing_account = fp.billing_account
 GROUP BY
   fp.billing_account,
-  DATE_TRUNC('month', fp.created_at AT TIME ZONE 'America/New_York'),
+  DATE_TRUNC('month', fp.created_at AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York'),
   ls.payment_status_desc
 ORDER BY fp.billing_account, "month" DESC;

sql/reports/sfdc/ba-fees.sql

@@ -19,8 +19,18 @@ WITH filtered_payments AS (
   LEFT JOIN finance.winnings w
     ON w.winning_id = p.winnings_id
   WHERE
-    ($1::timestamptz IS NULL OR p.created_at >= $1::timestamptz)
-    AND ($2::timestamptz IS NULL OR p.created_at < (DATE_TRUNC('day', $2::timestamptz) + INTERVAL '1 day'))
+    (
+      $1::date IS NULL
+      OR p.created_at >= (
+        ($1::date::timestamp AT TIME ZONE 'America/New_York') AT TIME ZONE 'UTC'
+      )
+    )
+    AND (
+      $2::date IS NULL
+      OR p.created_at < (
+        (($2::date + 1)::timestamp AT TIME ZONE 'America/New_York') AT TIME ZONE 'UTC'
+      )
+    )
     AND ($3::text[] IS NULL OR p.billing_account = ANY($3::text[]))
     AND ($4::text[] IS NULL OR p.billing_account != ALL($4::text[]))
 ),

sql/reports/sfdc/payments.sql

@@ -44,7 +44,13 @@ WITH resolved_payment_references AS (
 )
 SELECT 
     payment_id as "paymentId",
-    created_at AT TIME ZONE 'America/New_York' as "paymentDate",
+    TO_CHAR(
+        created_at AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York',
+        'YYYY-MM-DD"T"HH24:MI:SS.MS'
+    ) || TO_CHAR(
+        (created_at AT TIME ZONE 'UTC' AT TIME ZONE 'America/New_York') - created_at,
+        'HH24:MI'
+    ) as "paymentDate",
     billing_account as "billingAccountId",
     payment_status as "paymentStatus",
     challenge_fee as "challengeFee",
@@ -73,8 +79,16 @@ WHERE
         WHERE m2.handle = ANY($5::text[])
     ))
     AND ($6::text IS NULL OR challenge_name ILIKE '%' || $6 || '%')
-    AND created_at >= COALESCE($7::timestamptz, (NOW() AT TIME ZONE 'UTC') - INTERVAL '45 days')
-    AND ($8::timestamptz IS NULL OR created_at < (DATE_TRUNC('day', $8::timestamptz) + INTERVAL '1 day'))
+    AND created_at >= COALESCE(
+        ($7::date::timestamp AT TIME ZONE 'America/New_York') AT TIME ZONE 'UTC',
+        (NOW() AT TIME ZONE 'UTC') - INTERVAL '45 days'
+    )
+    AND (
+        $8::date IS NULL
+        OR created_at < (
+            (($8::date + 1)::timestamp AT TIME ZONE 'America/New_York') AT TIME ZONE 'UTC'
+        )
+    )
     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 reported_challenge_status::text = ANY($11::text[]))

src/reports/payment/dto/member-payment-accrual.dto.ts

@@ -4,16 +4,16 @@ import { IsDateString, IsOptional } from "class-validator";
 export class MemberPaymentAccrualQueryDto {
   @ApiPropertyOptional({
     description:
-      "Start date (inclusive) for filtering payment creation date in ISO 8601 format",
-    example: "2024-01-01T00:00:00.000Z",
+      "Start date (inclusive) for filtering payment creation date in YYYY-MM-DD format. For accepted ISO timestamps, only the written calendar-date portion is used",
+    example: "2024-01-01",
   })
   @IsOptional()
   @IsDateString()
   startDate?: string;
 
   @ApiPropertyOptional({
     description:
-      "End date (inclusive through the full calendar day) for filtering payment creation date in ISO 8601 format",
+      "End date (inclusive through the full calendar day) for filtering payment creation date in YYYY-MM-DD format. For accepted ISO timestamps, only the written calendar-date portion is used",
     example: "2024-01-31",
   })
   @IsOptional()

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

@@ -78,10 +78,11 @@ describe("PaymentReportsService", () => {
       "reports/payment/member-payment-accrual.sql",
     );
 
+    expect(paymentSql).toContain("NULLIF($1, '')::date AS start_date");
+    expect(paymentSql).toContain("NULLIF($2, '')::date AS end_date");
     expect(paymentSql).toContain("p.created_at >= pr.start_date");
-    expect(paymentSql).toContain(
-      "DATE_TRUNC('day', pr.end_date) + INTERVAL '1 day'",
-    );
+    expect(paymentSql).toContain("pr.end_date + INTERVAL '1 day'");
     expect(paymentSql).not.toContain("p.created_at <= pr.end_date");
+    expect(paymentSql).not.toContain("DATE_TRUNC('day', pr.end_date)");
   });
 });

src/reports/report-directory.data.spec.ts

@@ -19,6 +19,17 @@ describe("getAccessibleReportsDirectory", () => {
       "/payment/member-payment-accrual-task",
       "/payment/member-payment-accrual-challenge",
     ]);
+    expect(
+      directory.sfdc?.reports
+        .find((report) => report.path === "/sfdc/payments")
+        ?.parameters?.find((parameter) => parameter.name === "endDate")
+        ?.description,
+    ).toContain("America/New_York");
+    expect(
+      directory.payment?.reports[0].parameters?.find(
+        (parameter) => parameter.name === "endDate",
+      )?.description,
+    ).toContain("Inclusive full calendar end date");
     expect(directory.statistics?.reports.map((report) => report.path)).toEqual(
       expect.arrayContaining([
         "/statistics/general/country-member-details",

src/reports/report-directory.data.ts

@@ -231,6 +231,28 @@ const paymentsEndDateParam: ReportParameter = {
   location: "query",
 };
 
+const paymentAccrualStartDateParam: ReportParameter = {
+  ...paymentsStartDateParam,
+  description: "Inclusive calendar start date in YYYY-MM-DD format",
+};
+
+const paymentAccrualEndDateParam: ReportParameter = {
+  ...paymentsEndDateParam,
+  description: "Inclusive full calendar end date in YYYY-MM-DD format",
+};
+
+const sfdcPaymentsStartDateParam: ReportParameter = {
+  ...paymentsStartDateParam,
+  description:
+    "Inclusive America/New_York calendar start date in YYYY-MM-DD format",
+};
+
+const sfdcPaymentsEndDateParam: ReportParameter = {
+  ...paymentsEndDateParam,
+  description:
+    "Inclusive full America/New_York calendar end date in YYYY-MM-DD format",
+};
+
 const challengeNameParam: ReportParameter = {
   name: "challengeName",
   type: "string",
@@ -294,8 +316,8 @@ const paymentsFilters = [
   challengeNameParam,
   challengeIdsParam,
   engagementIdsParam,
-  paymentsStartDateParam,
-  paymentsEndDateParam,
+  sfdcPaymentsStartDateParam,
+  sfdcPaymentsEndDateParam,
   handlesParam,
   minPaymentParam,
   maxPaymentParam,
@@ -306,14 +328,16 @@ const baFeesDateParams: ReportParameter[] = [
   {
     name: "startDate",
     type: "date",
-    description: "Start date for the report query in ISO format",
+    description:
+      "Inclusive America/New_York calendar start date in YYYY-MM-DD format",
     location: "query",
     required: true,
   },
   {
     name: "endDate",
     type: "date",
-    description: "End date for the report query in ISO format",
+    description:
+      "Inclusive full America/New_York calendar end date in YYYY-MM-DD format",
     location: "query",
   },
 ];
@@ -837,37 +861,37 @@ const REGISTERED_REPORTS_DIRECTORY: RegisteredReportsDirectory = {
         "Member Payment Accrual",
         "/payment/member-payment-accrual",
         "Member payment accruals for the provided date range (defaults to last 3 months)",
-        [paymentsStartDateParam, paymentsEndDateParam],
+        [paymentAccrualStartDateParam, paymentAccrualEndDateParam],
       ),
       adminOnlyTopcoderReport(
         "Member Payment Accrual-TaaS",
         "/payment/member-payment-accrual-taas",
         "Member payment accruals for TaaS payments for the provided date range (defaults to last 3 months)",
-        [paymentsStartDateParam, paymentsEndDateParam],
+        [paymentAccrualStartDateParam, paymentAccrualEndDateParam],
       ),
       adminOnlyTopcoderReport(
         "Member Payment Accrual-Topgear",
         "/payment/member-payment-accrual-topgear",
         "Member payment accruals for Topgear payments for the provided date range (defaults to last 3 months)",
-        [paymentsStartDateParam, paymentsEndDateParam],
+        [paymentAccrualStartDateParam, paymentAccrualEndDateParam],
       ),
       adminOnlyTopcoderReport(
         "Member Payment Accrual-Engagement",
         "/payment/member-payment-accrual-engagement",
         "Member payment accruals for engagement payments for the provided date range (defaults to last 3 months)",
-        [paymentsStartDateParam, paymentsEndDateParam],
+        [paymentAccrualStartDateParam, paymentAccrualEndDateParam],
       ),
       adminOnlyTopcoderReport(
         "Member Payment Accrual-Task",
         "/payment/member-payment-accrual-task",
         "Member payment accruals for task payments for the provided date range (defaults to last 3 months)",
-        [paymentsStartDateParam, paymentsEndDateParam],
+        [paymentAccrualStartDateParam, paymentAccrualEndDateParam],
       ),
       adminOnlyTopcoderReport(
         "Member Payment Accrual-Challenge",
         "/payment/member-payment-accrual-challenge",
         "Member payment accruals for challenge payments (contest, review board, copilot, checkpoint, and related challenge payouts) for the provided date range (defaults to last 3 months)",
-        [paymentsStartDateParam, paymentsEndDateParam],
+        [paymentAccrualStartDateParam, paymentAccrualEndDateParam],
       ),
     ],
   },

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

@@ -241,8 +241,9 @@ export class PaymentsReportQueryDto {
 
   @ApiProperty({
     required: false,
-    description: "Start date for the report query in ISO 8601 format",
-    example: "2023-01-01T00:00:00.000Z",
+    description:
+      "Start date (inclusive from the start of the America/New_York calendar day) for the report query in YYYY-MM-DD format. For accepted ISO timestamps, only the written calendar-date portion is used",
+    example: "2023-01-01",
   })
   @IsOptional()
   @IsDateString()
@@ -251,7 +252,7 @@ export class PaymentsReportQueryDto {
   @ApiProperty({
     required: false,
     description:
-      "End date (inclusive through the full calendar day) for the report query in ISO 8601 format",
+      "End date (inclusive through the full America/New_York calendar day) for the report query in YYYY-MM-DD format. For accepted ISO timestamps, only the written calendar-date portion is used",
     example: "2023-01-31",
   })
   @IsOptional()
@@ -332,6 +333,11 @@ export class PaymentsReportResponse {
     description: "Winnings category from finance.winnings.category",
   })
   category: string;
+  @ApiProperty({
+    description:
+      "Payment creation timestamp in America/New_York with its UTC offset",
+    example: "2026-07-31T18:53:33.383-04:00",
+  })
   paymentDate: string;
   paymentId: string;
   paymentStatus: string;
@@ -854,8 +860,8 @@ export class BaFeesReportQueryDto {
   @ApiProperty({
     required: false,
     description:
-      "Start date for the report query in ISO 8601 format (inclusive). If omitted the report uses an open-ended lower bound.",
-    example: "2023-01-01T00:00:00.000Z",
+      "Start date (inclusive from the start of the America/New_York calendar day) for the report query in YYYY-MM-DD format. For accepted ISO timestamps, only the written calendar-date portion is used. If omitted the report uses an open-ended lower bound.",
+    example: "2023-01-01",
   })
   @IsOptional()
   @IsDateString()
@@ -864,7 +870,7 @@ export class BaFeesReportQueryDto {
   @ApiProperty({
     required: false,
     description:
-      "End date (inclusive through the full calendar day) for the report query in ISO 8601 format",
+      "End date (inclusive through the full America/New_York calendar day) for the report query in YYYY-MM-DD format. For accepted ISO timestamps, only the written calendar-date portion is used",
     example: "2023-01-31",
   })
   @IsOptional()