fix: added missing string to object mapper

onecx · Jan 8, 2024 · 7621263 · 7621263
1 parent 82ef456
commit 7621263
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/src/main/java/io/github/onecx/theme/rs/exim/v1/mappers/ExportImportMapperV1.java b/src/main/java/io/github/onecx/theme/rs/exim/v1/mappers/ExportImportMapperV1.java
@@ -40,6 +40,7 @@ public ThemeSnapshotDTOV1 create(Map<String, Theme> data) {
 
     public abstract Map<String, EximThemeDTOV1> map(Map<String, Theme> data);
 
+    @Mapping(target = "properties", qualifiedByName = "propertiesJson")
     public abstract EximThemeDTOV1 map(Theme theme);
 
     @Mapping(target = "id", ignore = true)
@@ -81,4 +82,18 @@ public String mapToString(Object properties) {
             return null;
         }
     }
+
+    @Named("propertiesJson")
+    public Object stringToObject(String jsonVar) {
+
+        if (jsonVar == null || jsonVar.isEmpty()) {
+            return null;
+        }
+
+        try {
+            return objectMapper.readTree(jsonVar);
+        } catch (JsonProcessingException e) {
+            return null;
+        }
+    }
 }
diff --git a/src/main/java/io/github/onecx/theme/rs/internal/mappers/ThemeMapper.java b/src/main/java/io/github/onecx/theme/rs/internal/mappers/ThemeMapper.java
@@ -50,6 +50,7 @@ public ThemeInfoListDTO mapInfoList(Stream<ThemeInfo> data) {
     public abstract List<ThemeDTO> map(Stream<Theme> entity);
 
     @Mapping(target = "version", source = "modificationCount")
+    @Mapping(target = "properties", qualifiedByName = "propertiesJson")
     public abstract ThemeDTO map(Theme theme);
 
     @Mapping(target = "id", ignore = true)
@@ -86,4 +87,18 @@ public String mapToString(Object properties) {
         }
     }
 
+    @Named("propertiesJson")
+    public Object stringToObject(String jsonVar) {
+
+        if (jsonVar == null || jsonVar.isEmpty()) {
+            return null;
+        }
+
+        try {
+            return mapper.readTree(jsonVar);
+        } catch (JsonProcessingException e) {
+            return null;
+        }
+    }
+
 }