Merge branch 'id-endpoints-404-#129'

Conflicts: src/swagger/openapi.yaml
ral-facilities · Jun 11, 2020 · 016ce7b · 016ce7b
2 parents d330972 + 821680d
commit 016ce7b
Show file tree

Hide file tree

Showing 3 changed files with 1,539 additions and 1,539 deletions.
diff --git a/src/resources/entities/entity_endpoint.py b/src/resources/entities/entity_endpoint.py
@@ -168,7 +168,7 @@ def get(self, id):
             parameters:
                 - in: path
                   required: true
-                  name: ID
+                  name: id
                   description: The id of the entity to retrieve
                   schema:
                     type: integer
@@ -204,7 +204,7 @@ def delete(self, id):
             parameters:
                 - in: path
                   required: true
-                  name: ID
+                  name: id
                   description: The id of the entity to delete
                   schema:
                     type: integer
@@ -236,7 +236,7 @@ def patch(self, id):
             parameters:
                 - in: path
                   required: true
-                  name: ID
+                  name: id
                   description: The id of the entity to update
                   schema:
                     type: integer

diff --git a/src/resources/table_endpoints/table_endpoints.py b/src/resources/table_endpoints/table_endpoints.py
@@ -18,7 +18,7 @@ def get(self, id):
         parameters:
             - in: path
               required: true
-              name: ID
+              name: id
               description: The id of the instrument to retrieve the facility cycles of
               schema:
                 type: integer
@@ -62,7 +62,7 @@ def get(self, id):
         parameters:
             - in: path
               required: true
-              name: ID
+              name: id
               description: The id of the instrument to count the facility cycles of
               schema:
                 type: integer
@@ -100,13 +100,13 @@ def get(self, instrument_id, cycle_id):
         parameters:
             - in: path
               required: true
-              name: Instrument ID
+              name: instrument_id
               description: The id of the instrument to retrieve the investigations of
               schema:
                 type: integer
             - in: path
               required: true
-              name: Facility Cycle ID
+              name: cycle_id
               description: The id of the facility cycles to retrieve the investigations of
               schema:
                 type: integer
@@ -124,7 +124,7 @@ def get(self, instrument_id, cycle_id):
                         schema:
                             type: array
                             items:
-                                $ref: '#/components/schemas/INVESTIGATIONS'
+                                $ref: '#/components/schemas/INVESTIGATION'
             400:
                 description: Bad request - Something was wrong with the request
             401:
@@ -151,13 +151,13 @@ def get(self, instrument_id, cycle_id):
         parameters:
             - in: path
               required: true
-              name: Instrument ID
+              name: instrument_id
               description: The id of the instrument to retrieve the investigations of
               schema:
                 type: integer
             - in: path
               required: true
-              name: Facility Cycle ID
+              name: cycle_id
               description: The id of the facility cycles to retrieve the investigations of
               schema:
                 type: integer