From 6bbabda3f382c0e80de72da5e092c56a923308b3 Mon Sep 17 00:00:00 2001 From: Keiran Price Date: Tue, 10 Sep 2019 10:10:53 +0100 Subject: [PATCH] #34: Change how filters are set --- common/database_helpers.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/common/database_helpers.py b/common/database_helpers.py index 34ae9792..acaeb728 100644 --- a/common/database_helpers.py +++ b/common/database_helpers.py @@ -485,16 +485,9 @@ def _get_start_and_end_date_filters(self, instrument_id): :param instrument_id: the id of the instrument :return: """ - investigations = self._get_investigations_for_instrument(instrument_id) - start_date = datetime.datetime(3000, 1, 1) - end_date = datetime.datetime(1, 1, 1) - for investigation in investigations: - if investigation.STARTDATE < start_date: - start_date = investigation.STARTDATE - if investigation.ENDDATE > end_date: - end_date = investigation.ENDDATE - self.start_date_filter = WhereFilter("STARTDATE", start_date, "gte") - self.end_date_filter = WhereFilter("STARTDATE", end_date, "lte") + def set_filters(self, filters): + for query_filter in filters: + self.filters.append(QueryFilterFactory.get_query_filter(query_filter)) def _get_investigations_for_instrument(self): """