ca11ac9fb8
* wip backend optimism * another inch * make action state transitions only happen once * another inch * almost ready for testing * use interactive txs * another inch * ready for basic testing * lint fix * inches * wip item update * get item update to work * donate and downzap * inchy inch * fix territory paid actions * wip usePaidMutation * usePaidMutation error handling * PENDING_HELD and HELD transitions, gql paidAction return types * mostly working pessimism * make sure invoice field is present in optimisticResponse * inches * show optimistic values to current me * first pass at notifications and payment status reporting * fix migration to have withdrawal hash * reverse optimism on payment failure * Revert "Optimistic updates via pending sats in item context (#1229)" This reverts commit 93713b33df9bc3701dc5a692b86a04ff64e8cfb1. * add onCompleted to usePaidMutation * onPaid and onPayError for new comments * use 'IS DISTINCT FROM' for NULL invoiceActionState columns * make usePaidMutation easier to read * enhance invoice qr * prevent actions on unpaid items * allow navigation to action's invoice * retry create item * start edit window after item is paid for * fix ux of retries from notifications * refine retries * fix optimistic downzaps * remember item updates can't be retried * store reference to action item in invoice * remove invoice modal layout shift * fix destructuring * fix zap undos * make sure ItemAct is paid in aggregate queries * dont toast on long press zap undo * fix delete and remindme bots * optimistic poll votes with retries * fix retry notifications and invoice item context * fix pessimisitic typo * item mentions and mention notifications * dont show payment retry on item popover * make bios work * refactor paidAction transitions * remove stray console.log * restore docker compose nwc settings * add new todos * persist qr modal on post submission + unify item form submission * fix post edit threshold * make bounty payments work * make job posting work * remove more store procedure usage ... document serialization concerns * dont use dynamic imports for paid action modules * inline comment denormalization * create item starts with median votes * fix potential of serialization anomalies in zaps * dont trigger notification indicator on successful paid action invoices * ignore invoiceId on territory actions and add optimistic concurrency control * begin docs for paid actions * better error toasts and fix apollo cache warnings * small documentation enhancements * improve paid action docs * optimistic concurrency control for territory updates * use satsToMsats and msatsToSats helpers * explictly type raw query template parameters * improve consistency of nested relation names * complete paid action docs * useEffect for canEdit on payment * make sure invoiceId is provided when required * don't return null when expecting array * remove buy credits * move verifyPayment to paidAction * fix comments invoicePaidAt time zone * close nwc connections once * grouped logs for paid actions * stop invoiceWaitUntilPaid if not attempting to pay * allow actionState to transition directly from HELD to PAID * make paid mutation wait until pessimistic are fully paid * change button text when form submits/pays * pulsing form submit button * ignore me in notification indicator for territory subscription * filter unpaid items from more queries * fix donation stike timing * fix pending poll vote * fix recent item notifcation padding * no default form submitting button text * don't show paying on submit button on free edits * fix territory autorenew with fee credits * reorg readme * allow jobs to be editted forever * fix image uploads * more filter fixes for aggregate views * finalize paid action invoice expirations * remove unnecessary async * keep clientside cache normal/consistent * add more detail to paid action doc * improve paid action table * remove actionType guard * fix top territories * typo api/paidAction/README.md Co-authored-by: ekzyis <ek@stacker.news> * typo components/use-paid-mutation.js Co-authored-by: ekzyis <ek@stacker.news> * Apply suggestions from code review Co-authored-by: ekzyis <ek@stacker.news> * encorporate ek feeback * more ek suggestions * fix 'cost to post' hover on items * Apply suggestions from code review Co-authored-by: ekzyis <ek@stacker.news> --------- Co-authored-by: ekzyis <ek@stacker.news>
148 lines
7.1 KiB
JavaScript
148 lines
7.1 KiB
JavaScript
import { timeUnitForRange, whenRange } from '@/lib/time'
|
|
|
|
export function withClause (range) {
|
|
const unit = timeUnitForRange(range)
|
|
|
|
return `
|
|
WITH range_values AS (
|
|
SELECT date_trunc('${unit}', $1) as minval,
|
|
date_trunc('${unit}', $2) as maxval
|
|
),
|
|
times AS (
|
|
SELECT generate_series(minval, maxval, interval '1 ${unit}') as time
|
|
FROM range_values
|
|
)
|
|
`
|
|
}
|
|
|
|
export function intervalClause (range, table) {
|
|
const unit = timeUnitForRange(range)
|
|
|
|
return `date_trunc('${unit}', "${table}".created_at) >= date_trunc('${unit}', $1) AND date_trunc('${unit}', "${table}".created_at) <= date_trunc('${unit}', $2) `
|
|
}
|
|
|
|
export function viewIntervalClause (range, view) {
|
|
const unit = timeUnitForRange(range)
|
|
return `"${view}".t >= date_trunc('${unit}', timezone('America/Chicago', $1)) AND date_trunc('${unit}', "${view}".t) <= date_trunc('${unit}', timezone('America/Chicago', $2)) `
|
|
}
|
|
|
|
export function viewGroup (range, view) {
|
|
const unit = timeUnitForRange(range)
|
|
return `(
|
|
(SELECT *
|
|
FROM ${view}_days
|
|
WHERE ${viewIntervalClause(range, `${view}_days`)})
|
|
UNION ALL
|
|
(SELECT *
|
|
FROM ${view}_hours
|
|
WHERE ${viewIntervalClause(range, `${view}_hours`)}
|
|
${unit === 'hour' ? '' : `AND "${view}_hours".t >= date_trunc('day', timezone('America/Chicago', now()))`})
|
|
UNION ALL
|
|
(SELECT * FROM
|
|
${view}(
|
|
date_trunc('hour', timezone('America/Chicago', now())),
|
|
date_trunc('hour', timezone('America/Chicago', now())), '1 hour'::INTERVAL, 'hour')
|
|
WHERE "${view}".t >= date_trunc('${unit}', timezone('America/Chicago', $1))
|
|
AND "${view}".t <= date_trunc('${unit}', timezone('America/Chicago', $2)))
|
|
) u`
|
|
}
|
|
|
|
export default {
|
|
Query: {
|
|
registrationGrowth: async (parent, { when, from, to }, { models }) => {
|
|
const range = whenRange(when, from, to)
|
|
|
|
return await models.$queryRawUnsafe(`
|
|
SELECT date_trunc('${timeUnitForRange(range)}', t) at time zone 'America/Chicago' as time, json_build_array(
|
|
json_build_object('name', 'referrals', 'value', sum(referrals)),
|
|
json_build_object('name', 'organic', 'value', sum(organic))
|
|
) AS data
|
|
FROM ${viewGroup(range, 'reg_growth')}
|
|
GROUP BY time
|
|
ORDER BY time ASC`, ...range)
|
|
},
|
|
spenderGrowth: async (parent, { when, to, from }, { models }) => {
|
|
const range = whenRange(when, from, to)
|
|
|
|
return await models.$queryRawUnsafe(`
|
|
SELECT date_trunc('${timeUnitForRange(range)}', t) at time zone 'America/Chicago' as time, json_build_array(
|
|
json_build_object('name', 'any', 'value', COUNT(DISTINCT "userId")),
|
|
json_build_object('name', 'jobs', 'value', COUNT(DISTINCT "userId") FILTER (WHERE type = 'STREAM')),
|
|
json_build_object('name', 'boost', 'value', COUNT(DISTINCT "userId") FILTER (WHERE type = 'BOOST')),
|
|
json_build_object('name', 'fees', 'value', COUNT(DISTINCT "userId") FILTER (WHERE type = 'FEE')),
|
|
json_build_object('name', 'poll', 'value', COUNT(DISTINCT "userId") FILTER (WHERE type = 'POLL')),
|
|
json_build_object('name', 'downzaps', 'value', COUNT(DISTINCT "userId") FILTER (WHERE type = 'DONT_LIKE_THIS')),
|
|
json_build_object('name', 'zaps', 'value', COUNT(DISTINCT "userId") FILTER (WHERE type = 'TIP')),
|
|
json_build_object('name', 'donation', 'value', COUNT(DISTINCT "userId") FILTER (WHERE type = 'DONATION')),
|
|
json_build_object('name', 'territories', 'value', COUNT(DISTINCT "userId") FILTER (WHERE type = 'TERRITORY'))
|
|
) AS data
|
|
FROM ${viewGroup(range, 'spender_growth')}
|
|
GROUP BY time
|
|
ORDER BY time ASC`, ...range)
|
|
},
|
|
itemGrowth: async (parent, { when, to, from }, { models }) => {
|
|
const range = whenRange(when, from, to)
|
|
|
|
return await models.$queryRawUnsafe(`
|
|
SELECT date_trunc('${timeUnitForRange(range)}', t) at time zone 'America/Chicago' as time, json_build_array(
|
|
json_build_object('name', 'posts', 'value', sum(posts)),
|
|
json_build_object('name', 'comments', 'value', sum(comments)),
|
|
json_build_object('name', 'jobs', 'value', sum(jobs)),
|
|
json_build_object('name', 'zaps', 'value', sum(zaps)),
|
|
json_build_object('name', 'territories', 'value', sum(territories)),
|
|
json_build_object('name', 'comments/posts', 'value', ROUND(sum(comments)/GREATEST(sum(posts), 1), 2))
|
|
) AS data
|
|
FROM ${viewGroup(range, 'item_growth')}
|
|
GROUP BY time
|
|
ORDER BY time ASC`, ...range)
|
|
},
|
|
spendingGrowth: async (parent, { when, to, from }, { models }) => {
|
|
const range = whenRange(when, from, to)
|
|
|
|
return await models.$queryRawUnsafe(`
|
|
SELECT date_trunc('${timeUnitForRange(range)}', t) at time zone 'America/Chicago' as time, json_build_array(
|
|
json_build_object('name', 'jobs', 'value', sum(jobs)),
|
|
json_build_object('name', 'boost', 'value', sum(boost)),
|
|
json_build_object('name', 'fees', 'value', sum(fees)),
|
|
json_build_object('name', 'zaps', 'value', sum(tips)),
|
|
json_build_object('name', 'donations', 'value', sum(donations)),
|
|
json_build_object('name', 'territories', 'value', sum(territories))
|
|
) AS data
|
|
FROM ${viewGroup(range, 'spending_growth')}
|
|
GROUP BY time
|
|
ORDER BY time ASC`, ...range)
|
|
},
|
|
stackerGrowth: async (parent, { when, to, from }, { models }) => {
|
|
const range = whenRange(when, from, to)
|
|
|
|
return await models.$queryRawUnsafe(`
|
|
SELECT date_trunc('${timeUnitForRange(range)}', t) at time zone 'America/Chicago' as time, json_build_array(
|
|
json_build_object('name', 'any', 'value', COUNT(DISTINCT "userId")),
|
|
json_build_object('name', 'posts', 'value', COUNT(DISTINCT "userId") FILTER (WHERE type = 'POST')),
|
|
json_build_object('name', 'comments', 'value', COUNT(DISTINCT "userId") FILTER (WHERE type = 'COMMENT')),
|
|
json_build_object('name', 'rewards', 'value', COUNT(DISTINCT "userId") FILTER (WHERE type = 'EARN')),
|
|
json_build_object('name', 'referrals', 'value', COUNT(DISTINCT "userId") FILTER (WHERE type = 'REFERRAL')),
|
|
json_build_object('name', 'territories', 'value', COUNT(DISTINCT "userId") FILTER (WHERE type = 'REVENUE'))
|
|
) AS data
|
|
FROM ${viewGroup(range, 'stackers_growth')}
|
|
GROUP BY time
|
|
ORDER BY time ASC`, ...range)
|
|
},
|
|
stackingGrowth: async (parent, { when, to, from }, { models }) => {
|
|
const range = whenRange(when, from, to)
|
|
|
|
return await models.$queryRawUnsafe(`
|
|
SELECT date_trunc('${timeUnitForRange(range)}', t) at time zone 'America/Chicago' as time, json_build_array(
|
|
json_build_object('name', 'rewards', 'value', sum(rewards)),
|
|
json_build_object('name', 'posts', 'value', sum(posts)),
|
|
json_build_object('name', 'comments', 'value', sum(comments)),
|
|
json_build_object('name', 'referrals', 'value', sum(referrals)),
|
|
json_build_object('name', 'territories', 'value', sum(territories))
|
|
) AS data
|
|
FROM ${viewGroup(range, 'stacking_growth')}
|
|
GROUP BY time
|
|
ORDER BY time ASC`, ...range)
|
|
}
|
|
}
|
|
}
|