incorporated review comments

Signed-off-by: msvinaykumar <[email protected]>
kruize · Nov 19, 2024 · d7aec44 · d7aec44
1 parent dc5b888
commit d7aec44
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/src/main/java/com/autotune/analyzer/serviceObjects/BulkInput.java b/src/main/java/com/autotune/analyzer/serviceObjects/BulkInput.java
@@ -25,6 +25,7 @@ public class BulkInput {
     private FilterWrapper filter;
     private TimeRange time_range;
     private String datasource;
+    private Webhook webhook;
 
     // Getters and Setters
 
@@ -136,4 +137,22 @@ public void setEnd(String end) {
             this.end = end;
         }
     }
+
+    public static class Webhook{
+        private String url;
+        public String getUrl() {
+            return url;
+        }
+        public void setUrl(String url) {
+            this.url = url;
+        }
+    }
+
+    public Webhook getWebhook() {
+        return webhook;
+    }
+
+    public void setWebhook(Webhook webhook) {
+        this.webhook = webhook;
+    }
 }
diff --git a/src/main/java/com/autotune/analyzer/serviceObjects/BulkJobStatus.java b/src/main/java/com/autotune/analyzer/serviceObjects/BulkJobStatus.java
@@ -197,6 +197,14 @@ public Recommendation getRecommendations() {
         public void setNotification(Notification notification) {
             this.notification = notification;
         }
+
+        public Notification getNotification() {
+            return notification;
+        }
+
+        public void setRecommendations(Recommendation recommendations) {
+            this.recommendations = recommendations;
+        }
     }
 
     public static class Recommendation {

diff --git a/src/main/java/com/autotune/analyzer/workerimpl/BulkJobManager.java b/src/main/java/com/autotune/analyzer/workerimpl/BulkJobManager.java
@@ -252,7 +252,11 @@ public void setFinalJobStatus(String status,String notificationKey,BulkJobStatus
         if(null!=notification)
             jobData.setNotification(notificationKey,notification);
         GenericRestApiClient apiClient = new GenericRestApiClient(finalDatasource);
-        apiClient.setBaseURL(KruizeDeploymentInfo.webhook_url);
+        if(null != bulkInput.getWebhook() && null != bulkInput.getWebhook().getUrl()){
+            apiClient.setBaseURL(bulkInput.getWebhook().getUrl());
+        }else {
+            apiClient.setBaseURL(KruizeDeploymentInfo.webhook_url);
+        }
         GenericRestApiClient.HttpResponseWrapper responseCode;
         BulkJobStatus.Webhook webhook = new BulkJobStatus.Webhook(WebHookStatus.IN_PROGRESS);
         jobData.setWebhook(webhook);