Skip to content

fix: TT-242 refactor functions find_all_with_id_in list #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 31, 2021
Merged

fix: TT-242 refactor functions find_all_with_id_in list #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
fix: TT-242 refactory functions find all with id in list and review t… 
…est functions
  • Loading branch information
@kevinjlope
kevinjlope committed May 26, 2021
commit 5552535dd47aa2604eca8dc6cb0cddd0dae46fe9
6 changes: 3 additions & 3 deletions tests/time_tracker_api/activities/activities_model_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
):
Expand All @@ -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()

Expand Down
14 changes: 6 additions & 8 deletions time_tracker_api/activities/activities_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down