Including suggestions from ISSUE comments

x-atlas-consortia · Aug 29, 2024 · 44aa495 · 44aa495
1 parent b9630bb
commit 44aa495
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/dev/app.py b/dev/app.py
@@ -77,8 +77,10 @@ def check_for_valid_application_context() -> None:
     Check for a valid auery parameter application_context, and if not found abort with a 400.
     """
     application_context = request.args.get('application_context')
-    if application_context != "HUBMAP":
-        abort(400, "A query parameter of application_context=HUBMAP must be specified")
+    if application_context is None or application_context.upper() != "HUBMAP":
+        abort(Response(json.dumps({"message": "A query parameter of application_context=HUBMAP must be specified"}),
+                       400,
+                       mimetype='application/json'))
 
 
 @app.route('/', methods=['GET'])

diff --git a/dev/test_api.sh b/dev/test_api.sh
@@ -9,31 +9,44 @@ ASSAYCLASS_URL=$ASSAYCLASS_URL_LOCAL
 curl --request GET \
  --url "${ASSAYCLASS_URL}"
 echo
+echo
 
 
-# Both endpoints require the application_context=HUBMAP parameter to be included, otherwise return a 400.
+echo "Only the last one in the group should succeed..."
 curl --request GET \
  --url "${ASSAYCLASS_URL}/assayclasses" \
  --header "Accept: application/json"
 echo
 
 curl --request GET \
- --url "${ASSAYCLASS_URL}/assayclasses?application_context=HUBMAP" \
+ --url "${ASSAYCLASS_URL}/assayclasses?application_context=Wrong" \
+ --header "Accept: application/json"
+echo
+
+curl --request GET \
+ --url "${ASSAYCLASS_URL}/assayclasses?application_context=HUBMAp" \
  --header "Accept: application/json"
 echo
+echo
 
 
+echo "Only the last one in the group should succeed..."
 curl --request GET \
  --url "${ASSAYCLASS_URL}/assayclasses/C200010" \
  --header "Accept: application/json"
 echo
 
 curl --request GET \
- --url "${ASSAYCLASS_URL}/assayclasses/xyzzy?application_context=HUBMAP" \
+ --url "${ASSAYCLASS_URL}/assayclasses/xyzzy?application_context=NoMap" \
+ --header "Accept: application/json"
+echo
+
+curl --request GET \
+ --url "${ASSAYCLASS_URL}/assayclasses/xyzzy?application_context=huBMAP" \
  --header "Accept: application/json"
 echo
 
 curl --request GET \
- --url "${ASSAYCLASS_URL}/assayclasses/C200010?application_context=HUBMAP" \
+ --url "${ASSAYCLASS_URL}/assayclasses/C200010?application_context=HUbmAP" \
  --header "Accept: application/json"
 echo