feat: add multi option for priority queryParam (#150)

Tenta resolver a issue #145
SOS-RS · May 29, 2024 · adcb6cb · adcb6cb
1 parent 38da306
commit adcb6cb
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/src/shelter/ShelterSearch.ts b/src/shelter/ShelterSearch.ts
@@ -31,12 +31,14 @@ class ShelterSearch {
   }
 
   priority(supplyIds: string[] = []): Prisma.ShelterWhereInput {
-    if (!this.formProps.priority) return {};
+    if (!this.formProps.priority?.length) return {};
 
     return {
       shelterSupplies: {
         some: {
-          priority: +this.formProps.priority,
+          priority: {
+            in: this.formProps.priority,
+          },
           supplyId:
             supplyIds.length > 0
               ? {
@@ -71,13 +73,31 @@ class ShelterSearch {
   }
 
   supplyCategoryIds(
-    priority?: SupplyPriority | null,
+    priority?: SupplyPriority[] | null,
   ): Prisma.ShelterWhereInput {
     if (!this.formProps.supplyCategoryIds) return {};
+
+    if (!priority || !priority.length) {
+      return {
+        shelterSupplies: {
+          some: {
+            priority: undefined,
+            supply: {
+              supplyCategoryId: {
+                in: this.formProps.supplyCategoryIds,
+              },
+            },
+          },
+        },
+      };
+    }
+
     return {
       shelterSupplies: {
         some: {
-          priority: priority ? +priority : undefined,
+          priority: {
+            in: priority,
+          },
           supply: {
             supplyCategoryId: {
               in: this.formProps.supplyCategoryIds,

diff --git a/src/shelter/types/search.types.ts b/src/shelter/types/search.types.ts
@@ -32,8 +32,14 @@ export type GeolocationFilter = z.infer<typeof GeolocationFilterSchema>;
 export const ShelterSearchPropsSchema = z.object({
   search: z.string().optional(),
   priority: z.preprocess(
-    (value) => Number(value) || undefined,
-    z.nativeEnum(SupplyPriority).optional(),
+    (value) =>
+      typeof value === 'string'
+        ? value
+            .split(',')
+            .map((v) => Number(v))
+            .filter((v) => !isNaN(v))
+        : [],
+    z.array(z.nativeEnum(SupplyPriority)).optional(),
   ),
   supplyCategoryIds: z.array(z.string()).optional(),
   supplyIds: z.array(z.string()).optional(),