Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: TT-180 add test convert list to tuple string
  • Loading branch information
Angeluz-07 committed Mar 16, 2021
commit 0acdb5cc08e483886bda157bc31fa9b9edaf9af5
23 changes: 23 additions & 0 deletions tests/time_tracker_api/activities/activities_model_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,29 @@ def test_validate_list(
assert type(e) is AssertionError


@patch(
'time_tracker_api.activities.activities_model.ActivityCosmosDBRepository.validate_list'
)
@pytest.mark.parametrize(
"id_list,expected_result",
[
(["id1"], '("id1")'),
(["id1", "id2"], "('id1', 'id2')"),
(["id1", "id2", "id3", "id4"], "('id1', 'id2', 'id3', 'id4')"),
],
)
def test_convert_list_to_tuple_string(
validate_list_mock,
activity_repository: ActivityCosmosDBRepository,
id_list,
expected_result,
):
result = activity_repository.convert_list_to_tuple_string(id_list)

validate_list_mock.assert_called_once()
assert expected_result == result


@pytest.mark.parametrize(
"id_list , exception",
[
Expand Down
22 changes: 7 additions & 15 deletions time_tracker_api/activities/activities_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ class ActivityDao(CRUDDao):
container_definition = {
'id': 'activity',
'partition_key': PartitionKey(path='/tenant_id'),
'unique_key_policy': {
'uniqueKeys': [
{'paths': ['/name', '/deleted']},
]
},
'unique_key_policy': {'uniqueKeys': [{'paths': ['/name', '/deleted']},]},
}


Expand Down Expand Up @@ -55,16 +51,15 @@ def __init__(self):
)

def create_sql_in_condition(self, id_list):
id_values = self.convert_list_to_tuple_or_string(id_list)
id_values = self.convert_list_to_tuple_string(id_list)

return "c.id IN {value_condition}".format(value_condition=id_values)

def convert_list_to_tuple_or_string(self, id_list):
def convert_list_to_tuple_string(self, id_list):
self.validate_list(id_list)
id_value = (
'("%s")' % id_list[0] if len(id_list) == 1 else tuple(id_list)
f'("{id_list[0]}")' if len(id_list) == 1 else str(tuple(id_list))
)

return id_value

def validate_list(self, id_list):
Expand All @@ -90,8 +85,7 @@ def find_all_with_id_in_list(

tenant_id_value = self.find_partition_key_value(event_context)
result = self.container.query_items(
query=query_str,
partition_key=tenant_id_value,
query=query_str, partition_key=tenant_id_value,
)

function_mapper = self.get_mapper_or_dict(mapper)
Expand All @@ -103,13 +97,11 @@ def __init__(self, repository):
CosmosDBDao.__init__(self, repository)

def get_all_with_id_in_list(
self,
id_list,
self, id_list,
):
event_ctx = self.create_event_context("read-many")
activities_list = self.repository.find_all_with_id_in_list(
event_ctx,
id_list,
event_ctx, id_list,
)
return activities_list

Expand Down