Improve Templates for Slack, GChat, and MSTeams

openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/email/EmailPublisher.java

@@ -83,11 +83,10 @@ public void sendMessage(ChangeEvent event) throws EventPublisherException {
   public void sendTestMessage() throws EventPublisherException {
     try {
       Set<String> receivers = emailAlertConfig.getReceivers();
-      EmailMessage emailMessage =
-          emailDecorator.buildOutgoingTestMessage(eventSubscription.getFullyQualifiedName());
+      EmailUtil.testConnection();
+
       for (String email : receivers) {
-        EmailUtil.sendChangeEventMail(
-            eventSubscription.getFullyQualifiedName(), email, emailMessage);
+        EmailUtil.sendTestEmail(email, false);
       }
       setSuccessStatus(System.currentTimeMillis());
     } catch (Exception e) {

openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/gchat/GChatMessage.java

@@ -3,39 +3,75 @@
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
 public class GChatMessage {
 
-  @Getter @Setter private String text;
-  @Getter @Setter private List<CardsV2> cardsV2;
-
-  public static class CardsV2 {
-    @Getter @Setter private String cardId;
-    @Getter @Setter private Card card;
-  }
+  private List<GChatMessage.Card> cards;
 
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
   public static class Card {
-
-    @Getter @Setter private CardHeader header;
-    @Getter @Setter private List<Section> sections;
+    private GChatMessage.Header header;
+    private List<GChatMessage.Section> sections;
   }
 
-  public static class CardHeader {
-    @Getter @Setter private String title;
-    @Getter @Setter private String subtitle;
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class Header {
+    private String title;
+    private String imageUrl;
+    private String imageStyle;
   }
 
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
   public static class Section {
-    @Getter @Setter private List<Widget> widgets;
+    private List<GChatMessage.Widget> widgets;
   }
 
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
   public static class Widget {
-    @Getter @Setter private TextParagraph textParagraph;
+    private GChatMessage.KeyValue keyValue;
+    private GChatMessage.TextParagraph textParagraph;
+
+    public Widget(GChatMessage.KeyValue keyValue) {
+      this.keyValue = keyValue;
+    }
+
+    public Widget(GChatMessage.TextParagraph textParagraph) {
+      this.textParagraph = textParagraph;
+    }
+  }
+
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class KeyValue {
+    private String topLabel;
+    private String content;
   }
 
+  @Getter
+  @Setter
+  @NoArgsConstructor
   @AllArgsConstructor
   public static class TextParagraph {
-    @Getter @Setter private String text;
+    private String text;
   }
 }

openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/msteams/TeamsMessage.java

@@ -1,34 +1,156 @@
 package org.openmetadata.service.apps.bundles.changeEvent.msteams;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 @Getter
 @Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class TeamsMessage {
+  @JsonProperty("type")
+  private String type;
+
+  @JsonProperty("attachments")
+  private List<TeamsMessage.Attachment> attachments;
+
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  @NoArgsConstructor
+  @Builder
+  public static class Attachment {
+    @JsonProperty("contentType")
+    private String contentType;
+
+    @JsonProperty("content")
+    private TeamsMessage.AdaptiveCardContent content;
+  }
+
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  @NoArgsConstructor
+  @Builder
+  public static class AdaptiveCardContent {
+    @JsonProperty("type")
+    private String type;
+
+    @JsonProperty("version")
+    private String version;
+
+    @JsonProperty("body")
+    private List<TeamsMessage.BodyItem> body;
+  }
+
   @Getter
   @Setter
-  public static class Section {
-    @JsonProperty("activityTitle")
-    public String activityTitle;
+  @AllArgsConstructor
+  @NoArgsConstructor
+  @Builder
+  public static class ColumnSet implements TeamsMessage.BodyItem {
+    @JsonProperty("type")
+    private String type;
 
-    @JsonProperty("activityText")
-    public String activityText;
+    @JsonProperty("columns")
+    private List<TeamsMessage.Column> columns;
   }
 
-  @JsonProperty("@type")
-  public String type = "MessageCard";
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  @NoArgsConstructor
+  @Builder
+  public static class Column {
+    @JsonProperty("type")
+    private String type;
+
+    @JsonProperty("items")
+    private List<TeamsMessage.BodyItem> items;
 
-  @JsonProperty("@context")
-  public String context = "http://schema.org/extensions";
+    @JsonProperty("width")
+    private String width;
+  }
 
-  @JsonProperty("summary")
-  public String summary;
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  @NoArgsConstructor
+  @Builder
+  public static class Image implements TeamsMessage.BodyItem {
+    @JsonProperty("type")
+    private String type;
+
+    @JsonProperty("url")
+    private String url;
+
+    @JsonProperty("size")
+    private String size;
+  }
+
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  @NoArgsConstructor
+  @Builder
+  public static class TextBlock implements TeamsMessage.BodyItem {
+    @JsonProperty("type")
+    private String type;
+
+    @JsonProperty("text")
+    private String text;
+
+    @JsonProperty("size")
+    private String size;
+
+    @JsonProperty("weight")
+    private String weight;
+
+    @JsonProperty("wrap")
+    private boolean wrap;
+
+    @JsonProperty("horizontalAlignment")
+    private String horizontalAlignment;
+
+    @JsonProperty("spacing")
+    private String spacing;
+
+    @JsonProperty("separator")
+    private boolean separator;
+  }
+
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  @NoArgsConstructor
+  @Builder
+  public static class FactSet implements TeamsMessage.BodyItem {
+    @JsonProperty("type")
+    private String type;
+
+    @JsonProperty("facts")
+    private List<TeamsMessage.Fact> facts;
+  }
+
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  @NoArgsConstructor
+  @Builder
+  public static class Fact {
+    @JsonProperty("title")
+    private String title;
+
+    @JsonProperty("value")
+    private String value;
+  }
 
-  @JsonProperty("sections")
-  public List<Section> sections;
+  // Interface for Body Items
+  public interface BodyItem {}
 }

openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/changeEvent/slack/SlackAttachment.java

@@ -1,63 +1,54 @@
 package org.openmetadata.service.apps.bundles.changeEvent.slack;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.slack.api.model.block.LayoutBlock;
 import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 
+@Setter
+@Getter
 @JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class SlackAttachment {
-  @Getter @Setter private String fallback;
-  @Getter @Setter private String color;
-  @Getter @Setter private String pretext;
+  private String fallback;
+  private String color;
+  private String pretext;
 
   @JsonProperty("author_name")
-  @Getter
-  @Setter
   private String authorName;
 
   @JsonProperty("author_link")
-  @Getter
-  @Setter
   private String authorLink;
 
   @JsonProperty("author_icon")
-  @Getter
-  @Setter
   private String authorIcon;
 
-  @Getter @Setter private String title;
+  private String title;
 
   @JsonProperty("title_link")
-  @Getter
-  @Setter
   private String titleLink;
 
-  @Getter @Setter private String text;
-  @Getter @Setter private Field[] fields;
+  private String text;
+  private Field[] fields;
 
   @JsonProperty("image_url")
-  @Getter
-  @Setter
   private String imageUrl;
 
   @JsonProperty("thumb_url")
-  @Getter
-  @Setter
   private String thumbUrl;
 
-  @Getter @Setter private String footer;
+  private String footer;
 
   @JsonProperty("footer_icon")
-  @Getter
-  @Setter
   private String footerIcon;
 
-  @Getter @Setter private String ts;
+  private String ts;
 
   @JsonProperty("mrkdwn_in")
-  @Getter
-  @Setter
   private List<String> markdownIn;
+
+  private List<LayoutBlock> blocks;
 }