Merge pull request #7 from ral-facilities/6_entities_endpoints_dont_work

Fixes broken get method on entities endpoints

common/database_helpers.py

@@ -1,4 +1,3 @@
-import json
 import datetime
 
 from sqlalchemy import create_engine

src/resources/entities/applications_endpoints.py

@@ -11,7 +11,7 @@ class Applications(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(APPLICATION, request.json), 200
+        return get_rows_by_filter(APPLICATION, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/datacollection_datafiles_endpoints.py

@@ -11,7 +11,7 @@ class DataCollectionDatafiles(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(DATACOLLECTIONDATAFILE, request.json), 200
+        return get_rows_by_filter(DATACOLLECTIONDATAFILE, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/datacollection_datasets_endpoints.py

@@ -11,7 +11,7 @@ class DataCollectionDatasets(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(DATACOLLECTIONDATASET, request.json), 200
+        return get_rows_by_filter(DATACOLLECTIONDATASET, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/datacollection_parameters_endpoints.py

@@ -11,7 +11,7 @@ class DataCollectionParameters(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(DATACOLLECTIONPARAMETER, request.json), 200
+        return get_rows_by_filter(DATACOLLECTIONPARAMETER, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/datacollections_endpoints.py

@@ -11,7 +11,7 @@ class DataCollections(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(DATACOLLECTION, request.json), 200
+        return get_rows_by_filter(DATACOLLECTION, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/datafile_formats_endpoints.py

@@ -11,7 +11,7 @@ class DatafileFormats(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(DATAFILEFORMAT, request.json), 200
+        return get_rows_by_filter(DATAFILEFORMAT, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/datafile_parameters_endpoints.py

@@ -11,7 +11,7 @@ class DatafileParameters(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(DATAFILEPARAMETER, request.json), 200
+        return get_rows_by_filter(DATAFILEPARAMETER, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/datafiles_endpoints.py

@@ -11,8 +11,7 @@ class Datafiles(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        filters = get_filters_from_query_string()
-        return get_rows_by_filter(DATAFILE, filters), 200
+        return get_rows_by_filter(DATAFILE, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/dataset_type_endpoints.py

@@ -11,7 +11,7 @@ class DatasetTypes(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(DATASETTYPE, request.json), 200
+        return get_rows_by_filter(DATASETTYPE, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/datasets_endpoints.py

@@ -11,7 +11,7 @@ class Datasets(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(DATASET, request.json), 200
+        return get_rows_by_filter(DATASET, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/facilities_endpoints.py

@@ -11,7 +11,7 @@ class Facilities(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(FACILITY, request.json), 200
+        return get_rows_by_filter(FACILITY, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/facility_cycles_endpoints.py

@@ -11,7 +11,7 @@ class FacilityCycles(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(FACILITYCYCLE, request.json), 200
+        return get_rows_by_filter(FACILITYCYCLE, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/groupings_endpoints.py

@@ -11,7 +11,7 @@ class Groupings(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(GROUPING, request.json), 200
+        return get_rows_by_filter(GROUPING, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/instrument_scientists_endpoints.py

@@ -11,7 +11,7 @@ class InstrumentScientists(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(INSTRUMENTSCIENTIST, request.json), 200
+        return get_rows_by_filter(INSTRUMENTSCIENTIST, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/instruments_endpoints.py

@@ -11,7 +11,7 @@ class Instruments(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(INSTRUMENT, request.json), 200
+        return get_rows_by_filter(INSTRUMENT, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/investigation_groups_endpoints.py

@@ -11,7 +11,7 @@ class InvestigationGroups(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(INVESTIGATIONGROUP, request.json), 200
+        return get_rows_by_filter(INVESTIGATIONGROUP, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/investigation_instruments_endpoints.py

@@ -11,7 +11,7 @@ class InvestigationInstruments(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(INVESTIGATIONINSTRUMENT, request.json), 200
+        return get_rows_by_filter(INVESTIGATIONINSTRUMENT, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/investigation_parameters_endpoints.py

@@ -11,7 +11,7 @@ class InvestigationParameters(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(INVESTIGATIONPARAMETER, request.json), 200
+        return get_rows_by_filter(INVESTIGATIONPARAMETER, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/investigation_types_endpoints.py

@@ -11,7 +11,7 @@ class InvestigationTypes(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(INVESTIGATIONTYPE, request.json), 200
+        return get_rows_by_filter(INVESTIGATIONTYPE, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/investigation_users_endpoints.py

@@ -11,7 +11,7 @@ class InvestigationUsers(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(INVESTIGATIONUSER, request.json), 200
+        return get_rows_by_filter(INVESTIGATIONUSER, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/investigations_endpoints.py

@@ -11,7 +11,7 @@ class Investigations(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(INVESTIGATION, request.json), 200
+        return get_rows_by_filter(INVESTIGATION, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/jobs_endpoints.py

@@ -11,7 +11,7 @@ class Jobs(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(JOB, request.json), 200
+        return get_rows_by_filter(JOB, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/keywords_endpoints.py

@@ -11,7 +11,7 @@ class Keywords(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(KEYWORD, request.json), 200
+        return get_rows_by_filter(KEYWORD, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/parameter_types_endpoints.py

@@ -11,7 +11,7 @@ class ParameterTypes(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(PARAMETERTYPE, request.json), 200
+        return get_rows_by_filter(PARAMETERTYPE, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/permissible_string_values_endpoints.py

@@ -11,7 +11,7 @@ class PermissibleStringValues(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(PERMISSIBLESTRINGVALUE, request.json), 200
+        return get_rows_by_filter(PERMISSIBLESTRINGVALUE, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/public_steps_endpoints.py

@@ -11,7 +11,7 @@ class PublicSteps(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(PUBLICSTEP, request.json), 200
+        return get_rows_by_filter(PUBLICSTEP, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/publications_endpoints.py

@@ -11,7 +11,7 @@ class Publications(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(PUBLICATION, request.json), 200
+        return get_rows_by_filter(PUBLICATION, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/related_datafiles_endpoints.py

@@ -11,7 +11,7 @@ class RelatedDatafiles(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(RELATEDDATAFILE, request.json), 200
+        return get_rows_by_filter(RELATEDDATAFILE, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/rules_endpoints.py

@@ -11,7 +11,7 @@ class Rules(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(RULE, request.json), 200
+        return get_rows_by_filter(RULE, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/sample_parameters_endpoints.py

@@ -11,7 +11,7 @@ class SampleParameters(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(SAMPLEPARAMETER, request.json), 200
+        return get_rows_by_filter(SAMPLEPARAMETER, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/sample_types_endpoints.py

@@ -11,7 +11,7 @@ class SampleTypes(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(SAMPLETYPE, request.json), 200
+        return get_rows_by_filter(SAMPLETYPE, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/samples_endpoints.py

@@ -11,7 +11,7 @@ class Samples(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(SAMPLE, request.json), 200
+        return get_rows_by_filter(SAMPLE, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/shifts_endpoints.py

@@ -11,7 +11,7 @@ class Shifts(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(SHIFT, request.json), 200
+        return get_rows_by_filter(SHIFT, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/studies_endpoints.py

@@ -11,7 +11,7 @@ class Studies(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(STUDY, request.json), 200
+        return get_rows_by_filter(STUDY, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/study_investigations_endpoints.py

@@ -11,7 +11,7 @@ class StudyInvestigations(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(STUDYINVESTIGATION, request.json), 200
+        return get_rows_by_filter(STUDYINVESTIGATION, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/user_groups_endpoints.py

@@ -11,7 +11,7 @@ class UserGroups(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(USERGROUP, request.json), 200
+        return get_rows_by_filter(USERGROUP, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records

src/resources/entities/users_endpoints.py

@@ -11,7 +11,7 @@ class Users(Resource):
     @requires_session_id
     @queries_records
     def get(self):
-        return get_rows_by_filter(USER, request.json), 200
+        return get_rows_by_filter(USER, get_filters_from_query_string()), 200
 
     @requires_session_id
     @queries_records