Skip to content

Tt 180 create method get activities by id list in activitydao #265

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 12 commits into from
Mar 18, 2021
Merged

Tt 180 create method get activities by id list in activitydao #265

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c56d070
refactor: TT-180 add methods find_all_with_id_in_list and get_all_wit…
kellycastrof Mar 13, 2021
c9ae125
refactor: TT-180 changes in activity test
kellycastrof Mar 16, 2021
eaf5614
test: TT-180 add test validate list
Angeluz-07 Mar 16, 2021
0acdb5c
test: TT-180 add test convert list to tuple string
Angeluz-07 Mar 16, 2021
b0088b0
test: TT-180 add test create sql in condition
Angeluz-07 Mar 16, 2021
3f44227
test: TT-180 add test find_all, in progress
Angeluz-07 Mar 16, 2021
690af81
test: TT-180 add test find_all_with_id_in_list
Angeluz-07 Mar 16, 2021
98c883f
test: TT-180 remove unused imports, fix quotes
Angeluz-07 Mar 16, 2021
c94b511
refactor: TT-180 move convert_list_to_tuple_string and validate_list …
kellycastrof Mar 17, 2021
b095f56
refactor: TT-180 delete unused method in conftest
kellycastrof Mar 17, 2021
79901ce
refactor: TT-180 changes variables (id_list to ids_list) and same log…
kellycastrof Mar 17, 2021
94f0134
refactor: TT-180 delete method validate_test, rename activty_ids
kellycastrof Mar 18, 2021
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 remove unused imports, fix quotes
  • Loading branch information
@Angeluz-07
Angeluz-07 committed Mar 16, 2021
commit 98c883fd964f5f29732245208316459d1bd72ab5
6 changes: 2 additions & 4 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
@@ -1,7 +1,5 @@
from unittest.mock import Mock, patch
import pytest
from faker import Faker
from typing import List

from commons.data_access_layer.database import EventContext
from time_tracker_api.activities.activities_model import (
Expand All @@ -28,7 +26,7 @@ def test_validate_list(
@pytest.mark.parametrize(
"id_list,expected_result",
[
(["id1"], '("id1")'),
(["id1"], "('id1')"),
(["id1", "id2"], "('id1', 'id2')"),
(["id1", "id2", "id3", "id4"], "('id1', 'id2', 'id3', 'id4')"),
],
Expand All @@ -48,7 +46,7 @@ def test_convert_list_to_tuple_string(
@pytest.mark.parametrize(
"id_list,expected_result",
[
(["id1"], 'c.id IN ("id1")'),
(["id1"], "c.id IN ('id1')"),
(["id1", "id2"], "c.id IN ('id1', 'id2')"),
(["id1", "id2", "id3", "id4"], "c.id IN ('id1', 'id2', 'id3', 'id4')"),
],
Expand Down
2 changes: 1 addition & 1 deletion time_tracker_api/activities/activities_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def create_sql_in_condition(self, id_list):
def convert_list_to_tuple_string(self, id_list):
self.validate_list(id_list)
id_value = (
f'("{id_list[0]}")' if len(id_list) == 1 else str(tuple(id_list))
f"('{id_list[0]}')" if len(id_list) == 1 else str(tuple(id_list))
)
return id_value

Expand Down