#34: Minor refactor

ral-facilities · Sep 10, 2019 · 957cf3a · 957cf3a
1 parent 0c9046a
commit 957cf3a
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/common/database_helpers.py b/common/database_helpers.py
@@ -475,12 +475,13 @@ def get_investigations_for_user_count(user_id, filters):
 class InstrumentFacilityCyclesQuery(ReadQuery):
     def __init__(self, instrument_id):
         super().__init__(FACILITYCYCLE)
-        self.base_query = self.base_query.join(FACILITYCYCLE.FACILITY)\
-                                    .join(FACILITY.INSTRUMENT)\
-                                    .join(INSTRUMENT.INVESTIGATIONINSTRUMENT)\
-                                    .join(INVESTIGATIONINSTRUMENT.INVESTIGATION)\
-                                    .filter(INSTRUMENT.ID == instrument_id)\
-                                    .filter(INVESTIGATION.STARTDATE >= FACILITYCYCLE.STARTDATE)\
+        self.base_query = self.base_query\
+            .join(FACILITYCYCLE.FACILITY) \
+            .join(FACILITY.INSTRUMENT) \
+            .join(INSTRUMENT.INVESTIGATIONINSTRUMENT) \
+            .join(INVESTIGATIONINSTRUMENT.INVESTIGATION) \
+            .filter(INSTRUMENT.ID == instrument_id) \
+            .filter(INVESTIGATION.STARTDATE >= FACILITYCYCLE.STARTDATE) \
                                     .filter(INVESTIGATION.STARTDATE <= FACILITYCYCLE.ENDDATE)
 
 
@@ -495,6 +496,7 @@ def get_facility_cycles_for_instrument(instrument_id, filters):
     filter_handler = FilterOrderHandler()
     return get_filtered_read_query_results(filter_handler, filters, query)
 
+
 def get_facility_cycles_for_instrument_count(instrument_id, filters):
     """
     Given an instrument_id get the facility cycles count where the instrument has investigations that occur within