From d6e3c55e2d19059d91d71f8825dd830d963e782b Mon Sep 17 00:00:00 2001 From: Rene Enriquez Date: Wed, 1 Jul 2020 09:38:18 -0500 Subject: [PATCH 1/2] fix: #177 remove unnecesary queries from summaries endpoint --- .../time_entries/time_entries_model.py | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/time_tracker_api/time_entries/time_entries_model.py b/time_tracker_api/time_entries/time_entries_model.py index 98b524cf..d52435a9 100644 --- a/time_tracker_api/time_entries/time_entries_model.py +++ b/time_tracker_api/time_entries/time_entries_model.py @@ -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, @@ -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(), From 9a2e55f18c12adf2ee1d1e71886200fd82321aec Mon Sep 17 00:00:00 2001 From: Rene Enriquez Date: Wed, 1 Jul 2020 09:52:31 -0500 Subject: [PATCH 2/2] fix: #177 remove unnecesary queries from summaries endpoint --- .../time_entries/time_entries_namespace_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/time_tracker_api/time_entries/time_entries_namespace_test.py b/tests/time_tracker_api/time_entries/time_entries_namespace_test.py index 40e3f4ea..214f130b 100644 --- a/tests/time_tracker_api/time_entries/time_entries_namespace_test.py +++ b/tests/time_tracker_api/time_entries/time_entries_namespace_test.py @@ -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(