fix: TT-242 refactory functions find all with id in list and review test functions (#294)

Author: kevinjlope

tests/time_tracker_api/activities/activities_model_test.py

@@ -16,7 +16,6 @@
 )
 def test_find_all_with_id_in_list(
     find_partition_key_value_mock,
-    create_sql_condition_for_visibility_mock,
     event_context: EventContext,
     activity_repository: ActivityCosmosDBRepository,
 ):
@@ -31,9 +30,10 @@ def test_find_all_with_id_in_list(
     activity_repository.container = Mock()
     activity_repository.container.query_items = query_items_mock
 
-    result = activity_repository.find_all_with_id_in_list(event_context, [expected_item])
+    result = activity_repository.find_all_with_id_in_list(
+        event_context, [expected_item]
+    )
 
-    create_sql_condition_for_visibility_mock.assert_called_once()
     find_partition_key_value_mock.assert_called_once()
     query_items_mock.assert_called_once()
 

time_tracker_api/activities/activities_model.py

@@ -67,15 +67,13 @@ def find_all_with_id_in_list(
         visible_only=True,
         mapper: Callable = None,
     ):
-        visibility = self.create_sql_condition_for_visibility(visible_only)
-        query_str = """
-            SELECT * FROM c
-            WHERE {condition}
-            {visibility_condition}
-            """.format(
-            condition=create_sql_in_condition("id", activity_ids),
-            visibility_condition=visibility,
+        query_builder = (
+            CosmosDBQueryBuilder()
+            .add_sql_in_condition('id', activity_ids)
+            .add_sql_visibility_condition(visible_only)
+            .build()
         )
+        query_str = query_builder.get_query()
 
         tenant_id_value = self.find_partition_key_value(event_context)
         result = self.container.query_items(