ALS-5387: More robust implementation of feature

hms-dbmi · Dec 8, 2023 · cd76183 · cd76183
1 parent 2ab8d49
commit cd76183
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/pic-sure-api-data/src/main/java/edu/harvard/dbmi/avillach/data/entity/Resource.java b/pic-sure-api-data/src/main/java/edu/harvard/dbmi/avillach/data/entity/Resource.java
@@ -1,12 +1,12 @@
 package edu.harvard.dbmi.avillach.data.entity;
 
 import java.io.StringReader;
+import java.util.Optional;
 
 import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonReader;
-import javax.persistence.Column;
-import javax.persistence.Entity;
+import javax.persistence.*;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -18,6 +18,9 @@ public class Resource extends BaseEntity{
 	@Column(length = 8192)
 	private String description;
 	private String targetURL;
+
+
+	@Convert(converter = ResourcePathConverter.class)
 	private String resourceRSPath;
 
 	@Column(length = 8192)
@@ -102,4 +105,23 @@ public String toString() {
 	            .add("metadata", metadataObj)
 	            .build().toString();
 	}
+
+	@Converter
+	protected class ResourcePathConverter implements AttributeConverter {
+
+
+		private Optional<String> targetStack = Optional.ofNullable(System.getProperty("TARGET_STACK", null));
+
+		@Override
+		public Object convertToDatabaseColumn(Object attribute) {
+			return attribute;
+		}
+
+		@Override
+		public Object convertToEntityAttribute(Object dbData) {
+			return targetStack.map(stack -> {
+				return ((String) dbData).replace("___target_stack___", stack);
+			}).orElse((String) dbData);
+		}
+	}
 }
diff --git a/...-api-data/src/main/java/edu/harvard/dbmi/avillach/data/repository/ResourceRepository.java b/...-api-data/src/main/java/edu/harvard/dbmi/avillach/data/repository/ResourceRepository.java
@@ -15,14 +15,4 @@ public class ResourceRepository extends BaseRepository<Resource, UUID> {
 	protected ResourceRepository() {
 		super(Resource.class);
 	}
-
-    private Optional<String> targetStack = Optional.ofNullable(System.getProperty("TARGET_STACK", null));
-
-    public Resource getById(UUID id) {
-        Resource resource = super.getById(id);
-        targetStack.ifPresent(stack -> {
-            resource.setResourceRSPath(resource.getResourceRSPath().replace("___target_stack___", stack));
-        });
-        return resource;
-    }
 }