Skip to content

Commit 9617db5

Browse files
Add missing variable for topic changed mail subjects (#383)
1 parent dcc80e5 commit 9617db5

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

src/main/java/com/hermesworld/ais/galapagos/notifications/impl/NotificationEventListener.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,14 +280,15 @@ public CompletableFuture<Void> handleApplicationOwnerRequestCanceled(Application
280280
private CompletableFuture<Void> handleTopicChange(TopicEvent event, String changeText) {
281281
String environmentId = event.getContext().getKafkaCluster().getId();
282282
String topicName = event.getMetadata().getName();
283+
String topicNameAbbreviated = abbreviateTopicName(topicName);
283284
String userName = event.getContext().getContextValue(USER_NAME_KEY).map(Object::toString).orElse(unknownUser);
284285
String environmentName = kafkaClusters.getEnvironmentMetadata(environmentId)
285286
.map(KafkaEnvironmentConfig::getName).orElse(unknownEnv);
286287

287-
// TODO externalize strings
288288
NotificationParams params = new NotificationParams("topic-changed");
289289
params.addVariable("user_name", userName);
290290
params.addVariable("topic_name", topicName);
291+
params.addVariable("topic_name_abbreviated", topicNameAbbreviated);
291292
params.addVariable("change_action_text", changeText);
292293
params.addVariable("galapagos_topic_url",
293294
buildUIUrl(event, "/topics/" + topicName + "?environment=" + environmentId));

src/main/resources/mailtemplates/de/topic-changed.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
</head>
88
<!--/*@thymesVar id="user_name" type="java.lang.String"*/-->
99
<!--/*@thymesVar id="topic_name" type="java.lang.String"*/-->
10+
<!--/*@thymesVar id="topic_name_abbreviated" type="java.lang.String"*/-->
1011
<!--/*@thymesVar id="change_action_text" type="java.lang.String"*/-->
1112
<!--/*@thymesVar id="galapagos_topic_url" type="java.lang.String"*/-->
1213
<!--/*@thymesVar id="environment_name" type="java.lang.String"*/-->

src/test/java/com/hermesworld/ais/galapagos/notifications/impl/NotificationEventListenerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ void testHandleSchemaChangeDesc() throws ExecutionException, InterruptedExceptio
113113
.contains("some change description goes here"));
114114
assertFalse(
115115
params.getVariables().get("change_action_text").toString().contains("Keine Beschreibung angegeben"));
116-
116+
assertNotNull(params.getVariables().get("topic_name_abbreviated"),
117+
"topic_name_abbreviated must be set for topic-changed e-mail template");
117118
}
118119

119120
@Test

0 commit comments

Comments
 (0)