Frontend support for querying flights sorted by column

pbogre · Sep 9, 2024 · 0d34cc6 · 0d34cc6
1 parent 4a62d28
commit 0d34cc6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/client/pages/AllFlights.tsx b/client/pages/AllFlights.tsx
@@ -11,6 +11,7 @@ interface FlightsFilters {
     limit?: number;
     offset?: number;
     order?: "DESC"|"ASC";
+    sort?: "date"|"seat"|"ticket_class"|"duration"|"distance";
     start?: string;
     end?: string;
 }
@@ -62,6 +63,17 @@ export default function AllFlights() {
                                 { text: "Ascending", value: "ASC" }
                             ]}/>
                             <br />
+                            <Label text="Sort By" />
+                            <Select name="sort"
+                                    options={[
+                                { text: "Choose", value: "" },
+                                { text: "Date", value: "date" },
+                                { text: "Seat", value: "seat" },
+                                { text: "Ticket Class", value: "ticket_class" },
+                                { text: "Duration", value: "duration" },
+                                { text: "Distance", value: "distance" }
+                            ]}/>
+                            <br />
                             <Label text="Start Date" />
                             <Input type="date" name="start" />
                             <br />

diff --git a/server/routers/flights.py b/server/routers/flights.py
@@ -15,7 +15,7 @@ class Order(str, Enum):
     ASCENDING = "ASC"
     DESCENDING = "DESC"
 
-class SortBy(str, Enum):
+class Sort(str, Enum):
     DATE = "date"
     SEAT = "seat"
     TICKET_CLASS = "ticket_class"
@@ -141,7 +141,7 @@ async def get_flights(id: int|None = None,
                       limit: int = 50, 
                       offset: int = 0, 
                       order: Order = Order.DESCENDING,
-                      sort_by: SortBy = SortBy.DATE,
+                      sort: Sort = Sort.DATE,
                       start: datetime.date|None = None,
                       end: datetime.date|None = None) -> list[FlightModel]|FlightModel:
 
@@ -164,7 +164,7 @@ async def get_flights(id: int|None = None,
         JOIN airports d ON LOWER(f.destination) = LOWER(d.icao)
         {id_filter}
         {date_filter_start} {date_filter}
-        ORDER BY f.{sort_by.value} {order.value}
+        ORDER BY f.{sort.value} {order.value}
         LIMIT {limit}
         OFFSET {offset};"""