refactor: TT-180 delete method validate_test, rename activty_ids

tests/utils/repository_test.py

@@ -1,5 +1,5 @@
 from unittest.mock import patch
-from utils.repository import convert_list_to_tuple_string, validate_list
+from utils.repository import convert_list_to_tuple_string
 import pytest
 
 
@@ -12,14 +12,13 @@
         {"ids_list": []},
     ],
 )
-def test_validate_list(ids_list):
+def test_convert_list_to_tuple_string_should_fail(ids_list):
     try:
-        validate_list(ids_list)
+        convert_list_to_tuple_string(ids_list)
     except Exception as e:
         assert type(e) is AssertionError
 
 
-@patch('utils.repository.validate_list')
 @pytest.mark.parametrize(
     "ids_list,expected_result",
     [
@@ -28,12 +27,10 @@ def test_validate_list(ids_list):
         (["id1", "id2", "id3", "id4"], "('id1', 'id2', 'id3', 'id4')"),
     ],
 )
-def test_convert_list_to_tuple_string(
-    validate_list_mock,
+def test_convert_list_to_tuple_string_should_success(
     ids_list,
     expected_result,
 ):
     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, activities_ids_list):
-        id_values = convert_list_to_tuple_string(activities_ids_list)
+    def create_sql_in_condition(self, activity_ids):
+        id_values = convert_list_to_tuple_string(activity_ids)
 
         return "c.id IN {value_condition}".format(value_condition=id_values)
 
     def find_all_with_id_in_list(
         self,
         event_context: EventContext,
-        activities_ids_list: List[str],
+        activity_ids: 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(activities_ids_list),
+            condition=self.create_sql_in_condition(activity_ids),
             visibility_condition=visibility,
         )
 
@@ -93,14 +93,13 @@ def __init__(self, repository):
 
     def get_all_with_id_in_list(
         self,
-        activities_ids_list,
+        activity_ids,
     ):
         event_ctx = self.create_event_context("read-many")
-        activities_list = self.repository.find_all_with_id_in_list(
+        return self.repository.find_all_with_id_in_list(
             event_ctx,
-            activities_ids_list,
+            activity_ids,
         )
-        return activities_list
 
 
 def create_dao() -> ActivityDao:

utils/repository.py

@@ -1,13 +1,9 @@
 def convert_list_to_tuple_string(ids_list):
-    validate_list(ids_list)
-    id_value = (
+    assert isinstance(ids_list, list)
+    assert len(ids_list) > 0
+    result = (
         str(tuple(ids_list)).replace(",", "")
         if len(ids_list) == 1
         else str(tuple(ids_list))
     )
-    return id_value
-
-
-def validate_list(ids_list):
-    assert isinstance(ids_list, list)
-    assert len(ids_list) > 0
+    return result