Rework set_order to set_sort_order

Author: rzats

src/server/_query.py

@@ -491,22 +491,12 @@ def set_fields(self, *fields: Iterable[str]) -> "QueryBuilder":
         self.fields = [f"{self.alias}.{field}" for field_list in fields for field in field_list]
         return self
 
-    def set_order(self, *args: str, **kwargs: Union[str, bool]) -> "QueryBuilder":
+    def set_sort_order(self, *args: str):
         """
         sets the order for the given fields (as key word arguments), True = ASC, False = DESC
         """
 
-        def to_asc(v: Union[str, bool]) -> str:
-            if v is True:
-                return "ASC"
-            elif v is False:
-                return "DESC"
-            return cast(str, v)
-
-        args_order = [f"{self.alias}.{k} ASC" for k in args]
-        kw_order = [f"{self.alias}.{k} {to_asc(v)}" for k, v in kwargs.items()]
-        self.order = args_order + kw_order
-        return self
+        self.order = [f"{self.alias}.{k} ASC" for k in args]
 
     def with_max_issue(self, *args: str) -> "QueryBuilder":
         fields: List[str] = [f for f in args]

src/server/endpoints/covid_hosp_facility.py

@@ -139,7 +139,7 @@ def handle():
     q.set_fields(fields_string, fields_int, fields_float)
 
     # basic query info
-    q.set_order("collection_week", "hospital_pk", "publication_date")
+    q.set_sort_order("collection_week", "hospital_pk", "publication_date")
 
     # build the filter
     q.where_integers("collection_week", collection_weeks)

src/server/endpoints/covid_hosp_facility_lookup.py

@@ -33,7 +33,7 @@ def handle():
         ]
     )
     # basic query info
-    q.set_order("hospital_pk")
+    q.set_sort_order("hospital_pk")
     # build the filter
     # these are all fast because the table has indexes on each of these fields
     if state:

src/server/endpoints/covid_hosp_state_timeseries.py

@@ -145,7 +145,7 @@ def handle():
     ]
 
     q.set_fields(fields_string, fields_int, fields_float)
-    q.set_order("date", "state", "issue")
+    q.set_sort_order("date", "state", "issue")
 
     # build the filter
     q.where_integers("date", dates)

src/server/endpoints/covidcast.py

@@ -110,11 +110,11 @@ def handle():
     fields_float = ["value", "stderr", "sample_size"]
     is_compatibility = is_compatibility_mode()
     if is_compatibility:
-        q.set_order("signal", "time_value", "geo_value", "issue")
+        q.set_sort_order("signal", "time_value", "geo_value", "issue")
     else:
         # transfer also the new detail columns
         fields_string.extend(["source", "geo_type", "time_type"])
-        q.set_order("source", "signal", "time_type", "time_value", "geo_type", "geo_value", "issue")
+        q.set_sort_order("source", "signal", "time_type", "time_value", "geo_type", "geo_value", "issue")
     q.set_fields(fields_string, fields_int, fields_float)
 
     # basic query info
@@ -175,7 +175,7 @@ def handle_trend():
     fields_int = ["time_value"]
     fields_float = ["value"]
     q.set_fields(fields_string, fields_int, fields_float)
-    q.set_order("geo_type", "geo_value", "source", "signal", "time_value")
+    q.set_sort_order("geo_type", "geo_value", "source", "signal", "time_value")
 
     q.where_source_signal_pairs("source", "signal", source_signal_pairs)
     q.where_geo_pairs("geo_type", "geo_value", geo_pairs)
@@ -223,7 +223,7 @@ def handle_trendseries():
     fields_int = ["time_value"]
     fields_float = ["value"]
     q.set_fields(fields_string, fields_int, fields_float)
-    q.set_order("geo_type", "geo_value", "source", "signal", "time_value")
+    q.set_sort_order("geo_type", "geo_value", "source", "signal", "time_value")
 
     q.where_source_signal_pairs("source", "signal", source_signal_pairs)
     q.where_geo_pairs("geo_type", "geo_value", geo_pairs)
@@ -277,7 +277,7 @@ def handle_correlation():
     fields_int = ["time_value"]
     fields_float = ["value"]
     q.set_fields(fields_string, fields_int, fields_float)
-    q.set_order("geo_type", "geo_value", "source", "signal", "time_value")
+    q.set_sort_order("geo_type", "geo_value", "source", "signal", "time_value")
 
     q.where_source_signal_pairs(
         "source",
@@ -355,7 +355,7 @@ def handle_export():
     q = QueryBuilder(latest_table, "t")
 
     q.set_fields(["geo_value", "signal", "time_value", "issue", "lag", "value", "stderr", "sample_size", "geo_type", "source"], [], [])
-    q.set_order("time_value", "geo_value")
+    q.set_sort_order("time_value", "geo_value")
     q.where_source_signal_pairs("source", "signal", source_signal_pairs)
     q.where_time_pair("time_type", "time_value", TimePair("day" if is_day else "week", [(start_day, end_day)]))
     q.where_geo_pairs("geo_type", "geo_value", [GeoPair(geo_type, True if geo_values == "*" else geo_values)])
@@ -433,7 +433,7 @@ def handle_backfill():
     fields_int = ["time_value", "issue"]
     fields_float = ["value", "sample_size"]
     # sort by time value and issue asc
-    q.set_order(time_value=True, issue=True)
+    q.set_sort_order("time_value", "issue")
     q.set_fields(fields_string, fields_int, fields_float, ["is_latest_issue"])
 
     q.where_source_signal_pairs("source", "signal", source_signal_pairs)
@@ -613,7 +613,7 @@ def handle_coverage():
     q.where_source_signal_pairs("source", "signal", source_signal_pairs)
     q.where_time_pair("time_type", "time_value", time_window)
     q.group_by = "c.source, c.signal, c.time_value"
-    q.set_order("source", "signal", "time_value")
+    q.set_sort_order("source", "signal", "time_value")
 
     def transform_row(row, proxy):
         if not alias_mapper or "source" not in row:

src/server/endpoints/dengue_nowcast.py

@@ -22,7 +22,7 @@ def handle():
     fields_float = ["value", "std"]
     q.set_fields(fields_string, fields_int, fields_float)
 
-    q.set_order("epiweek", "location")
+    q.set_sort_order("epiweek", "location")
 
     # build the filter
     q.where_strings("location", locations)

src/server/endpoints/dengue_sensors.py

@@ -26,7 +26,7 @@ def handle():
     fields_float = ["value"]
     q.set_fields(fields_string, fields_int, fields_float)
 
-    q.set_order('epiweek', 'name', 'location')
+    q.set_sort_order('epiweek', 'name', 'location')
 
     q.where_strings('name', names)
     q.where_strings('location', locations)

src/server/endpoints/ecdc_ili.py

@@ -24,7 +24,7 @@ def handle():
     fields_float = ["incidence_rate"]
     q.set_fields(fields_string, fields_int, fields_float)
 
-    q.set_order("epiweek", "region", "issue")
+    q.set_sort_order("epiweek", "region", "issue")
 
     q.where_integers("epiweek", epiweeks)
     q.where_strings("region", regions)

src/server/endpoints/flusurv.py

@@ -29,7 +29,7 @@ def handle():
         "rate_overall",
     ]
     q.set_fields(fields_string, fields_int, fields_float)
-    q.set_order("epiweek", "location", "issue")
+    q.set_sort_order("epiweek", "location", "issue")
 
     q.where_integers("epiweek", epiweeks)
     q.where_strings("location", locations)

src/server/endpoints/fluview_clinicial.py

@@ -22,7 +22,7 @@ def handle():
     fields_int = ["issue", "epiweek", "lag", "total_specimens", "total_a", "total_b"]
     fields_float = ["percent_positive", "percent_a", "percent_b"]
     q.set_fields(fields_string, fields_int, fields_float)
-    q.set_order("epiweek", "region", "issue")
+    q.set_sort_order("epiweek", "region", "issue")
 
     q.where_integers("epiweek", epiweeks)
     q.where_strings("region", regions)

src/server/endpoints/gft.py

@@ -22,7 +22,7 @@ def handle():
     fields_int = ["epiweek", "num"]
     fields_float = []
     q.set_fields(fields_string, fields_int, fields_float)
-    q.set_order("epiweek", "location")
+    q.set_sort_order("epiweek", "location")
 
     # build the filter
     q.where_integers("epiweek", epiweeks)

src/server/endpoints/ght.py

@@ -26,7 +26,7 @@ def handle():
     fields_float = ["value"]
     q.set_fields(fields_string, fields_int, fields_float)
 
-    q.set_order("epiweek", "location")
+    q.set_sort_order("epiweek", "location")
 
     # build the filter
     q.where_strings("location", locations)

src/server/endpoints/kcdc_ili.py

@@ -24,7 +24,7 @@ def handle():
     fields_float = ["ili"]
     q.set_fields(fields_string, fields_int, fields_float)
 
-    q.set_order("epiweek", "region", "issue")
+    q.set_sort_order("epiweek", "region", "issue")
     # build the filter
     q.where_integers("epiweek", epiweeks)
     q.where_strings("region", regions)

src/server/endpoints/nidss_flu.py

@@ -23,7 +23,7 @@ def handle():
     fields_int = ["issue", "epiweek", "lag", "visits"]
     fields_float = ["ili"]
     q.set_fields(fields_string, fields_int, fields_float)
-    q.set_order("epiweek", "region", "issue")
+    q.set_sort_order("epiweek", "region", "issue")
 
     # build the filter
     q.where_integers("epiweek", epiweeks)

src/server/endpoints/nowcast.py

@@ -22,7 +22,7 @@ def handle():
     fields_float = ["value", "std"]
     q.set_fields(fields_string, fields_int, fields_float)
 
-    q.set_order(epiweek=True, location=True)
+    q.set_sort_order("epiweek", "location")
 
     # build the filter
     q.where_strings("location", locations)

src/server/endpoints/paho_dengue.py

@@ -32,7 +32,7 @@ def handle():
     fields_float = ["incidence_rate"]
     q.set_fields(fields_string, fields_int, fields_float)
 
-    q.set_order(epiweek=True, region=True, issue=True)
+    q.set_sort_order("epiweek", "region", "issue")
 
     # build the filter
     q.where_integers("epiweek", epiweeks)

src/server/endpoints/quidel.py

@@ -25,7 +25,7 @@ def handle():
     fields_float = ["value"]
     q.set_fields(fields_string, fields_int, fields_float)
 
-    q.set_order(epiweek=True, location=True)
+    q.set_sort_order("epiweek", "location")
 
     # build the filter
     q.where_strings("location", locations)