fix: changed name of priority to priorities, fixed zod priority schema (

#178)

src/shelter/ShelterSearch.ts

@@ -31,13 +31,13 @@ class ShelterSearch {
   }
 
   priority(supplyIds: string[] = []): Prisma.ShelterWhereInput {
-    if (!this.formProps.priority?.length) return {};
+    if (!this.formProps.priorities?.length) return {};
 
     return {
       shelterSupplies: {
         some: {
           priority: {
-            in: this.formProps.priority,
+            in: this.formProps.priorities,
           },
           supplyId:
             supplyIds.length > 0
@@ -81,7 +81,6 @@ class ShelterSearch {
       return {
         shelterSupplies: {
           some: {
-            priority: undefined,
             supply: {
               supplyCategoryId: {
                 in: this.formProps.supplyCategoryIds,
@@ -179,7 +178,7 @@ class ShelterSearch {
         search,
         { OR: this.shelterStatus },
         this.priority(this.formProps.supplyIds),
-        this.supplyCategoryIds(this.formProps.priority),
+        this.supplyCategoryIds(this.formProps.priorities),
       ],
     };
 

src/shelter/types/search.types.ts

@@ -31,16 +31,13 @@ export type GeolocationFilter = z.infer<typeof GeolocationFilterSchema>;
 
 export const ShelterSearchPropsSchema = z.object({
   search: z.string().optional(),
-  priority: z.preprocess(
-    (value) =>
-      typeof value === 'string'
-        ? value
-            .split(',')
-            .map((v) => Number(v))
-            .filter((v) => !isNaN(v))
-        : [],
-    z.array(z.nativeEnum(SupplyPriority)).optional(),
-  ),
+  priorities: z
+    .array(z.string())
+    .optional()
+    .transform((values) =>
+      values ? values.map(parseInt).filter((v) => !isNaN(v)) : [],
+    )
+    .pipe(z.array(z.nativeEnum(SupplyPriority))),
   supplyCategoryIds: z.array(z.string()).optional(),
   supplyIds: z.array(z.string()).optional(),
   shelterStatus: z.array(ShelterStatusSchema).optional(),