dates to strings helper

api/src/controllers/reviews.ts

@@ -17,6 +17,7 @@ import { TRPCError } from '@trpc/server';
 import { db } from '../db';
 import { review, user, vote } from '../db/schema';
 import { and, count, desc, eq, sql } from 'drizzle-orm';
+import { datesToStrings } from '../helpers/date';
 
 async function userWroteReview(userId: number | undefined, reviewId: number) {
   if (!userId) {
@@ -218,12 +219,10 @@ const reviewsRouter = router({
         .limit(1)
     )[0];
 
-    return {
+    return datesToStrings<FeaturedReviewData>({
       ...featuredReview.review,
-      createdAt: featuredReview.review.createdAt.toISOString(),
-      updatedAt: featuredReview.review.updatedAt?.toISOString(),
       score: featuredReview.vote_query?.score ?? 0,
-    } as FeaturedReviewData;
+    });
   }),
 
   /**

api/src/controllers/users.ts

@@ -8,18 +8,18 @@ import { db } from '../db';
 import { user } from '../db/schema';
 import { eq } from 'drizzle-orm';
 import { z } from 'zod';
+import { datesToStrings } from '../helpers/date';
 
 const usersRouter = router({
   /**
    * Get the user's data
    */
   get: userProcedure.query(async ({ ctx }) => {
     const userData = (await db.select().from(user).where(eq(user.id, ctx.session.userId!)))[0];
-    return {
+    return datesToStrings<UserData>({
       ...userData,
-      lastRoadmapEditAt: userData.lastRoadmapEditAt?.toISOString(),
       isAdmin: ctx.session.isAdmin,
-    } as UserData;
+    });
   }),
 
   /**

api/src/helpers/date.ts

@@ -0,0 +1,9 @@
+export function datesToStrings<T>(object: Record<string, unknown>) {
+  for (const key of Object.keys(object)) {
+    if (object[key] instanceof Date) {
+      object[key] = object[key].toISOString();
+    }
+  }
+
+  return object as T;
+}