1 files changed, 42 insertions, 2 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NotificationsSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NotificationsSerializer.java
index 3d28f35fc26..d5be4d22dc2 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NotificationsSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/NotificationsSerializer.java
@@ -1,4 +1,4 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.persistence;
 
 import com.yahoo.config.provision.ApplicationName;
@@ -8,13 +8,16 @@ import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Inspector;
+import com.yahoo.slime.ObjectTraverser;
 import com.yahoo.slime.Slime;
 import com.yahoo.slime.SlimeUtils;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
+import com.yahoo.vespa.hosted.controller.notification.MailTemplating;
 import com.yahoo.vespa.hosted.controller.notification.Notification;
 import com.yahoo.vespa.hosted.controller.notification.NotificationSource;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * (de)serializes notifications for a tenant
@@ -34,6 +37,7 @@ public class NotificationsSerializer {
     private static final String atFieldName = "at";
     private static final String typeField = "type";
     private static final String levelField = "level";
+    private static final String titleField = "title";
     private static final String messagesField = "messages";
     private static final String applicationField = "application";
     private static final String instanceField = "instance";
@@ -51,6 +55,7 @@ public class NotificationsSerializer {
             notificationObject.setLong(atFieldName, notification.at().toEpochMilli());
             notificationObject.setString(typeField, asString(notification.type()));
             notificationObject.setString(levelField, asString(notification.level()));
+            notificationObject.setString(titleField, notification.title());
             Cursor messagesArray = notificationObject.setArray(messagesField);
             notification.messages().forEach(messagesArray::addString);
 
@@ -60,6 +65,22 @@ public class NotificationsSerializer {
             notification.source().clusterId().ifPresent(clusterId -> notificationObject.setString(clusterIdField, clusterId.value()));
             notification.source().jobType().ifPresent(jobType -> notificationObject.setString(jobTypeField, jobType.serialized()));
             notification.source().runNumber().ifPresent(runNumber -> notificationObject.setLong(runNumberField, runNumber));
+
+            notification.mailContent().ifPresent(mc -> {
+                notificationObject.setString("mail-template", mc.template().getId());
+                mc.subject().ifPresent(s -> notificationObject.setString("mail-subject", s));
+                var mailParamsCursor = notificationObject.setObject("mail-params");
+                mc.values().forEach((key, value) -> {
+                    if (value instanceof String str) {
+                        mailParamsCursor.setString(key, str);
+                    } else if (value instanceof List<?> l) {
+                        var array = mailParamsCursor.setArray(key);
+                        l.forEach(elem -> array.addString((String) elem));
+                    } else {
+                        throw new ClassCastException("Unsupported param type: " + value.getClass());
+                    }
+                });
+            });
         }
 
         return slime;
@@ -92,7 +113,24 @@ public class NotificationsSerializer {
                         SlimeUtils.optionalString(inspector.field(clusterIdField)).map(ClusterSpec.Id::from),
                         SlimeUtils.optionalString(inspector.field(jobTypeField)).map(jobName -> JobType.ofSerialized(jobName)),
                         SlimeUtils.optionalLong(inspector.field(runNumberField))),
-                SlimeUtils.entriesStream(inspector.field(messagesField)).map(Inspector::asString).toList());
+                SlimeUtils.optionalString(inspector.field(titleField)).orElse(""),
+                SlimeUtils.entriesStream(inspector.field(messagesField)).map(Inspector::asString).toList(),
+                mailContentFrom(inspector));
+    }
+
+    private Optional<Notification.MailContent> mailContentFrom(final Inspector inspector) {
+        return SlimeUtils.optionalString(inspector.field("mail-template")).map(template -> {
+            var builder = Notification.MailContent.fromTemplate(MailTemplating.Template.fromId(template).orElseThrow());
+            SlimeUtils.optionalString(inspector.field("mail-subject")).ifPresent(builder::subject);
+            inspector.field("mail-params").traverse((ObjectTraverser) (name, insp) -> {
+                switch (insp.type()) {
+                    case STRING -> builder.with(name, insp.asString());
+                    case ARRAY -> builder.with(name, SlimeUtils.entriesStream(insp).map(Inspector::asString).toList());
+                    default -> throw new IllegalArgumentException("Unsupported param type: " + insp.type());
+                }
+            });
+            return builder.build();
+        });
     }
     
     private static String asString(Notification.Type type) {
@@ -103,6 +141,7 @@ public class NotificationsSerializer {
             case deployment -> "deployment";
             case feedBlock -> "feedBlock";
             case reindex -> "reindex";
+            case account -> "account";
         };
     }
 
@@ -114,6 +153,7 @@ public class NotificationsSerializer {
             case "deployment" -> Notification.Type.deployment;
             case "feedBlock" -> Notification.Type.feedBlock;
             case "reindex" -> Notification.Type.reindex;
+            case "account" -> Notification.Type.account;
             default -> throw new IllegalArgumentException("Unknown serialized notification type value '" + field.asString() + "'");
         };
     }