Skip to content

fix: #177 remove unnecesary queries from summaries endpoint #178

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
enriquezrene merged 2 commits into from
Jul 1, 2020
Merged

fix: #177 remove unnecesary queries from summaries endpoint #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6e3c55
fix: #177 remove unnecesary queries from summaries endpoint
enriquezrene Jul 1, 2020
9a2e55f
fix: #177 remove unnecesary queries from summaries endpoint
enriquezrene Jul 1, 2020
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
2 changes: 1 addition & 1 deletion tests/time_tracker_api/time_entries/time_entries_namespace_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ def test_summary_is_called_with_date_range_from_worked_time_module(

worked_time.date_range = Mock(return_value=worked_time.date_range())
repository_find_all_mock = mocker.patch.object(
time_entries_dao.repository, 'find_all', return_value=[]
time_entries_dao.repository, 'find_all_entries', return_value=[]
)

response = client.get(
Expand Down
23 changes: 22 additions & 1 deletion time_tracker_api/time_entries/time_entries_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,27 @@ def create_sql_date_range_filter(date_range: dict) -> str:
else:
return ''

def find_all_entries(
self,
event_context: EventContext,
conditions: dict = {},
custom_sql_conditions: List[str] = [],
date_range: dict = {},
):
custom_sql_conditions.append(
self.create_sql_date_range_filter(date_range)
)

custom_params = self.generate_params(date_range)
time_entries = CosmosDBRepository.find_all(
self,
event_context=event_context,
conditions=conditions,
custom_sql_conditions=custom_sql_conditions,
custom_params=custom_params,
)
return time_entries

def find_all(
self,
event_context: EventContext,
Expand Down Expand Up @@ -461,7 +482,7 @@ def get_worked_time(self, args: dict = {}):
)

conditions = {"owner_id": event_ctx.user_id}
time_entries = self.repository.find_all(
time_entries = self.repository.find_all_entries(
event_ctx,
conditions=conditions,
date_range=worked_time.date_range(),
Expand Down