diff --git a/worker/earn.js b/worker/earn.js index 4af19b1f..571369bc 100644 --- a/worker/earn.js +++ b/worker/earn.js @@ -15,7 +15,7 @@ export async function earn ({ name }) { const [{ sum: sumDecimal }] = await models.$queryRaw` SELECT coalesce(sum(total), 0) as sum FROM rewards_days - WHERE date_trunc('month', rewards_days.t) = date_trunc('month', (now() - interval '1 month') AT TIME ZONE 'America/Chicago')` + WHERE date_trunc('month', rewards_days.t) = date_trunc('month', (now() AT TIME ZONE 'America/Chicago' - interval '1 month'))` // XXX primsa will return a Decimal (https://mikemcl.github.io/decimal.js) // because sum of a BIGINT returns a NUMERIC type (https://www.postgresql.org/docs/13/functions-aggregate.html) @@ -54,7 +54,7 @@ export async function earn ({ name }) { const earners = await models.$queryRaw` SELECT id AS "userId", sum(proportion) as proportion, ROW_NUMBER() OVER (ORDER BY sum(proportion) DESC) as rank FROM user_values_days - WHERE date_trunc('month', user_values_days.t) = date_trunc('month', (now() - interval '1 month') AT TIME ZONE 'America/Chicago') + WHERE date_trunc('month', user_values_days.t) = date_trunc('month', (now() AT TIME ZONE 'America/Chicago' - interval '1 month')) AND NOT (id = ANY (${SN_NO_REWARDS_IDS})) GROUP BY id ORDER BY proportion DESC diff --git a/worker/territory.js b/worker/territory.js index 36deebe9..cc453ae9 100644 --- a/worker/territory.js +++ b/worker/territory.js @@ -54,7 +54,7 @@ export async function territoryRevenue ({ models }) { LEFT JOIN "Item" root ON "Item"."rootId" = root.id JOIN "Sub" ON "Sub"."name" = COALESCE(root."subName", "Item"."subName") LEFT JOIN "ReferralAct" ON "ReferralAct"."itemActId" = "ItemAct".id - WHERE date_trunc('day', "ItemAct".created_at AT TIME ZONE 'UTC' AT TIME ZONE 'America/Chicago') = date_trunc('day', (now() - interval '1 day') AT TIME ZONE 'America/Chicago') + WHERE date_trunc('day', "ItemAct".created_at AT TIME ZONE 'UTC' AT TIME ZONE 'America/Chicago') = date_trunc('day', (now() AT TIME ZONE 'America/Chicago' - interval '1 day')) AND "ItemAct".act <> 'TIP' AND "Sub".status <> 'STOPPED' ) subquery