#3749 Create ScheduleBox

gchq · Feb 16, 2024 · 8de0393 · 8de0393
1 parent 5004256
commit 8de0393
Show file tree

Hide file tree

Showing 2 changed files with 120 additions and 13 deletions.
diff --git a/stroom-app/src/main/resources/ui/noauth/swagger/stroom.json b/stroom-app/src/main/resources/ui/noauth/swagger/stroom.json
@@ -3368,6 +3368,36 @@
         "tags" : [ "ExecutionSchedule" ]
       }
     },
+    "/executionSchedule/v1/fetchTracker" : {
+      "post" : {
+        "operationId" : "fetchTracker",
+        "requestBody" : {
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/ExecutionSchedule"
+              }
+            }
+          },
+          "description" : "request",
+          "required" : true
+        },
+        "responses" : {
+          "default" : {
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/ExecutionTracker"
+                }
+              }
+            },
+            "description" : "default response"
+          }
+        },
+        "summary" : "Fetch execution tracker",
+        "tags" : [ "ExecutionSchedule" ]
+      }
+    },
     "/executionSchedule/v1/updateExecutionSchedule" : {
       "post" : {
         "operationId" : "updateExecutionSchedule",
@@ -13318,6 +13348,23 @@
           }
         }
       },
+      "ExecutionTracker" : {
+        "type" : "object",
+        "properties" : {
+          "actualExecutionTimeMs" : {
+            "type" : "integer",
+            "format" : "int64"
+          },
+          "lastEffectiveExecutionTimeMs" : {
+            "type" : "integer",
+            "format" : "int64"
+          },
+          "nextEffectiveExecutionTimeMs" : {
+            "type" : "integer",
+            "format" : "int64"
+          }
+        }
+      },
       "Expander" : {
         "type" : "object",
         "properties" : {
@@ -14807,16 +14854,15 @@
       "GetScheduledTimesRequest" : {
         "type" : "object",
         "properties" : {
-          "lastExecutedTime" : {
-            "type" : "integer",
-            "format" : "int64"
-          },
           "schedule" : {
             "$ref" : "#/components/schemas/Schedule"
           },
           "scheduleReferenceTime" : {
             "type" : "integer",
             "format" : "int64"
+          },
+          "scheduleRestriction" : {
+            "$ref" : "#/components/schemas/ScheduleRestriction"
           }
         }
       },
@@ -18189,6 +18235,20 @@
           }
         }
       },
+      "ScheduleRestriction" : {
+        "type" : "object",
+        "properties" : {
+          "allowHour" : {
+            "type" : "boolean"
+          },
+          "allowMinute" : {
+            "type" : "boolean"
+          },
+          "allowSecond" : {
+            "type" : "boolean"
+          }
+        }
+      },
       "ScheduledQueryAnalyticProcessConfig" : {
         "type" : "object",
         "allOf" : [ {
@@ -18247,11 +18307,15 @@
       "ScheduledTimes" : {
         "type" : "object",
         "properties" : {
-          "lastExecutedTime" : {
+          "error" : {
             "type" : "string"
           },
-          "nextScheduledTime" : {
-            "type" : "string"
+          "nextScheduledTimeMs" : {
+            "type" : "integer",
+            "format" : "int64"
+          },
+          "schedule" : {
+            "$ref" : "#/components/schemas/Schedule"
           }
         }
       },

diff --git a/stroom-app/src/main/resources/ui/noauth/swagger/stroom.yaml b/stroom-app/src/main/resources/ui/noauth/swagger/stroom.yaml
@@ -2313,6 +2313,26 @@ paths:
       summary: Fetch execution schedule
       tags:
       - ExecutionSchedule
+  /executionSchedule/v1/fetchTracker:
+    post:
+      operationId: fetchTracker
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ExecutionSchedule'
+        description: request
+        required: true
+      responses:
+        default:
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ExecutionTracker'
+          description: default response
+      summary: Fetch execution tracker
+      tags:
+      - ExecutionSchedule
   /executionSchedule/v1/updateExecutionSchedule:
     post:
       operationId: updateExecutionSchedule
@@ -9393,6 +9413,18 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/CriteriaFieldSort'
+    ExecutionTracker:
+      type: object
+      properties:
+        actualExecutionTimeMs:
+          type: integer
+          format: int64
+        lastEffectiveExecutionTimeMs:
+          type: integer
+          format: int64
+        nextEffectiveExecutionTimeMs:
+          type: integer
+          format: int64
     Expander:
       type: object
       properties:
@@ -11074,14 +11106,13 @@ components:
     GetScheduledTimesRequest:
       type: object
       properties:
-        lastExecutedTime:
-          type: integer
-          format: int64
         schedule:
           $ref: '#/components/schemas/Schedule'
         scheduleReferenceTime:
           type: integer
           format: int64
+        scheduleRestriction:
+          $ref: '#/components/schemas/ScheduleRestriction'
     GlobalConfigCriteria:
       type: object
       properties:
@@ -13980,6 +14011,15 @@ components:
         startTimeMs:
           type: integer
           format: int64
+    ScheduleRestriction:
+      type: object
+      properties:
+        allowHour:
+          type: boolean
+        allowMinute:
+          type: boolean
+        allowSecond:
+          type: boolean
     ScheduledQueryAnalyticProcessConfig:
       type: object
       allOf:
@@ -14020,10 +14060,13 @@ components:
     ScheduledTimes:
       type: object
       properties:
-        lastExecutedTime:
-          type: string
-        nextScheduledTime:
+        error:
           type: string
+        nextScheduledTimeMs:
+          type: integer
+          format: int64
+        schedule:
+          $ref: '#/components/schemas/Schedule'
     ScriptDoc:
       type: object
       properties: