From b12cf5363012de0c402277a30b8bcfedb4fb5f03 Mon Sep 17 00:00:00 2001 From: keyan Date: Sun, 31 Mar 2024 14:21:08 -0500 Subject: [PATCH] specify non-reward days better --- api/resolvers/rewards.js | 7 ++++++- pages/rewards/[...when].js | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/api/resolvers/rewards.js b/api/resolvers/rewards.js index 9f833eb9..52647f6b 100644 --- a/api/resolvers/rewards.js +++ b/api/resolvers/rewards.js @@ -79,7 +79,12 @@ async function getRewards (when, models) { throw new GraphQLError('bad date range', { extensions: { code: 'BAD_USER_INPUT' } }) } - if (new Date(when[0]).getTime() >= new Date('2024-03-01').getTime()) { + if (new Date(when[0]).getTime() > new Date('2024-03-01').getTime()) { + // after 3/1/2024, we reward monthly on the 1st + if (new Date(when[0]).getUTCDate() !== 1) { + throw new GraphQLError('invalid reward date', { extensions: { code: 'BAD_USER_INPUT' } }) + } + return await getMonthlyRewards(when, models) } } diff --git a/pages/rewards/[...when].js b/pages/rewards/[...when].js index bb75a559..43ce3468 100644 --- a/pages/rewards/[...when].js +++ b/pages/rewards/[...when].js @@ -16,7 +16,8 @@ const GrowthPieChart = dynamic(() => import('@/components/charts').then(mod => m }) export const getServerSideProps = getGetServerSideProps({ - query: ME_REWARDS + query: ME_REWARDS, + notFound: (data, params) => data.rewards.reduce((a, r) => a || new Date(r.time) > new Date(), false) }) export default function Rewards ({ ssrData }) {