#4289 Make analytic duplicate checking optional

gchq · May 24, 2024 · 3fe28c3 · 3fe28c3
1 parent 2f9219b
commit 3fe28c3
Show file tree

Hide file tree

Showing 2 changed files with 125 additions and 19 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
@@ -3073,21 +3073,44 @@
         "tags" : [ "Documentation (v1)" ]
       }
     },
+    "/duplicateCheck/v1/delete" : {
+      "delete" : {
+        "operationId" : "deleteDuplicateCheckRows",
+        "requestBody" : {
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "$ref" : "#/components/schemas/DeleteDuplicateCheckRequest"
+              }
+            }
+          },
+          "description" : "criteria",
+          "required" : true
+        },
+        "responses" : {
+          "default" : {
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "type" : "boolean"
+                }
+              }
+            },
+            "description" : "default response"
+          }
+        },
+        "summary" : "Delete duplicate check rows",
+        "tags" : [ "DuplicateCheck" ]
+      }
+    },
     "/duplicateCheck/v1/find" : {
       "post" : {
         "operationId" : "findDuplicateCheckRows",
-        "parameters" : [ {
-          "in" : "query",
-          "name" : "nodeName",
-          "schema" : {
-            "type" : "string"
-          }
-        } ],
         "requestBody" : {
           "content" : {
             "application/json" : {
               "schema" : {
-                "$ref" : "#/components/schemas/FindAnalyticDataShardCriteria"
+                "$ref" : "#/components/schemas/FindDuplicateCheckCriteria"
               }
             }
           },
@@ -10964,9 +10987,6 @@
       "AnalyticRuleDoc" : {
         "type" : "object",
         "properties" : {
-          "allowDuplicateNotifications" : {
-            "type" : "boolean"
-          },
           "analyticNotificationConfig" : {
             "$ref" : "#/components/schemas/NotificationConfig"
           },
@@ -10990,6 +11010,9 @@
           "errorFeed" : {
             "$ref" : "#/components/schemas/DocRef"
           },
+          "ignoreDuplicateNotifications" : {
+            "type" : "boolean"
+          },
           "languageVersion" : {
             "type" : "string",
             "enum" : [ "STROOM_QL_VERSION_0_1", "SIGMA" ]
@@ -11012,6 +11035,9 @@
           "query" : {
             "type" : "string"
           },
+          "rememberNotifications" : {
+            "type" : "boolean"
+          },
           "timeRange" : {
             "$ref" : "#/components/schemas/TimeRange"
           },
@@ -12654,6 +12680,20 @@
           }
         }
       },
+      "DeleteDuplicateCheckRequest" : {
+        "type" : "object",
+        "properties" : {
+          "analyticDocUuid" : {
+            "type" : "string"
+          },
+          "rows" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/DuplicateCheckRow"
+            }
+          }
+        }
+      },
       "Dependency" : {
         "type" : "object",
         "properties" : {
@@ -14226,6 +14266,30 @@
           }
         }
       },
+      "FindDuplicateCheckCriteria" : {
+        "type" : "object",
+        "properties" : {
+          "analyticDocUuid" : {
+            "type" : "string"
+          },
+          "pageRequest" : {
+            "$ref" : "#/components/schemas/PageRequest"
+          },
+          "quickFilterInput" : {
+            "type" : "string"
+          },
+          "sort" : {
+            "type" : "string",
+            "writeOnly" : true
+          },
+          "sortList" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/components/schemas/CriteriaFieldSort"
+            }
+          }
+        }
+      },
       "FindElementDocRequest" : {
         "type" : "object",
         "properties" : {

diff --git a/stroom-app/src/main/resources/ui/noauth/swagger/stroom.yaml b/stroom-app/src/main/resources/ui/noauth/swagger/stroom.yaml
@@ -2112,19 +2112,34 @@ paths:
       summary: Update a documentation doc
       tags:
       - Documentation (v1)
+  /duplicateCheck/v1/delete:
+    delete:
+      operationId: deleteDuplicateCheckRows
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/DeleteDuplicateCheckRequest'
+        description: criteria
+        required: true
+      responses:
+        default:
+          content:
+            application/json:
+              schema:
+                type: boolean
+          description: default response
+      summary: Delete duplicate check rows
+      tags:
+      - DuplicateCheck
   /duplicateCheck/v1/find:
     post:
       operationId: findDuplicateCheckRows
-      parameters:
-      - in: query
-        name: nodeName
-        schema:
-          type: string
       requestBody:
         content:
           application/json:
             schema:
-              $ref: '#/components/schemas/FindAnalyticDataShardCriteria'
+              $ref: '#/components/schemas/FindDuplicateCheckCriteria'
         description: criteria
         required: true
       responses:
@@ -7529,8 +7544,6 @@ components:
     AnalyticRuleDoc:
       type: object
       properties:
-        allowDuplicateNotifications:
-          type: boolean
         analyticNotificationConfig:
           $ref: '#/components/schemas/NotificationConfig'
         analyticProcessConfig:
@@ -7550,6 +7563,8 @@ components:
           type: string
         errorFeed:
           $ref: '#/components/schemas/DocRef'
+        ignoreDuplicateNotifications:
+          type: boolean
         languageVersion:
           type: string
           enum:
@@ -7567,6 +7582,8 @@ components:
             $ref: '#/components/schemas/Param'
         query:
           type: string
+        rememberNotifications:
+          type: boolean
         timeRange:
           $ref: '#/components/schemas/TimeRange'
         type:
@@ -8726,6 +8743,15 @@ components:
         lineNo:
           type: integer
           format: int32
+    DeleteDuplicateCheckRequest:
+      type: object
+      properties:
+        analyticDocUuid:
+          type: string
+        rows:
+          type: array
+          items:
+            $ref: '#/components/schemas/DuplicateCheckRow'
     Dependency:
       type: object
       properties:
@@ -10269,6 +10295,22 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/CriteriaFieldSort'
+    FindDuplicateCheckCriteria:
+      type: object
+      properties:
+        analyticDocUuid:
+          type: string
+        pageRequest:
+          $ref: '#/components/schemas/PageRequest'
+        quickFilterInput:
+          type: string
+        sort:
+          type: string
+          writeOnly: true
+        sortList:
+          type: array
+          items:
+            $ref: '#/components/schemas/CriteriaFieldSort'
     FindElementDocRequest:
       type: object
       properties: