Merge remote-tracking branch 'refs/remotes/origin/main' into bug-fix/…

…prov-alignment # Conflicts: # src/main/java/eu/dissco/core/digitalmediaprocessor/domain/FdoProfileAttributes.java # src/main/java/eu/dissco/core/digitalmediaprocessor/service/FdoRecordService.java
DiSSCo · Aug 5, 2024 · aa0500d · aa0500d
2 parents 156279e + 0c864c9
commit aa0500d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/main/java/eu/dissco/core/digitalmediaprocessor/service/FdoRecordService.java b/src/main/java/eu/dissco/core/digitalmediaprocessor/service/FdoRecordService.java
@@ -70,11 +70,9 @@ private JsonNode generateAttributes(DigitalMediaWrapper mediaObject) throws PidC
     if (mediaObject.type() != null) {
       attributes.put(MEDIA_FORMAT.getAttribute(), MEDIA_FORMAT.getDefaultValue());
     }
-    // Optional values
+    // Default
     attributes.put(MEDIA_FORMAT.getAttribute(), MEDIA_FORMAT.getDefaultValue());
     attributes.put(DCTERMS_TYPE.getAttribute(), DCTERMS_TYPE.getDefaultValue());
-
-    // Default values
     attributes.put(ISSUED_FOR_AGENT.getAttribute(), fdoProperties.getIssuedForAgent());
     attributes.put(PRIMARY_MO_ID_TYPE.getAttribute(), PRIMARY_MO_ID_TYPE.getDefaultValue());
     attributes.put(PRIMARY_MO_ID_NAME.getAttribute(), PRIMARY_MO_ID_NAME.getDefaultValue());

diff --git a/src/test/java/eu/dissco/core/digitalmediaprocessor/TestUtils.java b/src/test/java/eu/dissco/core/digitalmediaprocessor/TestUtils.java
@@ -239,7 +239,7 @@ public static JsonNode givenPostAttributes() {
     attributes.put(PRIMARY_MEDIA_ID.getAttribute(), MEDIA_URL_1);
     attributes.put(REFERENT_NAME.getAttribute(), TYPE + " for " + DIGITAL_SPECIMEN_ID);
     attributes.put(LINKED_DO_PID.getAttribute(), DIGITAL_SPECIMEN_ID);
-    attributes.put(MEDIA_FORMAT.getAttribute(), FORMAT);
+    attributes.put(MEDIA_FORMAT.getAttribute(), MEDIA_FORMAT.getDefaultValue());
     attributes.put(ISSUED_FOR_AGENT.getAttribute(), "https://ror.org/0566bfb96");
     attributes.put(DCTERMS_TYPE.getAttribute(), DCTERMS_TYPE.getDefaultValue());
     attributes.put(PRIMARY_MO_ID_TYPE.getAttribute(), PRIMARY_MO_ID_TYPE.getDefaultValue());