final tweaks

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, time_values_to_ranges
+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
 
 
 def _parse_common_multi_arg(key: str) -> List[Tuple[str, Union[bool, Sequence[str]]]]:
@@ -129,6 +129,16 @@ def count(self) -> float:
             return sum(1 if isinstance(v, int) else weeks_in_range(v) for v in self.time_values)
         return sum(1 if isinstance(v, int) else days_in_range(v) for v in self.time_values)
 
+    def to_ranges(self):
+        """
+        returns this pair with times converted to ranges
+        """
+        if isinstance(self.time_values, bool):
+            return TimePair(self.time_type, self.time_values)
+        if self.time_type == 'week':
+            return TimePair(self.time_type, weeks_to_ranges(self.time_values))
+        return TimePair(self.time_type, days_to_ranges(self.time_values))
+
 
 def _verify_range(start: int, end: int) -> Union[int, Tuple[int, int]]:
     if start == end:
@@ -226,7 +236,7 @@ def parse_time_arg(key: str = "time") -> Optional[TimePair]:
             return time_pair
         else:
             merged.extend(time_pair.time_values)
-    return TimePair(time_pairs[0].time_type, time_values_to_ranges(merged))
+    return TimePair(time_pairs[0].time_type, merged).to_ranges()
 
 
 def parse_single_time_arg(key: str) -> TimePair:

src/server/_query.py

@@ -22,7 +22,7 @@
 from ._exceptions import DatabaseErrorException
 from ._validate import extract_strings
 from ._params import GeoPair, SourceSignalPair, TimePair
-from .utils import time_values_to_ranges, days_to_ranges, weeks_to_ranges, TimeValues
+from .utils import time_values_to_ranges, TimeValues
 
 
 def date_string(value: int) -> str:
@@ -181,6 +181,7 @@ def filter_time_pair(
     """
     returns the SQL sub query to filter by the given time pair
     """
+    # safety path; should normally not be reached as time pairs are enforced by the API
     if not pair:
         return "FALSE"
 
@@ -189,7 +190,7 @@ def filter_time_pair(
     if isinstance(pair.time_values, bool) and pair.time_values:
         parts =  f"{type_field} = :{type_param}"
     else:
-        ranges = weeks_to_ranges(pair.time_values) if pair.is_week else days_to_ranges(pair.time_values)
+        ranges = pair.to_ranges().time_values
         parts = f"({type_field} = :{type_param} AND {filter_integers(time_field, ranges, type_param, params)})"
 
     return f"({parts})"