Better typing for updateWishlistSchema

Author: renatodellosso

src/app/api/wishlists/[wishlistId]/route.ts

@@ -2,7 +2,6 @@ import { updateWishlistSchema } from "@/schema/wishlist";
 import UserService from "@/services/userService";
 import { WishlistService } from "@/services/wishlistService";
 import { ArgumentError, errorResponse, ok } from "@/util/errors";
-import { $Enums } from "@prisma/client";
 import { NextRequest } from "next/server";
 
 /**
@@ -39,9 +38,8 @@ export async function PATCH(
     }
 
     await WishlistService.updateWishlist({
-      ...parsed.data,
       id: Number(wishlistId),
-      priority: parsed.data.priority as $Enums.RequestPriority,
+      ...parsed.data,
     });
 
     return ok();

src/schema/wishlist.ts

@@ -1,5 +1,6 @@
+import { UpdateWishlistData } from "@/types/api/wishlist.types";
 import { $Enums } from "@prisma/client";
-import { z } from "zod";
+import { z, ZodObject } from "zod";
 
 const createObj = {
   name: z.string().min(3).max(100),
@@ -14,15 +15,17 @@ const createObj = {
 export const createWishlistSchema = z.object(createObj);
 
 /**
- * The create schema, but every field is optional and there's a mandatory ID field.
- * I tried to automatically map fields from createObj, but it caused type errors.
+ * The create schema, but every field is optional.
+ *
  * @see createWishlistSchema
  */
-export const updateWishlistSchema = z.object({
-  id: z.number().min(1),
-  name: createObj.name.optional(),
-  unitSize: createObj.unitSize.optional(),
-  quantity: createObj.quantity.optional(),
-  priority: createObj.priority.optional(),
-  comments: createObj.comments.optional(),
+export const updateWishlistSchema: ZodObject<
+  Partial<typeof createObj>, // Input type
+  "strip",
+  z.ZodTypeAny,
+  Omit<UpdateWishlistData, "id"> // Output type
+> = z.object({
+  ...Object.fromEntries(
+    Object.entries(createObj).map(([key, value]) => [key, value.optional()])
+  ),
 });