Skip to content

Commit 4d0c8ce

Browse files
authored
Merge pull request #178 from ioet/177-remove-unnecessary-queries
fix: #177 remove unnecesary queries from summaries endpoint
2 parents 9370863 + 9a2e55f commit 4d0c8ce

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed

tests/time_tracker_api/time_entries/time_entries_namespace_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ def test_summary_is_called_with_date_range_from_worked_time_module(
624624

625625
worked_time.date_range = Mock(return_value=worked_time.date_range())
626626
repository_find_all_mock = mocker.patch.object(
627-
time_entries_dao.repository, 'find_all', return_value=[]
627+
time_entries_dao.repository, 'find_all_entries', return_value=[]
628628
)
629629

630630
response = client.get(

time_tracker_api/time_entries/time_entries_model.py

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,27 @@ def create_sql_date_range_filter(date_range: dict) -> str:
157157
else:
158158
return ''
159159

160+
def find_all_entries(
161+
self,
162+
event_context: EventContext,
163+
conditions: dict = {},
164+
custom_sql_conditions: List[str] = [],
165+
date_range: dict = {},
166+
):
167+
custom_sql_conditions.append(
168+
self.create_sql_date_range_filter(date_range)
169+
)
170+
171+
custom_params = self.generate_params(date_range)
172+
time_entries = CosmosDBRepository.find_all(
173+
self,
174+
event_context=event_context,
175+
conditions=conditions,
176+
custom_sql_conditions=custom_sql_conditions,
177+
custom_params=custom_params,
178+
)
179+
return time_entries
180+
160181
def find_all(
161182
self,
162183
event_context: EventContext,
@@ -468,7 +489,7 @@ def get_worked_time(self, args: dict = {}):
468489
)
469490

470491
conditions = {"owner_id": event_ctx.user_id}
471-
time_entries = self.repository.find_all(
492+
time_entries = self.repository.find_all_entries(
472493
event_ctx,
473494
conditions=conditions,
474495
date_range=worked_time.date_range(),

0 commit comments

Comments
 (0)