#4289 Make analytic duplicate checking optional

gchq · May 24, 2024 · bd457f4 · bd457f4
1 parent 3609842
commit bd457f4
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 7 deletions.
diff --git a/...oom-analytics-impl/src/test/java/stroom/analytics/impl/TestDuplicateCheckFactoryImpl.java b/...oom-analytics-impl/src/test/java/stroom/analytics/impl/TestDuplicateCheckFactoryImpl.java
@@ -134,6 +134,8 @@ private DuplicateCheck createDuplicateCheck(final DuplicateCheckFactoryImpl dupl
                 .analyticProcessType(AnalyticProcessType.SCHEDULED_QUERY)
                 .notifications(createNotificationConfig())
                 .errorFeed(new DocRef("Feed", "error"))
+                .rememberNotifications(true)
+                .ignoreDuplicateNotifications(true)
                 .build();
 
         final Column column = Column

diff --git a/stroom-ui/src/api/stroom.ts b/stroom-ui/src/api/stroom.ts
@@ -139,7 +139,6 @@ export interface AnalyticProcessConfig {
 }
 
 export interface AnalyticRuleDoc {
-  allowDuplicateNotifications?: boolean;
   analyticNotificationConfig?: NotificationConfig;
   analyticProcessConfig?: AnalyticProcessConfig;
   analyticProcessType?: "STREAMING" | "TABLE_BUILDER" | "SCHEDULED_QUERY";
@@ -151,11 +150,13 @@ export interface AnalyticRuleDoc {
 
   /** A class for describing a unique reference to a 'document' in stroom.  A 'document' is an entity in stroom such as a data source dictionary or pipeline. */
   errorFeed?: DocRef;
+  ignoreDuplicateNotifications?: boolean;
   languageVersion?: "STROOM_QL_VERSION_0_1" | "SIGMA";
   name?: string;
   notifications?: NotificationConfig[];
   parameters?: Param[];
   query?: string;
+  rememberNotifications?: boolean;
   timeRange?: TimeRange;
   type?: string;
 
@@ -877,6 +878,11 @@ export interface DefaultLocation {
   lineNo?: number;
 }
 
+export interface DeleteDuplicateCheckRequest {
+  analyticDocUuid?: string;
+  rows?: DuplicateCheckRow[];
+}
+
 export interface Dependency {
   /** A class for describing a unique reference to a 'document' in stroom.  A 'document' is an entity in stroom such as a data source dictionary or pipeline. */
   from?: DocRef;
@@ -1957,6 +1963,14 @@ export interface FindDataRetentionImpactCriteria {
   sortList?: CriteriaFieldSort[];
 }
 
+export interface FindDuplicateCheckCriteria {
+  analyticDocUuid?: string;
+  pageRequest?: PageRequest;
+  quickFilterInput?: string;
+  sort?: string;
+  sortList?: CriteriaFieldSort[];
+}
+
 export interface FindElementDocRequest {
   feedName?: string;
   pipelineElement?: PipelineElement;
@@ -7909,6 +7923,25 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
       }),
   };
   duplicateCheck = {
+    /**
+     * No description
+     *
+     * @tags DuplicateCheck
+     * @name DeleteDuplicateCheckRows
+     * @summary Delete duplicate check rows
+     * @request DELETE:/duplicateCheck/v1/delete
+     * @secure
+     */
+    deleteDuplicateCheckRows: (data: DeleteDuplicateCheckRequest, params: RequestParams = {}) =>
+      this.request<any, boolean>({
+        path: `/duplicateCheck/v1/delete`,
+        method: "DELETE",
+        body: data,
+        secure: true,
+        type: ContentType.Json,
+        ...params,
+      }),
+
     /**
      * No description
      *
@@ -7918,15 +7951,10 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @request POST:/duplicateCheck/v1/find
      * @secure
      */
-    findDuplicateCheckRows: (
-      data: FindAnalyticDataShardCriteria,
-      query?: { nodeName?: string },
-      params: RequestParams = {},
-    ) =>
+    findDuplicateCheckRows: (data: FindDuplicateCheckCriteria, params: RequestParams = {}) =>
       this.request<any, ResultPageDuplicateCheckRow>({
         path: `/duplicateCheck/v1/find`,
         method: "POST",
-        query: query,
         body: data,
         secure: true,
         type: ContentType.Json,