ekzyis
/
stacker.news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix time zone problems

This commit is contained in:
keyan 2023-08-29 21:05:10 -05:00
parent b6c822f40e
commit 9a4476b1fe
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api/resolvers/rewards.js
View File

@ -3,7 +3,6 @@ import { amountSchema, ssValidate } from '../../lib/validate'
import serialize from './serial'
import { ANON_USER_ID } from '../../lib/constants'
import { getItem } from './item'
import { datePivot, dayMonthYear } from '../../lib/time'
export default {
Query: {
@ -12,21 +11,20 @@ export default {
if (when.length > 2) {
throw new GraphQLError('too many dates', { extensions: { code: 'BAD_USER_INPUT' } })
}
when = when.map(w => {
when.forEach(w => {
if (isNaN(new Date(w))) {
throw new GraphQLError('invalid date', { extensions: { code: 'BAD_USER_INPUT' } })
}
return dayMonthYear(datePivot(new Date(w), { days: -1 }))
})
} else {
// default to tomorrow's rewards
when = [dayMonthYear(new Date())]
}
const results = await models.$queryRaw`
WITH days_cte (day) AS (
SELECT t::date
FROM generate_series(${when[0]}::text::timestamp, ${when[when.length - 1]}::text::timestamp, interval '1 day') AS t
SELECT date_trunc('day', t)
FROM generate_series(
COALESCE(${when?.[0]}::timestamp - interval '1 day', now() AT TIME ZONE 'America/Chicago'),
COALESCE(${when?.[when.length - 1]}::timestamp - interval '1 day', now() AT TIME ZONE 'America/Chicago'),
interval '1 day') AS t
)
SELECT coalesce(FLOOR(sum(sats)), 0) as total,
days_cte.day + interval '1 day' as time,
@ -61,14 +59,14 @@ export default {
GROUP BY days_cte.day
ORDER BY days_cte.day ASC`
return results || [{ total: 0, time: 0, sources: [] }]
return results.length ? results : [{ total: 0, time: 0, sources: [] }]
},
meRewards: async (parent, { when }, { me, models }) => {
if (!me) {
return null
}
if (!when || !Array.isArray(when) || when.length > 2) {
if (!when || when.length > 2) {
throw new GraphQLError('invalid date range', { extensions: { code: 'BAD_USER_INPUT' } })
}
for (const w of when) {
@ -79,8 +77,11 @@ export default {
const results = await models.$queryRaw`
WITH days_cte (day) AS (
SELECT t::date
FROM generate_series(${when[0]}::text::timestamp, ${when[when.length - 1]}::text::timestamp, interval '1 day') AS t
SELECT date_trunc('day', t)
FROM generate_series(
${when[0]}::timestamp,
${when[when.length - 1]}::timestamp,
interval '1 day') AS t
)
SELECT coalesce(sum(sats), 0) as total, json_agg("Earn".*) as rewards
FROM days_cte