refactor: TT-180 changes variables (id_list to ids_list) and same log…

…ic in convert_list_to_tuple_string

tests/time_tracker_api/activities/activities_model_test.py

@@ -9,7 +9,7 @@
 
 
 @pytest.mark.parametrize(
-    "id_list,expected_result",
+    "activities_ids_list,expected_result",
     [
         (["id1"], "c.id IN ('id1')"),
         (["id1", "id2"], "c.id IN ('id1', 'id2')"),
@@ -18,10 +18,10 @@
 )
 def test_create_sql_in_condition(
     activity_repository: ActivityCosmosDBRepository,
-    id_list,
+    activities_ids_list,
     expected_result,
 ):
-    result = activity_repository.create_sql_in_condition(id_list)
+    result = activity_repository.create_sql_in_condition(activities_ids_list)
     assert expected_result == result
 
 

tests/utils/repository_test.py

@@ -4,24 +4,24 @@
 
 
 @pytest.mark.parametrize(
-    "id_list",
+    "ids_list",
     [
         123,
         (1, 2),
-        "id_list",
-        {"id_list": []},
+        "ids_list",
+        {"ids_list": []},
     ],
 )
-def test_validate_list(id_list):
+def test_validate_list(ids_list):
     try:
-        validate_list(id_list)
+        validate_list(ids_list)
     except Exception as e:
         assert type(e) is AssertionError
 
 
 @patch('utils.repository.validate_list')
 @pytest.mark.parametrize(
-    "id_list,expected_result",
+    "ids_list,expected_result",
     [
         (["id1"], "('id1')"),
         (["id1", "id2"], "('id1', 'id2')"),
@@ -30,10 +30,10 @@ def test_validate_list(id_list):
 )
 def test_convert_list_to_tuple_string(
     validate_list_mock,
-    id_list,
+    ids_list,
     expected_result,
 ):
-    result = convert_list_to_tuple_string(id_list)
+    result = convert_list_to_tuple_string(ids_list)
 
     validate_list_mock.assert_called_once()
     assert expected_result == result

time_tracker_api/activities/activities_model.py

@@ -55,15 +55,15 @@ def __init__(self):
             mapper=ActivityCosmosDBModel,
         )
 
-    def create_sql_in_condition(self, id_list):
-        id_values = convert_list_to_tuple_string(id_list)
+    def create_sql_in_condition(self, activities_ids_list):
+        id_values = convert_list_to_tuple_string(activities_ids_list)
 
         return "c.id IN {value_condition}".format(value_condition=id_values)
 
     def find_all_with_id_in_list(
         self,
         event_context: EventContext,
-        id_list: List[str],
+        activities_ids_list: List[str],
         visible_only=True,
         mapper: Callable = None,
     ):
@@ -73,7 +73,7 @@ def find_all_with_id_in_list(
             WHERE {condition}
             {visibility_condition}
             """.format(
-            condition=self.create_sql_in_condition(id_list),
+            condition=self.create_sql_in_condition(activities_ids_list),
             visibility_condition=visibility,
         )
 
@@ -93,12 +93,12 @@ def __init__(self, repository):
 
     def get_all_with_id_in_list(
         self,
-        id_list,
+        activities_ids_list,
     ):
         event_ctx = self.create_event_context("read-many")
         activities_list = self.repository.find_all_with_id_in_list(
             event_ctx,
-            id_list,
+            activities_ids_list,
         )
         return activities_list
 

utils/repository.py

@@ -1,11 +1,13 @@
-def convert_list_to_tuple_string(id_list):
-    validate_list(id_list)
+def convert_list_to_tuple_string(ids_list):
+    validate_list(ids_list)
     id_value = (
-        f"('{id_list[0]}')" if len(id_list) == 1 else str(tuple(id_list))
+        str(tuple(ids_list)).replace(",", "")
+        if len(ids_list) == 1
+        else str(tuple(ids_list))
     )
     return id_value
 
 
-def validate_list(id_list):
-    assert isinstance(id_list, list)
-    assert len(id_list) > 0
+def validate_list(ids_list):
+    assert isinstance(ids_list, list)
+    assert len(ids_list) > 0