Address review comments

Author: rzats

src/server/_params.py

@@ -7,7 +7,7 @@
 
 
 from ._exceptions import ValidationFailedException
-from .utils import days_in_range, weeks_in_range, guess_time_value_is_day, guess_time_value_is_week, TimeValues, days_to_ranges, weeks_to_ranges
+from .utils import days_in_range, weeks_in_range, guess_time_value_is_day, guess_time_value_is_week, IntRange, TimeValues, days_to_ranges, weeks_to_ranges
 
 
 def _parse_common_multi_arg(key: str) -> List[Tuple[str, Union[bool, Sequence[str]]]]:
@@ -140,7 +140,7 @@ def to_ranges(self):
         return TimePair(self.time_type, days_to_ranges(self.time_values))
 
 
-def _verify_range(start: int, end: int) -> Union[int, Tuple[int, int]]:
+def _verify_range(start: int, end: int) -> IntRange:
     if start == end:
         # the first and last numbers are the same, just treat it as a singe value
         return start
@@ -151,7 +151,7 @@ def _verify_range(start: int, end: int) -> Union[int, Tuple[int, int]]:
     raise ValidationFailedException(f"the given range {start}-{end} is inverted")
 
 
-def parse_week_value(time_value: str) -> Union[int, Tuple[int, int]]:
+def parse_week_value(time_value: str) -> IntRange:
     count_dashes = time_value.count("-")
     msg = f"{time_value} does not match a known format YYYYWW or YYYYWW-YYYYWW"
 
@@ -171,7 +171,7 @@ def parse_week_value(time_value: str) -> Union[int, Tuple[int, int]]:
     raise ValidationFailedException(msg)
 
 
-def parse_day_value(time_value: str) -> Union[int, Tuple[int, int]]:
+def parse_day_value(time_value: str) -> IntRange:
     count_dashes = time_value.count("-")
     msg = f"{time_value} does not match a known format YYYYMMDD, YYYY-MM-DD, YYYYMMDD-YYYYMMDD, or YYYY-MM-DD--YYYY-MM-DD"
 

src/server/_query.py

@@ -34,7 +34,7 @@ def date_string(value: int) -> str:
 
 def to_condition(
     field: str,
-    value: Union[str, Tuple[int, int], int],
+    value: Union[str, IntRange],
     param_key: str,
     params: Dict[str, Any],
     formatter=lambda x: x,
@@ -50,7 +50,7 @@ def to_condition(
 
 def filter_values(
     field: str,
-    values: Optional[Sequence[Union[str, Tuple[int, int], int]]],
+    values: Optional[Sequence[Union[str, IntRange]]],
     param_key: str,
     params: Dict[str, Any],
     formatter=lambda x: x,
@@ -471,11 +471,13 @@ def apply_lag_filter(self, history_table: str, lag: Optional[int]):
             self.retable(history_table)
             # history_table has full spectrum of lag values to search from whereas the latest_table does not
             self.where(lag=lag)
+        return self
 
     def apply_issues_filter(self, history_table: str, issues: Optional[TimeValues]):
         if issues:
             self.retable(history_table)
             self.where_integers("issue", issues)
+        return self
 
     def apply_as_of_filter(self, history_table: str, as_of: Optional[int]):
         if as_of is not None:
@@ -484,8 +486,10 @@ def apply_as_of_filter(self, history_table: str, as_of: Optional[int]):
             self.params["as_of"] = as_of
             sub_fields = "max(issue) max_issue, time_type, time_value, `source`, `signal`, geo_type, geo_value"
             sub_group = "time_type, time_value, `source`, `signal`, geo_type, geo_value"
-            sub_condition = f"x.max_issue = {self.alias}.issue AND x.time_type = {self.alias}.time_type AND x.time_value = {self.alias}.time_value AND x.source = {self.alias}.source AND x.signal = {self.alias}.signal AND x.geo_type = {self.alias}.geo_type AND x.geo_value = {self.alias}.geo_value"
+            alias = self.alias
+            sub_condition = f"x.max_issue = {alias}.issue AND x.time_type = {alias}.time_type AND x.time_value = {alias}.time_value AND x.source = {alias}.source AND x.signal = {alias}.signal AND x.geo_type = {alias}.geo_type AND x.geo_value = {alias}.geo_value"
             self.subquery = f"JOIN (SELECT {sub_fields} FROM {self.table} WHERE {self.conditions_clause} AND {sub_condition_asof} GROUP BY {sub_group}) x ON {sub_condition}"
+        return self
 
     def set_fields(self, *fields: Iterable[str]) -> "QueryBuilder":
         self.fields = [f"{self.alias}.{field}" for field_list in fields for field in field_list]
@@ -497,6 +501,7 @@ def set_sort_order(self, *args: str):
         """
 
         self.order = [f"{self.alias}.{k} ASC" for k in args]
+        return self
 
     def with_max_issue(self, *args: str) -> "QueryBuilder":
         fields: List[str] = [f for f in args]