refactor(api): replace TimeFrame middleware with time schema utility

apps/web/src/pages/stats/index.tsx

@@ -1,7 +1,7 @@
 import type { ReactNode } from "react";
 import { useMemo, useState } from "react";
 
-import type { TimeFrame } from "@blobscan/api/src/middlewares/withTimeFrame";
+import type { Time } from "@blobscan/api/src/utils/time-schema";
 
 import { Card } from "~/components/Cards/Card";
 import { MetricCard } from "~/components/Cards/MetricCard";
@@ -214,7 +214,7 @@ function OverallStats() {
   );
 }
 
-const TIME_FRAMES: { label: string; value: TimeFrame }[] = [
+const TIME_FRAMES: { label: string; value: Time }[] = [
   { label: "1 year", value: "360d" },
   { label: "6 months", value: "180d" },
   { label: "1 month", value: "30d" },
@@ -233,7 +233,7 @@ type Section = "All" | "Blob" | "Block" | "Transaction";
 
 function Charts() {
   const [sectionFilter, setSectionFilter] = useState<Section>("All");
-  const [timeFrame, setTimeFrame] = useState<TimeFrame>("180d");
+  const [timeFrame, setTimeFrame] = useState<Time>("180d");
   const { data: dailyStatsData } = api.stats.getDailyStats.useQuery({
     timeFrame,
   });
@@ -306,7 +306,7 @@ function Charts() {
             selected={TIME_FRAMES.find((option) => option.value === timeFrame)}
             onChange={(option: Option) => {
               if (!option) return;
-              setTimeFrame(option.value as TimeFrame);
+              setTimeFrame(option.value as Time);
             }}
           />
         </div>

packages/api/src/routers/stats/getBlobDailyStats.ts

@@ -1,13 +1,10 @@
 import { z } from "@blobscan/zod";
 
-import {
-  withTimeFrame,
-  withTimeFrameSchema,
-} from "../../middlewares/withTimeFrame";
 import { publicProcedure } from "../../procedures";
+import { timeSchema } from "../../utils/time-schema";
 import { BLOB_BASE_PATH } from "./common";
 
-const inputSchema = withTimeFrameSchema;
+const inputSchema = timeSchema;
 
 export const outputSchema = z.object({
   days: z.array(z.string()),
@@ -28,16 +25,15 @@ export const getBlobDailyStats = publicProcedure
     },
   })
   .input(inputSchema)
-  .use(withTimeFrame)
   .output(outputSchema)
-  .query(async ({ ctx: { prisma, timeFrame } }) => {
+  .query(async ({ ctx: { prisma }, input: { timeFrame } }) => {
     const stats = await prisma.dailyStats.findMany({
       where: {
         AND: [
           {
             day: {
-              gte: timeFrame.initial.toDate(),
-              lte: timeFrame.final.toDate(),
+              gte: timeFrame?.initial,
+              lte: timeFrame?.final,
             },
           },
           {

packages/api/src/routers/stats/getBlockDailyStats.ts

@@ -1,13 +1,10 @@
 import { z } from "@blobscan/zod";
 
-import {
-  withTimeFrame,
-  withTimeFrameSchema,
-} from "../../middlewares/withTimeFrame";
 import { publicProcedure } from "../../procedures";
+import { timeSchema } from "../../utils/time-schema";
 import { BLOCK_BASE_PATH } from "./common";
 
-const inputSchema = withTimeFrameSchema;
+const inputSchema = timeSchema;
 
 export const outputSchema = z.object({
   days: z.array(z.string()),
@@ -33,16 +30,15 @@ export const getBlockDailyStats = publicProcedure
     },
   })
   .input(inputSchema)
-  .use(withTimeFrame)
   .output(outputSchema)
-  .query(async ({ ctx: { prisma, timeFrame } }) => {
+  .query(async ({ ctx: { prisma }, input: { timeFrame } }) => {
     const stats = await prisma.dailyStats.findMany({
       where: {
         AND: [
           {
             day: {
-              gte: timeFrame.initial.toDate(),
-              lte: timeFrame.final.toDate(),
+              gte: timeFrame?.initial,
+              lte: timeFrame?.final,
             },
           },
           {

packages/api/src/routers/stats/getDailyStats.ts

@@ -1,9 +1,5 @@
 import { z } from "@blobscan/zod";
 
-import {
-  withTimeFrame,
-  withTimeFrameSchema,
-} from "../../middlewares/withTimeFrame";
 import { publicProcedure } from "../../procedures";
 import {
   categorySchema,
@@ -12,9 +8,10 @@ import {
   serializeDate,
   serializeRollup,
 } from "../../utils";
+import { timeSchema } from "../../utils/time-schema";
 import { statsSchema } from "./common";
 
-const inputSchema = withTimeFrameSchema;
+const inputSchema = timeSchema;
 const outputSchema = statsSchema
   .merge(
     z.object({
@@ -28,15 +25,14 @@ const outputSchema = statsSchema
 export const getDailyStats = publicProcedure
   .input(inputSchema)
   .output(outputSchema)
-  .use(withTimeFrame)
-  .query(async ({ ctx: { prisma, timeFrame } }) => {
+  .query(async ({ ctx: { prisma }, input: { timeFrame } }) => {
     const dailyStats = await prisma.dailyStats.findMany({
       where: {
         AND: [
           {
             day: {
-              gte: timeFrame.initial.toDate(),
-              lte: timeFrame.final.toDate(),
+              gte: timeFrame?.initial,
+              lte: timeFrame?.final,
             },
           },
           {

packages/api/src/routers/stats/getTransactionDailyStats.ts

@@ -1,13 +1,10 @@
 import { z } from "@blobscan/zod";
 
-import {
-  withTimeFrame,
-  withTimeFrameSchema,
-} from "../../middlewares/withTimeFrame";
 import { publicProcedure } from "../../procedures";
+import { timeSchema } from "../../utils/time-schema";
 import { TRANSACTION_BASE_PATH } from "./common";
 
-const inputSchema = withTimeFrameSchema;
+const inputSchema = timeSchema;
 
 export const outputSchema = z.object({
   days: z.array(z.string()),
@@ -29,16 +26,15 @@ export const getTransactionDailyStats = publicProcedure
     },
   })
   .input(inputSchema)
-  .use(withTimeFrame)
   .output(outputSchema)
-  .query(async ({ ctx: { prisma, timeFrame } }) => {
+  .query(async ({ ctx: { prisma }, input: { timeFrame } }) => {
     const stats = await prisma.dailyStats.findMany({
       where: {
         AND: [
           {
             day: {
-              gte: timeFrame.initial.toDate(),
-              lte: timeFrame.final.toDate(),
+              gte: timeFrame?.initial,
+              lte: timeFrame?.final,
             },
           },
           {

packages/api/src/utils/time-schema.ts

@@ -0,0 +1,24 @@
+import { z } from "zod";
+
+const ONE_DAY = 1_000 * 60 * 60 * 24;
+
+export const TIME = ["1d", "7d", "15d", "30d", "180d", "360d", "All"] as const;
+export type Time = (typeof TIME)[number];
+
+const TimeEnum = z.enum(TIME).transform((time) => {
+  if (time === "All") {
+    return undefined;
+  }
+
+  const today = Math.floor(Date.now() / ONE_DAY) * ONE_DAY;
+  const days = parseInt(time.replace("d", ""));
+
+  return {
+    initial: new Date(today - days * ONE_DAY),
+    final: new Date(today),
+  };
+});
+
+export const timeSchema = z.object({
+  timeFrame: TimeEnum,
+});

packages/api/test/stats.test.ts

@@ -4,24 +4,23 @@ import dayjs from "@blobscan/dayjs";
 import { omitDBTimestampFields } from "@blobscan/test";
 
 import { appRouter } from "../src/app-router";
-import type { TimeFrame } from "../src/middlewares/withTimeFrame";
+import { TIME } from "../src/utils/time-schema";
+import type { Time } from "../src/utils/time-schema";
 import { createTestContext } from "./helpers";
 
-const TIME_FRAMES = ["1d", "7d", "15d", "30d", "180d", "360d"] as const;
-
 function runTimeFrameTests({
   statsFiller,
   statsFetcher,
 }: {
   statsFiller: () => Promise<unknown>;
-  statsFetcher: (timeFrame: TimeFrame) => Promise<unknown>;
+  statsFetcher: (timeFrame: Time) => Promise<unknown>;
 }) {
   return describe("when getting stats for a specific timeframe", () => {
     beforeEach(async () => {
       await statsFiller();
     });
 
-    TIME_FRAMES.forEach((timeFrame) => {
+    TIME.forEach((timeFrame) => {
       it(`should get daily stats for ${timeFrame}`, async () => {
         const result = await statsFetcher(timeFrame);