fix: TT-220 code adjustments

Author: Pablo

time_tracker_api/activities/activities_model.py

@@ -89,7 +89,7 @@ def find_all_with_id_in_list(
     def find_all(
         self,
         event_context: EventContext,
-        conditions: dict = None,
+        conditions,
         visible_only=True,
         mapper: Callable = None,
         max_count=None,

time_tracker_api/projects/projects_model.py

@@ -71,14 +71,12 @@ def __init__(self):
     def find_all(
         self,
         event_context: EventContext,
-        conditions: dict = None,
+        conditions,
         visible_only=True,
         mapper: Callable = None,
         project_ids: List[str] = None,
         customer_ids: List[str] = None,
     ):
-        params = self.generate_params(conditions) if conditions else []
-
         query_builder = (
             CosmosDBQueryBuilder()
             .add_sql_where_equal_condition(conditions)
@@ -89,6 +87,7 @@ def find_all(
         )
         query_str = query_builder.get_query()
         tenant_id_value = self.find_partition_key_value(event_context)
+        params = query_builder.get_parameters()
         result = self.container.query_items(
             query=query_str,
             parameters=params,

time_tracker_api/time_entries/time_entries_repository.py

@@ -152,19 +152,7 @@ def find_all(
         mapper: Callable = None,
     ):
         max_count = self.get_page_size_or(max_count)
-
-        params = [
-            {"name": "@offset", "value": offset},
-            {"name": "@limit", "value": max_count},
-        ]
-
         date_range = date_range if date_range else {}
-        date_range_params = (
-            self.generate_params(date_range) if date_range else []
-        )
-
-        params.extend(self.generate_params(conditions) if conditions else [])
-        params.extend(date_range_params)
 
         query_builder = (
             CosmosDBQueryBuilder()
@@ -180,6 +168,7 @@ def find_all(
         )
 
         query_str = query_builder.get_query()
+        params = query_builder.get_parameters()
         tenant_id_value = self.find_partition_key_value(event_context)
         result = self.container.query_items(
             query=query_str,

utils/query_builder.py

@@ -109,6 +109,12 @@ def __build_order_by(self):
 
     def __build_date_range(self):
         if self.date_range:
+            self.parameters.append(
+                {'name': '@start_date', 'value': self.date_range['start_date']}
+            )
+            self.parameters.append(
+                {'name': '@end_date', 'value': self.date_range['end_date']}
+            )
             and_keyword = "AND " if len(self.where_conditions) > 0 else ""
             return f"{and_keyword}((c.start_date BETWEEN @start_date AND @end_date) OR (c.end_date BETWEEN @start_date AND @end_date))"
         else: