create api endpoints based on config objects #283

ral-facilities · Nov 15, 2021 · cbdaed6 · cbdaed6
1 parent 0b685e8
commit cbdaed6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/datagateway_api/src/api_start_utils.py b/datagateway_api/src/api_start_utils.py
@@ -91,6 +91,7 @@ def create_app_infrastructure(flask_app):
 
 
 def create_api_endpoints(flask_app, api, spec):
+    # DataGateway API endpoints
     if config.datagateway_api is not None:
         try:
             backend_type = flask_app.config["TEST_BACKEND"]
@@ -216,8 +217,7 @@ def create_api_endpoints(flask_app, api, spec):
         spec.path(resource=ping_resource, api=api)
 
     # Search API endpoints
-    # TODO - make conditional respect new config style when implemented
-    if True:
+    if config.search_api is not None:
         # TODO - Use config value when new config style is implemented
         search_api_extension = "search_api"
         search_api_entity_endpoints = ["datasets", "documents", "instruments"]

diff --git a/datagateway_api/src/swagger/openapi.yaml b/datagateway_api/src/swagger/openapi.yaml
@@ -11013,10 +11013,16 @@ paths:
       summary: Ping API connection method
       tags:
       - Ping
+  /search_api/datasets:
+    get: {}
   /search_api/datasets/{pid}: {}
   /search_api/datasets/count: {}
+  /search_api/documents:
+    get: {}
   /search_api/documents/{pid}: {}
   /search_api/documents/count: {}
+  /search_api/instruments:
+    get: {}
   /search_api/instruments/{pid}: {}
   /search_api/instruments/count: {}
   /search_api/datasets/{pid}/files: {}