Refactor and clean up make queries

sgcarstrends · Jun 23, 2024 · 6d58bc3 · 6d58bc3
1 parent ca316a4
commit 6d58bc3
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -40,15 +40,19 @@ app.get("/make", async (c) => {
 
 app.get("/make/:make", async (c) => {
   const make = c.req.param("make");
-  const vehicleType = c.req.query("vehicleType");
+  const { month, fuelType, vehicleType } = c.req.query();
+
+  const filter = {
+    ...(make && { make: new RegExp(make, "i") }),
+    ...(month && { month }),
+    ...(fuelType && { fuel_type: new RegExp(`^${fuelType}$`, "i") }),
+    ...(vehicleType && { vehicle_type: new RegExp(vehicleType, "i") }),
+  };
 
   return c.json(
     await db
       .collection<Car>("cars")
-      .find({
-        make: new RegExp(make, "i"),
-        vehicle_type: new RegExp(vehicleType, "i"),
-      })
+      .find(filter)
       .sort({ month: -1, fuel_type: 1, vehicle_type: 1 })
       .toArray(),
   );