Updating properties to match the validation results.

Addresses #98
EOSC-synergy · Dec 1, 2021 · 5bb7e39 · 5bb7e39
1 parent f448636
commit 5bb7e39
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 18 deletions.
diff --git a/build/dist.yaml b/build/dist.yaml
@@ -696,9 +696,8 @@ paths:
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/CriterionOutput'
+                type: object
+                $ref: '#/components/schemas/CriterionOutput'
         '400':
           description: Invalid pipeline ID supplied
         '404':
@@ -1112,12 +1111,25 @@ components:
         - upstream_reason
     CriterionOutput:
       type: object
-      properties:
-        id:
-          type: string
-          example: QC.Sty
-        stdout:
-          type: string
+      additionalProperties:
+        type: object
+        properties:
+          status:
+            type: string
+            enum:
+              - SUCCESS
+              - FAILED
+          stdout_command:
+            type: string
+          stdout_text:
+            type: string
+          validation:
+            type: object
+            properties:
+              valid:
+                type: boolean
+              data_unstructured:
+                type: object
     Badge:
       type: object
       properties:

diff --git a/openapi/components/schemas/CriterionOutput.yaml b/openapi/components/schemas/CriterionOutput.yaml
@@ -1,7 +1,18 @@
 type: object
-properties:
-  id:
-    type: string
-    example: QC.Sty
-  stdout:
-    type: string
+additionalProperties:
+  type: object
+  properties:
+    status:
+      type: string
+      enum: [SUCCESS, FAILED]
+    stdout_command:
+      type: string
+    stdout_text:
+      type: string
+    validation:
+      type: object
+      properties:
+        valid:
+          type: boolean
+        data_unstructured:
+          type: object
diff --git a/openapi/paths/pipeline_output.yaml b/openapi/paths/pipeline_output.yaml
@@ -23,9 +23,8 @@ get:
       content:
         application/json:
           schema:
-            type: array
-            items:
-              $ref: '../components/schemas/CriterionOutput.yaml'
+            type: object
+            $ref: '../components/schemas/CriterionOutput.yaml'
     '400':
       description: Invalid pipeline ID supplied
     '404':