make owner fields consistent across the api

aryaniyaps · Oct 26, 2023 · 3266f9c · 3266f9c
1 parent 00555d7
commit 3266f9c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/app/src/schemas/message.ts b/app/src/schemas/message.ts
@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { attachmentFileSchema } from "./attachment";
+import { ownerSchema } from "./user";
 
 export const messageSchema = z.object({
   id: z.string(),
@@ -10,12 +11,7 @@ export const messageSchema = z.object({
   isEdited: z.boolean(),
   createdAt: z.date(),
   updatedAt: z.date().nullable(),
-  owner: z.object({
-    name: z.string().nullish(),
-    username: z.string(),
-    image: z.string().nullable(),
-    createdAt: z.date(),
-  }),
+  owner: ownerSchema,
 });
 
 export const messageCreateSchema = messageSchema.extend({

diff --git a/app/src/schemas/room.ts b/app/src/schemas/room.ts
@@ -1,16 +1,13 @@
 import { z } from "zod";
+import { ownerSchema } from "./user";
 
 export const roomSchema = z.object({
   id: z.string(),
   name: z.string(),
   ownerId: z.string(),
   createdAt: z.date(),
   updatedAt: z.date().nullable(),
-  owner: z.object({
-    name: z.string().nullish(),
-    username: z.string(),
-    image: z.string().nullable(),
-  }),
+  owner: ownerSchema,
 });
 
 export type Room = z.infer<typeof roomSchema>;
diff --git a/app/src/schemas/user.ts b/app/src/schemas/user.ts
@@ -9,4 +9,12 @@ export const userSchema = z.object({
   updatedAt: z.date().nullable(),
 });
 
+export const ownerSchema = z.object({
+  name: z.string().nullish(),
+  image: z.string().nullable(),
+  username: z.string(),
+  createdAt: z.date(),
+  updatedAt: z.date().nullable(),
+});
+
 export type User = z.infer<typeof userSchema>;
diff --git a/app/src/server/api/routers/message.ts b/app/src/server/api/routers/message.ts
@@ -46,6 +46,7 @@ export const messageRouter = createTRPCRouter({
               username: true,
               image: true,
               createdAt: true,
+              updatedAt: true,
             },
           },
         },
@@ -152,6 +153,7 @@ export const messageRouter = createTRPCRouter({
               username: true,
               image: true,
               createdAt: true,
+              updatedAt: true,
             },
           },
         },
@@ -217,6 +219,7 @@ export const messageRouter = createTRPCRouter({
               username: true,
               image: true,
               createdAt: true,
+              updatedAt: true,
             },
           },
         },

diff --git a/app/src/server/api/routers/room.ts b/app/src/server/api/routers/room.ts
@@ -23,6 +23,8 @@ export const roomRouter = createTRPCRouter({
               name: true,
               username: true,
               image: true,
+              createdAt: true,
+              updatedAt: true,
             },
           },
         },
@@ -63,6 +65,8 @@ export const roomRouter = createTRPCRouter({
               name: true,
               username: true,
               image: true,
+              createdAt: true,
+              updatedAt: true,
             },
           },
         },
@@ -139,6 +143,8 @@ export const roomRouter = createTRPCRouter({
               name: true,
               username: true,
               image: true,
+              createdAt: true,
+              updatedAt: true,
             },
           },
         },