test

2025-02-17 10:18:50 +01:00
parent 2a331bdf8f
commit b0b2206c12
9 changed files with 322 additions and 373 deletions
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -15,10 +15,10 @@
    },
    "basePath": "/oc/",
    "paths": {
-        "/": {
+        "/execution/": {
            "get": {
                "tags": [
-                    "oc-scheduler/controllersWorkflowExecutionController"
+                    "execution"
                ],
                "description": "find workflow by workflowid\n\u003cbr\u003e",
                "operationId": "WorkflowExecutionController.GetAll",
@@ -37,10 +37,10 @@
                }
            }
        },
-        "/search/{search}": {
+        "/execution/search/{search}": {
            "get": {
                "tags": [
-                    "oc-scheduler/controllersWorkflowExecutionController"
+                    "execution"
                ],
                "description": "find compute by key word\n\u003cbr\u003e",
                "operationId": "WorkflowExecutionController.Search",
@@ -66,10 +66,10 @@
                }
            }
        },
-        "/search/{start_date}/{end_date}": {
+        "/execution/search/{start_date}/{end_date}": {
            "get": {
                "tags": [
-                    "oc-scheduler/controllersWorkflowExecutionController"
+                    "execution"
                ],
                "description": "search workspace\n\u003cbr\u003e",
                "operationId": "WorkflowExecutionController.SearchPerDate",
@@ -102,6 +102,29 @@
                }
            }
        },
+        "/execution/{id}": {
+            "get": {
+                "tags": [
+                    "execution"
+                ],
+                "description": "find workflow by workflowid\n\u003cbr\u003e",
+                "operationId": "WorkflowExecutionController.Get",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "description": "the workflowid you want to get",
+                        "required": true,
+                        "type": "string"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{workflow} models.workflow"
+                    }
+                }
+            }
+        },
        "/version/": {
            "get": {
                "tags": [
@@ -130,13 +153,43 @@
                }
            }
        },
-        "/workflow/{id}": {
+        "/{id}": {
            "post": {
                "tags": [
-                    "oc-scheduler/controllersWorkflowExecutionController"
+                    "oc-scheduler/controllersWorkflowSchedulerController"
                ],
                "description": "schedule workflow\n\u003cbr\u003e",
-                "operationId": "WorkflowExecutionController.ScheduleWorkflow",
+                "operationId": "WorkflowSchedulerController.Schedule",
+                "parameters": [
+                    {
+                        "in": "path",
+                        "name": "id",
+                        "description": "id execution",
+                        "required": true,
+                        "type": "string"
+                    },
+                    {
+                        "in": "body",
+                        "name": "body",
+                        "description": "The compute content",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/models.compute"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "{workspace} models.workspace"
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "oc-scheduler/controllersWorkflowSchedulerController"
+                ],
+                "description": "schedule workflow\n\u003cbr\u003e",
+                "operationId": "WorkflowSchedulerController.UnSchedule",
                "parameters": [
                    {
                        "in": "path",
@@ -162,25 +215,25 @@
                }
            }
        },
-        "/{id}": {
+        "/{id}/order": {
            "get": {
                "tags": [
-                    "oc-scheduler/controllersWorkflowExecutionController"
+                    "oc-scheduler/controllersWorkflowSchedulerController"
                ],
-                "description": "find workflow by workflowid\n\u003cbr\u003e",
-                "operationId": "WorkflowExecutionController.Get",
+                "description": "schedule workflow\n\u003cbr\u003e",
+                "operationId": "WorkflowSchedulerController.SearchScheduledDraftOrder",
                "parameters": [
                    {
                        "in": "path",
                        "name": "id",
-                        "description": "the workflowid you want to get",
+                        "description": "id execution",
                        "required": true,
                        "type": "string"
                    }
                ],
                "responses": {
                    "200": {
-                        "description": "{workflow} models.workflow"
+                        "description": "{workspace} models.workspace"
                    }
                }
            }
@@ -194,7 +247,11 @@
    },
    "tags": [
        {
-            "name": "oc-scheduler/controllersWorkflowExecutionController",
+            "name": "oc-scheduler/controllersWorkflowSchedulerController",
+            "description": "Operations about workflow\n"
+        },
+        {
+            "name": "execution",
            "description": "Operations about workflow\n"
        },
        {
--- a/swagger/swagger.yml
+++ b/swagger/swagger.yml
@@ -12,10 +12,72 @@ info:
    url: https://www.gnu.org/licenses/agpl-3.0.html
 basePath: /oc/
 paths:
-  /:
+  /{id}:
+    post:
+      tags:
+      - oc-scheduler/controllersWorkflowSchedulerController
+      description: |-
+        schedule workflow
+        <br>
+      operationId: WorkflowSchedulerController.Schedule
+      parameters:
+      - in: path
+        name: id
+        description: id execution
+        required: true
+        type: string
+      - in: body
+        name: body
+        description: The compute content
+        required: true
+        schema:
+          $ref: '#/definitions/models.compute'
+      responses:
+        "200":
+          description: '{workspace} models.workspace'
+    delete:
+      tags:
+      - oc-scheduler/controllersWorkflowSchedulerController
+      description: |-
+        schedule workflow
+        <br>
+      operationId: WorkflowSchedulerController.UnSchedule
+      parameters:
+      - in: path
+        name: id
+        description: id execution
+        required: true
+        type: string
+      - in: body
+        name: body
+        description: The compute content
+        required: true
+        schema:
+          $ref: '#/definitions/models.compute'
+      responses:
+        "200":
+          description: '{workspace} models.workspace'
+  /{id}/order:
    get:
      tags:
-      - oc-scheduler/controllersWorkflowExecutionController
+      - oc-scheduler/controllersWorkflowSchedulerController
+      description: |-
+        schedule workflow
+        <br>
+      operationId: WorkflowSchedulerController.SearchScheduledDraftOrder
+      parameters:
+      - in: path
+        name: id
+        description: id execution
+        required: true
+        type: string
+      responses:
+        "200":
+          description: '{workspace} models.workspace'
+  /execution/:
+    get:
+      tags:
+      - execution
      description: |-
        find workflow by workflowid
        <br>
@@ -28,10 +90,10 @@ paths:
      responses:
        "200":
          description: '{workflow} models.workflow'
-  /{id}:
+  /execution/{id}:
    get:
      tags:
-      - oc-scheduler/controllersWorkflowExecutionController
+      - execution
      description: |-
        find workflow by workflowid
        <br>
@@ -45,10 +107,10 @@ paths:
      responses:
        "200":
          description: '{workflow} models.workflow'
-  /search/{search}:
+  /execution/search/{search}:
    get:
      tags:
-      - oc-scheduler/controllersWorkflowExecutionController
+      - execution
      description: |-
        find compute by key word
        <br>
@@ -66,10 +128,10 @@ paths:
      responses:
        "200":
          description: '{compute} models.compute'
-  /search/{start_date}/{end_date}:
+  /execution/search/{start_date}/{end_date}:
    get:
      tags:
-      - oc-scheduler/controllersWorkflowExecutionController
+      - execution
      description: |-
        search workspace
        <br>
@@ -114,35 +176,15 @@ paths:
      responses:
        "200":
          description: ""
-  /workflow/{id}:
-    post:
-      tags:
-      - oc-scheduler/controllersWorkflowExecutionController
-      description: |-
-        schedule workflow
-        <br>
-      operationId: WorkflowExecutionController.ScheduleWorkflow
-      parameters:
-      - in: path
-        name: id
-        description: id execution
-        required: true
-        type: string
-      - in: body
-        name: body
-        description: The compute content
-        required: true
-        schema:
-          $ref: '#/definitions/models.compute'
-      responses:
-        "200":
-          description: '{workspace} models.workspace'
 definitions:
  models.compute:
    title: compute
    type: object
 tags:
- name: oc-scheduler/controllersWorkflowExecutionController
+- name: oc-scheduler/controllersWorkflowSchedulerController
+  description: |
+    Operations about workflow
+- name: execution
  description: |
    Operations about workflow
 - name: version