Fix couple bugs

DARPA-ASKEM · Oct 17, 2024 · de7bf65 · de7bf65
1 parent b2b9c56
commit de7bf65
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/...in/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java b/...in/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
@@ -15,6 +15,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.PageRequest;
@@ -474,6 +475,7 @@ ResponseEntity<Model> createModel(
  }
  }
 
+ @Data
  public static class CreateModelFromOldRequest {
 
  Model oldModel;

diff --git a/...r/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java b/...r/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java
@@ -76,6 +76,10 @@ public void retainMetadataFields(final Model other) {
  metadata.retainMetadataFields(other.getMetadata());
  }
 
+ if (getDescription() == null) {
+ setDescription(other.getDescription());
+ }
+
  final List<String> propertiesToPreserve = List.of(
  "states",
  "metadata",

diff --git a/...va/software/uncharted/terarium/hmiserver/models/dataservice/modelparts/ModelMetadata.java b/...va/software/uncharted/terarium/hmiserver/models/dataservice/modelparts/ModelMetadata.java
@@ -85,6 +85,9 @@ public class ModelMetadata extends SupportAdditionalProperties implements Serial
  private byte[] description;
 
  public void retainMetadataFields(final ModelMetadata other) {
+ if (description == null) {
+ description = other.description;
+ }
  if (gollmCard == null) {
  gollmCard = other.gollmCard;
  }