#111: Match style guides

ral-facilities · Oct 31, 2019 · 5721181 · 5721181
1 parent ce639cf
commit 5721181
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/common/database_helpers.py b/common/database_helpers.py
@@ -164,7 +164,6 @@ def _set_filter_fields(self):
             self.included_field = self.field.split(".")[1]
             self.field = self.field.split(".")[0]
 
-
     def apply_filter(self, query):
         try:
             field = getattr(query.table, self.field)
@@ -554,15 +553,15 @@ def get_investigations_for_user_count(user_id, filters):
 class InstrumentFacilityCyclesQuery(ReadQuery):
     def __init__(self, instrument_id):
         super().__init__(FACILITYCYCLE)
-        investigationInstrument = aliased(INSTRUMENT)
+        investigation_instrument = aliased(INSTRUMENT)
         self.base_query = self.base_query \
             .join(FACILITYCYCLE.FACILITY) \
             .join(FACILITY.INSTRUMENT) \
             .join(FACILITY.INVESTIGATION) \
             .join(INVESTIGATION.INVESTIGATIONINSTRUMENT) \
-            .join(investigationInstrument, INVESTIGATIONINSTRUMENT.INSTRUMENT) \
+            .join(investigation_instrument, INVESTIGATIONINSTRUMENT.INSTRUMENT) \
             .filter(INSTRUMENT.ID == instrument_id) \
-            .filter(investigationInstrument.ID == INSTRUMENT.ID) \
+            .filter(investigation_instrument.ID == INSTRUMENT.ID) \
             .filter(INVESTIGATION.STARTDATE >= FACILITYCYCLE.STARTDATE) \
             .filter(INVESTIGATION.STARTDATE <= FACILITYCYCLE.ENDDATE)
 
@@ -593,16 +592,16 @@ def get_facility_cycles_for_instrument_count(instrument_id, filters):
 class InstrumentFacilityCycleInvestigationsQuery(ReadQuery):
     def __init__(self, instrument_id, facility_cycle_id):
         super().__init__(INVESTIGATION)
-        investigationInstrument = aliased(INSTRUMENT)
+        investigation_instrument = aliased(INSTRUMENT)
         self.base_query = self.base_query \
             .join(INVESTIGATION.FACILITY) \
             .join(FACILITY.FACILITYCYCLE) \
             .join(FACILITY.INSTRUMENT) \
             .join(INVESTIGATION.INVESTIGATIONINSTRUMENT) \
-            .join(investigationInstrument, INVESTIGATIONINSTRUMENT.INSTRUMENT) \
+            .join(investigation_instrument, INVESTIGATIONINSTRUMENT.INSTRUMENT) \
             .filter(INSTRUMENT.ID == instrument_id) \
             .filter(FACILITYCYCLE.ID == facility_cycle_id) \
-            .filter(investigationInstrument.ID == INSTRUMENT.ID) \
+            .filter(investigation_instrument.ID == INSTRUMENT.ID) \
             .filter(INVESTIGATION.STARTDATE >= FACILITYCYCLE.STARTDATE) \
             .filter(INVESTIGATION.STARTDATE <= FACILITYCYCLE.ENDDATE)