Fix order of substitutions to ensure dataset name is resolved first (#…

…111)
VEuPathDB · Oct 27, 2023 · 6a88ce4 · 6a88ce4
1 parent e0e543d
commit 6a88ce4
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/Site/src/main/java/org/clinepi/service/accessRequest/AccessRequestSubmitter.java b/Site/src/main/java/org/clinepi/service/accessRequest/AccessRequestSubmitter.java
@@ -214,18 +214,18 @@ private static String wrapContentWithAutoResponse(String content) {
   }
 
   private static String createAccessRequestEmailBody(String bodyTemplate, Map<String, String> templateSubs, String datasetName) {
-    String bodyWithFilledOutFormFields = templateSubs.entrySet().stream().reduce(
-      bodyTemplate,
+    String bodyWithDatasetName = bodyTemplate.replaceAll(
+        "\\$\\$DATASET_NAME\\$\\$",
+        escapeHtml(datasetName)
+    );
+
+    return templateSubs.entrySet().stream().reduce(
+        bodyWithDatasetName,
       (body, entry) -> body.replaceAll(
         "\\$\\$" + entry.getKey().toUpperCase() + "\\$\\$",
         escapeHtml(entry.getValue())
       ),
       String::concat
     );
-
-    return bodyWithFilledOutFormFields.replaceAll(
-      "\\$\\$DATASET_NAME\\$\\$",
-      escapeHtml(datasetName)
-    );
   }
 }