fix: TT-201 missed and bad arguments and order by params not supporte…

…d by cosmosdb

time_tracker_api/time_entries/time_entries_dao.py

@@ -227,7 +227,7 @@ def update(self, id, data: dict, description=None):
         event_ctx = self.create_event_context("update", description)
 
         if data.get('update_last_entry_if_overlap'):
-            self.repository.update_last_entry(data)
+            self.repository.update_last_entry(data, event_ctx)
 
         time_entry = self.repository.find(id, event_ctx)
         self.check_whether_current_user_owns_item(time_entry)

time_tracker_api/time_entries/time_entries_repository.py

@@ -274,7 +274,7 @@ def update_last_entry(self, data: dict, event_context: EventContext):
         start_date = str_to_datetime(start_date)
 
         if start_date < end_date:
-            update_date = {'end_date': start_date}
+            update_date = {'end_date': data.get('start_date')}
             return self.partial_update(
                 last_entry.id, update_date, event_context
             )

utils/query_builder.py

@@ -19,7 +19,7 @@ def __init__(self):
         self.where_conditions = []
         self.limit = None
         self.offset = None
-        self.orderBy = False
+        self.order_by = tuple()
 
     def add_select_conditions(self, columns: List[str] = None):
         columns = columns if columns else ["*"]
@@ -58,7 +58,7 @@ def add_sql_offset_condition(self, offset):
         return self
 
     def add_sql_order_by_condition(self, attribute: str, order: Order):
-        self.orderBy = True
+        self.order_by = (attribute, order.name)
         self.parameters.append({'name': '@attribute', 'value': attribute})
         self.parameters.append({'name': '@order', 'value': order.name})
         return self
@@ -89,8 +89,9 @@ def __build_limit(self):
             return ""
 
     def __build_order_By(self):
-        if self.orderBy:
-            return "ORDER BY c.@attribute @order"
+        if self.order_by:
+            attribute, order = self.order_by
+            return f"ORDER BY c.{attribute} {order}"
         else:
             return ""