Added: Fetch human readable bridgehead for emails

samply · Nov 29, 2024 · 7aeb18a · 7aeb18a
1 parent e119637
commit 7aeb18a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -164,3 +164,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Combine first and last name in name 
 - Replace email context variables in email subject
 - Default and Default var in html tags
+- Fetch human readable bridgehead for emails
diff --git a/src/main/java/de/samply/email/EmailKeyValues.java b/src/main/java/de/samply/email/EmailKeyValues.java
@@ -1,6 +1,7 @@
 package de.samply.email;
 
 import de.samply.app.ProjectManagerConst;
+import de.samply.bridgehead.BridgeheadConfiguration;
 import de.samply.db.model.Project;
 import de.samply.db.model.ProjectBridgehead;
 import de.samply.db.model.ProjectBridgeheadUser;
@@ -26,17 +27,20 @@ public class EmailKeyValues {
     private final ProjectBridgeheadRepository projectBridgeheadRepository;
     private final ProjectRepository projectRepository;
     private final UserRepository userRepository;
+    private final BridgeheadConfiguration bridgeheadConfiguration;
 
 
     public EmailKeyValues(FrontendService frontendService,
                           EmailContext emailContext,
                           ProjectBridgeheadRepository projectBridgeheadRepository,
                           ProjectRepository projectRepository,
-                          UserRepository userRepository) {
+                          UserRepository userRepository,
+                          BridgeheadConfiguration bridgeheadConfiguration) {
         this.frontendService = frontendService;
         this.projectBridgeheadRepository = projectBridgeheadRepository;
         this.projectRepository = projectRepository;
         this.userRepository = userRepository;
+        this.bridgeheadConfiguration = bridgeheadConfiguration;
         keyValues.putAll(emailContext.getContext());
     }
 
@@ -113,10 +117,14 @@ public EmailKeyValues add(ProjectBridgehead projectBridgehead) {
     }
 
     public EmailKeyValues addBridgehead(String bridgehead) {
-        addKeyValue(ProjectManagerConst.EMAIL_CONTEXT_BRIDGEHEAD, bridgehead);
+        addKeyValue(ProjectManagerConst.EMAIL_CONTEXT_BRIDGEHEAD, fetchBridgeheadHumanReadable(bridgehead));
         return this;
     }
 
+    private String fetchBridgeheadHumanReadable(String bridgehead) {
+        Optional<String> humanReadable = bridgeheadConfiguration.getHumanReadable(bridgehead);
+        return humanReadable.isPresent() ? humanReadable.get() : null;
+    }
 
     public EmailKeyValues add(Project project) {
         if (project != null) {

diff --git a/src/main/java/de/samply/email/EmailKeyValuesFactory.java b/src/main/java/de/samply/email/EmailKeyValuesFactory.java
@@ -1,5 +1,6 @@
 package de.samply.email;
 
+import de.samply.bridgehead.BridgeheadConfiguration;
 import de.samply.db.repository.ProjectBridgeheadRepository;
 import de.samply.db.repository.ProjectRepository;
 import de.samply.db.repository.UserRepository;
@@ -14,21 +15,25 @@ public class EmailKeyValuesFactory {
     private final ProjectBridgeheadRepository projectBridgeheadRepository;
     private final ProjectRepository projectRepository;
     private final UserRepository userRepository;
+    private final BridgeheadConfiguration bridgeheadConfiguration;
 
     public EmailKeyValuesFactory(FrontendService frontendService,
                                  EmailContext emailContext,
                                  ProjectBridgeheadRepository projectBridgeheadRepository,
                                  ProjectRepository projectRepository,
-                                 UserRepository userRepository) {
+                                 UserRepository userRepository,
+                                 BridgeheadConfiguration bridgeheadConfiguration) {
         this.frontendService = frontendService;
         this.emailContext = emailContext;
         this.projectBridgeheadRepository = projectBridgeheadRepository;
         this.projectRepository = projectRepository;
         this.userRepository = userRepository;
+        this.bridgeheadConfiguration = bridgeheadConfiguration;
     }
 
     public EmailKeyValues newInstance() {
-        return new EmailKeyValues(frontendService, emailContext, projectBridgeheadRepository, projectRepository, userRepository);
+        return new EmailKeyValues(frontendService, emailContext, projectBridgeheadRepository, projectRepository,
+                userRepository, bridgeheadConfiguration);
     }
 
 }