From 1ee4f0ef50cad340b3f3aebad7fd6ab27b72771d Mon Sep 17 00:00:00 2001 From: Matthew Richards Date: Fri, 9 Oct 2020 16:45:02 +0000 Subject: [PATCH] #146: Create skeleton functions for ISIS endpoints for ICAT backend --- common/icat/backend.py | 25 ++++++++++++++++++------- common/icat/helpers.py | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/common/icat/backend.py b/common/icat/backend.py index 7c34a1a7..925354b6 100644 --- a/common/icat/backend.py +++ b/common/icat/backend.py @@ -18,6 +18,10 @@ get_first_result_with_filters, update_entities, create_entities, + get_facility_cycles_for_instrument, + get_facility_cycles_for_instrument_count, + get_investigations_for_instrument_in_facility_cycle, + get_investigations_for_instrument_in_facility_cycle_count, ) from common.config import config @@ -125,28 +129,35 @@ def update_with_id(self, session_id, table, id_, data): def get_facility_cycles_for_instrument_with_filters( self, session_id, instrument_id, filters ): - pass + self.client.sessionId = session_id + return get_facility_cycles_for_instrument(self.client, instrument_id, filters) @requires_session_id @queries_records def get_facility_cycles_for_instrument_count_with_filters( self, session_id, instrument_id, filters ): - pass - # return get_facility_cycles_for_instrument_count(instrument_id, filters) + self.client.sessionId = session_id + return get_facility_cycles_for_instrument_count( + self.client, instrument_id, filters + ) @requires_session_id @queries_records def get_investigations_for_instrument_in_facility_cycle_with_filters( self, session_id, instrument_id, facilitycycle_id, filters ): - pass - # return get_investigations_for_instrument_in_facility_cycle(instrument_id, facilitycycle_id, filters) + self.client.sessionId = session_id + return get_investigations_for_instrument_in_facility_cycle( + self.client, instrument_id, facilitycycle_id, filters + ) @requires_session_id @queries_records def get_investigations_for_instrument_in_facility_cycle_count_with_filters( self, session_id, instrument_id, facilitycycle_id, filters ): - pass - # return get_investigations_for_instrument_in_facility_cycle_count(instrument_id, facilitycycle_id, filters) + self.client.sessionId = session_id + return get_investigations_for_instrument_in_facility_cycle_count( + self.client, instrument_id, facilitycycle_id, filters + ) diff --git a/common/icat/helpers.py b/common/icat/helpers.py index 8b521efb..a01c762c 100644 --- a/common/icat/helpers.py +++ b/common/icat/helpers.py @@ -459,3 +459,35 @@ def create_entities(client, table_name, data): created_data.append(get_entity_by_id(client, table_name, new_entity.id, True)) return created_data + + +def get_facility_cycles_for_instrument(client, instrument_id, filters): + """ + TODO - Add docstring + """ + pass + + +def get_facility_cycles_for_instrument_count(client, instrument_id, filters): + """ + TODO - Add docstring + """ + pass + + +def get_investigations_for_instrument_in_facility_cycle( + client, instrument_id, facilitycycle_id, filters +): + """ + TODO - Add docstring + """ + pass + + +def get_investigations_for_instrument_in_facility_cycle_count( + client, instrument_id, facilitycycle_id, filters +): + """ + TODO - Add docstring + """ + pass