Added: Explorer Ids to create and edit query

samply · Feb 13, 2024 · 960ddbb · 960ddbb
1 parent 870baca
commit 960ddbb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -99,3 +99,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Email template for Accept/Reject/Request changes in project
 - User Autocomplete
 - Explorer Ids to create and edit query
+- Decode redirect explorer URL
diff --git a/src/main/java/de/samply/query/QueryService.java b/src/main/java/de/samply/query/QueryService.java
@@ -15,6 +15,8 @@
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.stereotype.Service;
 
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
@@ -54,7 +56,7 @@ public String createQuery(
         tempQuery.setOutputFormat(outputFormat);
         tempQuery.setTemplateId(templateId);
         tempQuery.setHumanReadable(humanReadable);
-        tempQuery.setExplorerUrl(explorerUrl);
+        tempQuery.setExplorerUrl(decodeUrlIfNecessary(explorerUrl));
         tempQuery.setContext(queryContext);
         tempQuery = this.queryRepository.save(tempQuery);
         return tempQuery.getCode();
@@ -101,7 +103,7 @@ public void editQuery(@NotNull String projectCode,
                     changedKeyValueMap.put("human readable", humanReadable);
                 }
                 if (explorerUrl != null) {
-                    projectQuery.setExplorerUrl(explorerUrl);
+                    projectQuery.setExplorerUrl(decodeUrlIfNecessary(explorerUrl));
                     changedKeyValueMap.put("explorer url", explorerUrl);
                 }
                 if (queryContext != null) {
@@ -117,6 +119,14 @@ public void editQuery(@NotNull String projectCode,
         }
     }
 
+    private String decodeUrlIfNecessary(String encodedUrl) {
+        try {
+            return URLDecoder.decode(encodedUrl, StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            return encodedUrl;
+        }
+    }
+
     private String printInOneLine(Map<String, String> changedKeyValuesMaps) {
         try {
             return objectMapper.writeValueAsString(changedKeyValuesMaps);