From c4301a5fbdb9c338aabb6ed470d5b6429ac0347e Mon Sep 17 00:00:00 2001
From: Keiran Price <keiran.price@stfc.ac.uk>
Date: Tue, 18 Jun 2019 07:37:20 +0100
Subject: [PATCH 1/2] #6: Get filters from querystring

---
 src/resources/entities/applications_endpoints.py              | 2 +-
 src/resources/entities/datacollection_datafiles_endpoints.py  | 2 +-
 src/resources/entities/datacollection_datasets_endpoints.py   | 2 +-
 src/resources/entities/datacollection_parameters_endpoints.py | 2 +-
 src/resources/entities/datacollections_endpoints.py           | 2 +-
 src/resources/entities/datafile_formats_endpoints.py          | 2 +-
 src/resources/entities/datafile_parameters_endpoints.py       | 2 +-
 src/resources/entities/datafiles_endpoints.py                 | 3 +--
 src/resources/entities/dataset_type_endpoints.py              | 2 +-
 src/resources/entities/datasets_endpoints.py                  | 2 +-
 src/resources/entities/facilities_endpoints.py                | 2 +-
 src/resources/entities/facility_cycles_endpoints.py           | 2 +-
 src/resources/entities/groupings_endpoints.py                 | 2 +-
 src/resources/entities/instrument_scientists_endpoints.py     | 2 +-
 src/resources/entities/instruments_endpoints.py               | 2 +-
 src/resources/entities/investigation_groups_endpoints.py      | 2 +-
 src/resources/entities/investigation_instruments_endpoints.py | 2 +-
 src/resources/entities/investigation_parameters_endpoints.py  | 2 +-
 src/resources/entities/investigation_types_endpoints.py       | 2 +-
 src/resources/entities/investigation_users_endpoints.py       | 2 +-
 src/resources/entities/investigations_endpoints.py            | 2 +-
 src/resources/entities/jobs_endpoints.py                      | 2 +-
 src/resources/entities/keywords_endpoints.py                  | 2 +-
 src/resources/entities/parameter_types_endpoints.py           | 2 +-
 src/resources/entities/permissible_string_values_endpoints.py | 2 +-
 src/resources/entities/public_steps_endpoints.py              | 2 +-
 src/resources/entities/publications_endpoints.py              | 2 +-
 src/resources/entities/related_datafiles_endpoints.py         | 2 +-
 src/resources/entities/rules_endpoints.py                     | 2 +-
 src/resources/entities/sample_parameters_endpoints.py         | 2 +-
 src/resources/entities/sample_types_endpoints.py              | 2 +-
 src/resources/entities/samples_endpoints.py                   | 2 +-
 src/resources/entities/shifts_endpoints.py                    | 2 +-
 src/resources/entities/studies_endpoints.py                   | 2 +-
 src/resources/entities/study_investigations_endpoints.py      | 2 +-
 src/resources/entities/user_groups_endpoints.py               | 2 +-
 src/resources/entities/users_endpoints.py                     | 2 +-
 37 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/src/resources/entities/applications_endpoints.py b/src/resources/entities/applications_endpoints.py
index 39dd9d1f..6e3b8fec 100644
--- a/src/resources/entities/applications_endpoints.py
+++ b/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
diff --git a/src/resources/entities/datacollection_datafiles_endpoints.py b/src/resources/entities/datacollection_datafiles_endpoints.py
index 495a721f..18aa41c3 100644
--- a/src/resources/entities/datacollection_datafiles_endpoints.py
+++ b/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
diff --git a/src/resources/entities/datacollection_datasets_endpoints.py b/src/resources/entities/datacollection_datasets_endpoints.py
index 26477f0b..b38c5aa3 100644
--- a/src/resources/entities/datacollection_datasets_endpoints.py
+++ b/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
diff --git a/src/resources/entities/datacollection_parameters_endpoints.py b/src/resources/entities/datacollection_parameters_endpoints.py
index 6ebff21f..6bfb7b77 100644
--- a/src/resources/entities/datacollection_parameters_endpoints.py
+++ b/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
diff --git a/src/resources/entities/datacollections_endpoints.py b/src/resources/entities/datacollections_endpoints.py
index e155f97a..08c021b1 100644
--- a/src/resources/entities/datacollections_endpoints.py
+++ b/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
diff --git a/src/resources/entities/datafile_formats_endpoints.py b/src/resources/entities/datafile_formats_endpoints.py
index 84f97585..d5d8e098 100644
--- a/src/resources/entities/datafile_formats_endpoints.py
+++ b/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
diff --git a/src/resources/entities/datafile_parameters_endpoints.py b/src/resources/entities/datafile_parameters_endpoints.py
index 77734257..b6aa69d5 100644
--- a/src/resources/entities/datafile_parameters_endpoints.py
+++ b/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
diff --git a/src/resources/entities/datafiles_endpoints.py b/src/resources/entities/datafiles_endpoints.py
index 84f3a378..f3e3c140 100644
--- a/src/resources/entities/datafiles_endpoints.py
+++ b/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
diff --git a/src/resources/entities/dataset_type_endpoints.py b/src/resources/entities/dataset_type_endpoints.py
index b03fb341..93b25140 100644
--- a/src/resources/entities/dataset_type_endpoints.py
+++ b/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
diff --git a/src/resources/entities/datasets_endpoints.py b/src/resources/entities/datasets_endpoints.py
index f51cdcab..31188c64 100644
--- a/src/resources/entities/datasets_endpoints.py
+++ b/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
diff --git a/src/resources/entities/facilities_endpoints.py b/src/resources/entities/facilities_endpoints.py
index 66b4637b..f0d33c66 100644
--- a/src/resources/entities/facilities_endpoints.py
+++ b/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
diff --git a/src/resources/entities/facility_cycles_endpoints.py b/src/resources/entities/facility_cycles_endpoints.py
index 87d91692..7ce79d5b 100644
--- a/src/resources/entities/facility_cycles_endpoints.py
+++ b/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
diff --git a/src/resources/entities/groupings_endpoints.py b/src/resources/entities/groupings_endpoints.py
index 3e975f09..e21f557f 100644
--- a/src/resources/entities/groupings_endpoints.py
+++ b/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
diff --git a/src/resources/entities/instrument_scientists_endpoints.py b/src/resources/entities/instrument_scientists_endpoints.py
index eeddcd57..d8ced29d 100644
--- a/src/resources/entities/instrument_scientists_endpoints.py
+++ b/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
diff --git a/src/resources/entities/instruments_endpoints.py b/src/resources/entities/instruments_endpoints.py
index 3e24e394..7a3d877c 100644
--- a/src/resources/entities/instruments_endpoints.py
+++ b/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
diff --git a/src/resources/entities/investigation_groups_endpoints.py b/src/resources/entities/investigation_groups_endpoints.py
index 15a81b2a..a7208ebd 100644
--- a/src/resources/entities/investigation_groups_endpoints.py
+++ b/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
diff --git a/src/resources/entities/investigation_instruments_endpoints.py b/src/resources/entities/investigation_instruments_endpoints.py
index 70daca3d..2c9f1f40 100644
--- a/src/resources/entities/investigation_instruments_endpoints.py
+++ b/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
diff --git a/src/resources/entities/investigation_parameters_endpoints.py b/src/resources/entities/investigation_parameters_endpoints.py
index 2710f0fe..147e3414 100644
--- a/src/resources/entities/investigation_parameters_endpoints.py
+++ b/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
diff --git a/src/resources/entities/investigation_types_endpoints.py b/src/resources/entities/investigation_types_endpoints.py
index 9b80717f..a54ec734 100644
--- a/src/resources/entities/investigation_types_endpoints.py
+++ b/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
diff --git a/src/resources/entities/investigation_users_endpoints.py b/src/resources/entities/investigation_users_endpoints.py
index c0f49023..f651fbe1 100644
--- a/src/resources/entities/investigation_users_endpoints.py
+++ b/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
diff --git a/src/resources/entities/investigations_endpoints.py b/src/resources/entities/investigations_endpoints.py
index 1f393d67..75aff0d7 100644
--- a/src/resources/entities/investigations_endpoints.py
+++ b/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
diff --git a/src/resources/entities/jobs_endpoints.py b/src/resources/entities/jobs_endpoints.py
index 116c367e..6fb64525 100644
--- a/src/resources/entities/jobs_endpoints.py
+++ b/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
diff --git a/src/resources/entities/keywords_endpoints.py b/src/resources/entities/keywords_endpoints.py
index 3765282e..b623910d 100644
--- a/src/resources/entities/keywords_endpoints.py
+++ b/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
diff --git a/src/resources/entities/parameter_types_endpoints.py b/src/resources/entities/parameter_types_endpoints.py
index 8562931d..e049bf1b 100644
--- a/src/resources/entities/parameter_types_endpoints.py
+++ b/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
diff --git a/src/resources/entities/permissible_string_values_endpoints.py b/src/resources/entities/permissible_string_values_endpoints.py
index 342511d8..be9b74e3 100644
--- a/src/resources/entities/permissible_string_values_endpoints.py
+++ b/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
diff --git a/src/resources/entities/public_steps_endpoints.py b/src/resources/entities/public_steps_endpoints.py
index f67909ac..67394bf1 100644
--- a/src/resources/entities/public_steps_endpoints.py
+++ b/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
diff --git a/src/resources/entities/publications_endpoints.py b/src/resources/entities/publications_endpoints.py
index 879ec890..c3db2feb 100644
--- a/src/resources/entities/publications_endpoints.py
+++ b/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
diff --git a/src/resources/entities/related_datafiles_endpoints.py b/src/resources/entities/related_datafiles_endpoints.py
index 89a7c103..702bf6dc 100644
--- a/src/resources/entities/related_datafiles_endpoints.py
+++ b/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
diff --git a/src/resources/entities/rules_endpoints.py b/src/resources/entities/rules_endpoints.py
index 7617ebf8..57273731 100644
--- a/src/resources/entities/rules_endpoints.py
+++ b/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
diff --git a/src/resources/entities/sample_parameters_endpoints.py b/src/resources/entities/sample_parameters_endpoints.py
index 3005f81a..b5236bc9 100644
--- a/src/resources/entities/sample_parameters_endpoints.py
+++ b/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
diff --git a/src/resources/entities/sample_types_endpoints.py b/src/resources/entities/sample_types_endpoints.py
index aaacf5bf..e870cb4b 100644
--- a/src/resources/entities/sample_types_endpoints.py
+++ b/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
diff --git a/src/resources/entities/samples_endpoints.py b/src/resources/entities/samples_endpoints.py
index b62eeb64..54e91d18 100644
--- a/src/resources/entities/samples_endpoints.py
+++ b/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
diff --git a/src/resources/entities/shifts_endpoints.py b/src/resources/entities/shifts_endpoints.py
index 24654fd0..7f422bd9 100644
--- a/src/resources/entities/shifts_endpoints.py
+++ b/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
diff --git a/src/resources/entities/studies_endpoints.py b/src/resources/entities/studies_endpoints.py
index 9227a67a..51d92f24 100644
--- a/src/resources/entities/studies_endpoints.py
+++ b/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
diff --git a/src/resources/entities/study_investigations_endpoints.py b/src/resources/entities/study_investigations_endpoints.py
index af76d7e8..1f389d52 100644
--- a/src/resources/entities/study_investigations_endpoints.py
+++ b/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
diff --git a/src/resources/entities/user_groups_endpoints.py b/src/resources/entities/user_groups_endpoints.py
index 7235a2d6..d5cd4e34 100644
--- a/src/resources/entities/user_groups_endpoints.py
+++ b/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
diff --git a/src/resources/entities/users_endpoints.py b/src/resources/entities/users_endpoints.py
index 561f5dcf..c047a164 100644
--- a/src/resources/entities/users_endpoints.py
+++ b/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

From 7895d73462263045f9b253c444b8958fbd1cd671 Mon Sep 17 00:00:00 2001
From: Keiran Price <keiran.price@stfc.ac.uk>
Date: Tue, 18 Jun 2019 07:37:43 +0100
Subject: [PATCH 2/2] #6: remove unused import

---
 common/database_helpers.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/database_helpers.py b/common/database_helpers.py
index c94f6e90..9b7fa768 100644
--- a/common/database_helpers.py
+++ b/common/database_helpers.py
@@ -1,4 +1,3 @@
-import json
 import datetime
 
 from sqlalchemy import create_engine