Fixed util methods and webhook model

Author: Gretchen-z

src/main/java/dev/vality/alerting/tg/bot/model/Webhook.java

@@ -1,12 +1,10 @@
 package dev.vality.alerting.tg.bot.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * Alertmanager webhook body
@@ -31,7 +29,6 @@ public class Webhook {
     @NoArgsConstructor
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Alert {
-
         private String status;
         private Label labels;
         private Annotation annotations;
@@ -45,14 +42,7 @@ public static class Alert {
     @NoArgsConstructor
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Label {
-
         private String alertname;
-        @JsonProperty("api_type")
-        private String apiType;
-        private String code;
-        private String prometheus;
-        private String team;
-        private String url;
     }
 
     @Data

src/main/java/dev/vality/alerting/tg/bot/service/AlertBot.java

@@ -18,7 +18,8 @@
 
 import java.util.*;
 
-import static dev.vality.alerting.tg.bot.util.WebhookFormatter.formatWebhook;
+import static dev.vality.alerting.tg.bot.util.WebhookUtil.extractAlertname;
+import static dev.vality.alerting.tg.bot.util.WebhookUtil.formatWebhook;
 
 @Slf4j
 @Service
@@ -34,12 +35,7 @@ public class AlertBot implements SpringLongPollingBot, LongPollingSingleThreadUp
 
     @PostConstruct
     public void init() {
-        alertTopics = Map.of(
-                "APIErrorHttpCodeIncrease", properties.getTopics().getErrors5xx(),
-                "AltPayConversion", properties.getTopics().getAltpayConversion(),
-                "FailedMachines", properties.getTopics().getFailedMachines(),
-                "PendingPayments", properties.getTopics().getPendingPayments()
-        );
+        alertTopics = buildAlertTopicMap();
     }
 
     @Override
@@ -91,16 +87,7 @@ public void sendAlertMessage(Webhook webhook) {
             return;
         }
 
-        String alertName;
-        if (webhook.getCommonLabels() != null) {
-            alertName = webhook.getCommonLabels().getAlertname();
-        } else if (webhook.getGroupLabels() != null) {
-            alertName = webhook.getGroupLabels().getAlertname();
-        } else if (webhook.getAlerts().getFirst().getLabels() != null) {
-            alertName = webhook.getAlerts().getFirst().getLabels().getAlertname();
-        } else {
-            return;
-        }
+        String alertName = extractAlertname(webhook);
 
         sendResponse(
                 properties.getChatId(),

src/main/java/dev/vality/alerting/tg/bot/util/WebhookFormatter.java

@@ -0,0 +1,56 @@
+package dev.vality.alerting.tg.bot.util;
+
+import dev.vality.alerting.tg.bot.model.Webhook;
+
+public final class WebhookUtil {
+    public static final String FIRING = "firing";
+    public static final String RESOLVED = "resolved";
+
+    public static String extractAlertname(Webhook webhook) {
+        if (webhook.getCommonLabels() != null) {
+            return webhook.getCommonLabels().getAlertname();
+        } else if (webhook.getGroupLabels() != null) {
+            return webhook.getGroupLabels().getAlertname();
+        } else if (webhook.getAlerts().getFirst().getLabels() != null) {
+            return webhook.getAlerts().getFirst().getLabels().getAlertname();
+        } else {
+            return null;
+        }
+    }
+
+    public static String formatWebhook(Webhook webhook) {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("```").append("\n");
+
+        Webhook.Annotation annotation = webhook.getCommonAnnotations();
+
+        if (webhook.getStatus().equals(FIRING)) {
+            sb.append("АЛЕРТ СРАБОТАЛ ❗").append("\n");
+            if (annotation != null) {
+                appendLine(sb, "", annotation.getDescription());
+            }
+        } else if (webhook.getStatus().equals(RESOLVED)) {
+            sb.append("Ситуация пришла в норму ✅").append("\n");
+            if (annotation != null) {
+                appendLine(sb, "", annotation.getSummary());
+            }
+        }
+
+        sb.append("```");
+
+        return sb.toString();
+    }
+
+    private static boolean isNotBlank(String s) {
+        return s != null && !s.isBlank();
+    }
+
+    private static void appendLine(StringBuilder sb, String indent, String value) {
+        if (isNotBlank(value)) {
+            sb.append(indent)
+                    .append(value)
+                    .append("\n");
+        }
+    }
+}