update spinners package

app/api/route.ts

@@ -1,12 +1,18 @@
 import { NextResponse } from "next/server";
-import { Calculation, calculationSchema } from "../schemas/calculationSchema";
+import { api, apiSchema } from "../schemas/apiSchema";
+import { calculationSchema } from "../schemas/calculationSchema";
 import * as calculationService from "../services/calculationService";
 
 export async function POST(req: Request) {
   try {
     // Parse and validate user input
     const data = await req.json();
-    const input: Calculation = calculationSchema.parse(data);
+    let input: api;
+    if (!apiSchema.safeParse(data).success) {
+      input = calculationSchema.parse(data);
+    } else {
+      input = data;
+    }
     const householdData = await calculationService.getHouseholdData(input);
     return NextResponse.json(householdData);
   } catch (err) {

app/schemas/apiSchema.ts

@@ -0,0 +1,28 @@
+import { z } from "zod";
+import { parse as parsePostcode } from "postcode";
+import { HOUSE_TYPES } from "../models/Property";
+
+// Type not exported by postcode lib directly
+export type ValidPostcode = Extract<
+  ReturnType<typeof parsePostcode>,
+  { valid: true }
+>;
+
+const HouseTypeEnum = z.enum(HOUSE_TYPES);
+
+export const apiSchema = z.object({
+  housePostcode: z.custom<ValidPostcode>(),
+  houseSize: z.coerce.number().positive("houseSize must be a positive integer"),
+  houseAge: z.coerce.number().positive("houseAge must be a positive integer"),
+  houseBedrooms: z.coerce
+    .number()
+    .positive("houseBedrooms must be a positive integer"),
+  houseType: HouseTypeEnum.refine(
+    (value) => HouseTypeEnum.options.includes(value),
+    {
+      message: `houseType is required and must be one of ${HOUSE_TYPES}`,
+    }
+  ),
+});
+
+export type api = z.infer<typeof apiSchema>;

app/schemas/calculationSchema.ts

@@ -11,19 +11,12 @@ const HouseTypeEnum = z.enum(HOUSE_TYPES);
  * Describes the form the user will interact with in the frontend
  */
 export const calculationSchema = z.object({
-  housePostcode: z.union([
-    z
-      .string()
-      .min(1, "housePostcode is required")
-      .refine(fixPostcode, "Invalid postcode")
-      .transform(parsePostcode)
-      .refine(
-        (postcode): postcode is ValidPostcode => postcode.valid,
-        "Invalid postcode"
-      ),
-    z.custom<ValidPostcode>(),
-  ]),
-
+  housePostcode: z
+    .string()
+    .min(1, "housePostcode is required")
+    .refine(fixPostcode, "Invalid postcode")
+    .transform(parsePostcode)
+    .refine((postcode): postcode is ValidPostcode => postcode.valid),
   houseSize: z.coerce.number().positive("houseSize must be a positive integer"),
   houseAge: z.coerce.number().positive("houseAge must be a positive integer"),
   houseBedrooms: z.coerce

package.json

@@ -29,6 +29,7 @@
     "react": "^18",
     "react-dom": "^18",
     "react-hook-form": "^7.52.2",
+    "react-spinners": "^0.14.1",
     "ts-node": "^10.9.2",
     "zod": "^3.23.8"
   },