clean up naming scheme and add ID to get all request

Author: reteps

src/routes/events.ts

@@ -18,7 +18,7 @@ import moment from "moment-timezone";
 
 const repeatOptions = ["weekly", "biweekly"] as const;
 
-const baseBodySchema = z.object({
+const baseSchema = z.object({
   title: z.string().min(1),
   description: z.string().min(1),
   start: z.string(),
@@ -30,16 +30,20 @@ const baseBodySchema = z.object({
   paidEventId: z.optional(z.string().min(1)),
 });
 
-const requestBodySchema = baseBodySchema
-  .extend({
-    repeats: z.optional(z.enum(repeatOptions)),
-    repeatEnds: z.string().optional(),
-  })
-  .refine((data) => (data.repeatEnds ? data.repeats !== undefined : true), {
+const requestSchema = baseSchema.extend({
+  repeats: z.optional(z.enum(repeatOptions)),
+  repeatEnds: z.string().optional(),
+});
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const postRequestSchema = requestSchema.refine(
+  (data) => (data.repeatEnds ? data.repeats !== undefined : true),
+  {
     message: "repeats is required when repeatEnds is defined",
-  });
+  },
+);
 
-type EventPostRequest = z.infer<typeof requestBodySchema>;
+type EventPostRequest = z.infer<typeof postRequestSchema>;
 
 const responseJsonSchema = zodToJsonSchema(
   z.object({
@@ -49,9 +53,15 @@ const responseJsonSchema = zodToJsonSchema(
 );
 
 // GET
-const getResponseBodySchema = z.array(requestBodySchema);
-const getResponseJsonSchema = zodToJsonSchema(getResponseBodySchema);
-export type EventGetResponse = z.infer<typeof getResponseBodySchema>;
+const getEventSchema = requestSchema.extend({
+  id: z.string(),
+});
+
+// export type EventGetResponse = z.infer<typeof getEventSchema>;
+// const getEventJsonSchema = zodToJsonSchema(getEventSchema);
+
+const getEventsSchema = z.array(getEventSchema);
+export type EventsGetResponse = z.infer<typeof getEventsSchema>;
 type EventsGetQueryParams = { upcomingOnly?: boolean };
 
 const dynamoClient = new DynamoDBClient({
@@ -66,7 +76,7 @@ const eventsPlugin: FastifyPluginAsync = async (fastify, _options) => {
         response: { 200: responseJsonSchema },
       },
       preValidation: async (request, reply) => {
-        await fastify.zodValidateBody(request, reply, requestBodySchema);
+        await fastify.zodValidateBody(request, reply, requestSchema);
       },
       onRequest: async (request, reply) => {
         await fastify.authorize(request, reply, [AppRoles.MANAGER]);
@@ -112,7 +122,7 @@ const eventsPlugin: FastifyPluginAsync = async (fastify, _options) => {
         querystring: {
           upcomingOnly: { type: "boolean" },
         },
-        response: { 200: getResponseJsonSchema },
+        response: { 200: getEventsSchema },
       },
     },
     async (request: FastifyRequest<EventsGetRequest>, reply) => {
@@ -123,7 +133,7 @@ const eventsPlugin: FastifyPluginAsync = async (fastify, _options) => {
         );
         const items = response.Items?.map((item) => unmarshall(item));
         const currentTimeChicago = moment().tz("America/Chicago");
-        let parsedItems = getResponseBodySchema.parse(items);
+        let parsedItems = getEventsSchema.parse(items);
         if (upcomingOnly) {
           parsedItems = parsedItems.filter((item) => {
             try {