diff --git a/sql/reports/sfdc/ba-fees-monthly.sql b/sql/reports/sfdc/ba-fees-monthly.sql index 6da2feb..8545bb1 100644 --- a/sql/reports/sfdc/ba-fees-monthly.sql +++ b/sql/reports/sfdc/ba-fees-monthly.sql @@ -34,17 +34,17 @@ latest_status AS ( ) SELECT fp.billing_account AS "billingAccountId", - TO_CHAR(DATE_TRUNC('month', fp.created_at), 'YYYY-MM') AS "month", + TO_CHAR(DATE_TRUNC('month', fp.created_at 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)::date AS "earliestPaymentDate", - MAX(fp.created_at)::date AS "latestPaymentDate", + 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", 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), + DATE_TRUNC('month', fp.created_at AT TIME ZONE 'America/New_York'), ls.payment_status_desc ORDER BY fp.billing_account, "month" DESC; diff --git a/sql/reports/sfdc/challenges.sql b/sql/reports/sfdc/challenges.sql index c18a9bd..9327272 100644 --- a/sql/reports/sfdc/challenges.sql +++ b/sql/reports/sfdc/challenges.sql @@ -1,10 +1,11 @@ SELECT + p.id as "paymentId", c.id as "challengeId", c.name AS "challengeName", p.billing_account as "billingAccountId", c.status as "challengeStatus", - c."endDate" as "completeDate", - p.created_at as "paymentDate", + c."endDate" AT TIME ZONE 'America/New_York' as "completeDate", + p.created_at AT TIME ZONE 'America/New_York' as "paymentDate", c."taskIsTask" AS "isTask", p.challenge_fee as "challengeFee", p.total_amount as "memberPayments", @@ -32,4 +33,3 @@ WHERE AND ($10::numeric IS NULL OR (p.total_amount + p.challenge_fee) >= $10::numeric) AND ($11::numeric IS NULL OR (p.total_amount + p.challenge_fee) <= $11::numeric) ORDER BY c."endDate" DESC, p.created_at DESC -LIMIT 1000; diff --git a/sql/reports/sfdc/payments.sql b/sql/reports/sfdc/payments.sql index 8080ab7..b854c89 100644 --- a/sql/reports/sfdc/payments.sql +++ b/sql/reports/sfdc/payments.sql @@ -1,6 +1,6 @@ SELECT p.payment_id as "paymentId", - p.created_at as "paymentDate", + p.created_at AT TIME ZONE 'America/New_York' as "paymentDate", p.billing_account as "billingAccountId", p.payment_status as "paymentStatus", p.challenge_fee as "challengeFee", diff --git a/sql/reports/sfdc/taas-jobs.sql b/sql/reports/sfdc/taas-jobs.sql index 0f0a7f4..21dc945 100644 --- a/sql/reports/sfdc/taas-jobs.sql +++ b/sql/reports/sfdc/taas-jobs.sql @@ -16,8 +16,8 @@ SELECT j.max_salary AS "maxSalary", j.hours_per_week AS "hoursPerWeek", j.currency, - j.created_at AS "createdAt", - j.updated_at AS "updatedAt" + j.created_at AT TIME ZONE 'America/New_York' AS "createdAt", + j.updated_at AT TIME ZONE 'America/New_York' AS "updatedAt" FROM taas.jobs j WHERE j.deleted_at IS NULL diff --git a/sql/reports/sfdc/taas-resource-bookings.sql b/sql/reports/sfdc/taas-resource-bookings.sql index 18c9f6a..6062d70 100644 --- a/sql/reports/sfdc/taas-resource-bookings.sql +++ b/sql/reports/sfdc/taas-resource-bookings.sql @@ -13,8 +13,8 @@ SELECT rb.customer_rate AS "customerRate", rb.rate_type AS "rateType", rb.billing_account_id AS "billingAccountId", - rb.created_at AS "createdAt", - rb.updated_at AS "updatedAt" + rb.created_at AT TIME ZONE 'America/New_York' AS "createdAt", + rb.updated_at AT TIME ZONE 'America/New_York' AS "updatedAt" FROM taas.resource_bookings rb LEFT JOIN identity."user" u ON rb.user_id = u.user_id::text WHERE diff --git a/sql/reports/sfdc/western-union-payments.sql b/sql/reports/sfdc/western-union-payments.sql index e7b6a32..19705c1 100644 --- a/sql/reports/sfdc/western-union-payments.sql +++ b/sql/reports/sfdc/western-union-payments.sql @@ -32,7 +32,7 @@ SELECT reference_id AS "referenceId", description, payment_status_desc AS "paymentStatus", - created_at AS "paymentDate" + created_at AT TIME ZONE 'America/New_York' AS "paymentDate" FROM payment_data WHERE ($1::text IS NULL OR payment_status_desc ILIKE $1 OR payment_status::text ILIKE $1)