Merge pull request #16 from DiSSCo/feature/dump

Feature/dump
DiSSCo · Dec 10, 2024 · 9518f35 · 9518f35
2 parents 8c99cb5 + 6fc94bf
commit 9518f35
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/src/main/java/eu/dissco/core/datacitepublisher/component/XmlLocReader.java b/src/main/java/eu/dissco/core/datacitepublisher/component/XmlLocReader.java
@@ -59,5 +59,6 @@ static class LocationXml {
     String href;
     String id;
     String weight;
+    String view;
   }
 }
diff --git a/src/main/java/eu/dissco/core/datacitepublisher/kafka/KafkaConsumerService.java b/src/main/java/eu/dissco/core/datacitepublisher/kafka/KafkaConsumerService.java
@@ -28,7 +28,7 @@ public class KafkaConsumerService {
   @Qualifier("objectMapper")
   private final ObjectMapper mapper;
   private final DataCitePublisherService service;
-  private static final String ERROR_MSG = "Unable to parse specimen event from the handle API";
+  private static final String ERROR_MSG = "Unable to parse {} event from the handle API";
 
   @RetryableTopic(
       attempts = "1",
@@ -39,7 +39,7 @@ public void getSpecimenMessages(@Payload String message) throws DataCiteApiExcep
       var event = mapper.readValue(message, DigitalSpecimenEvent.class);
       service.handleMessages(event);
     } catch (JsonProcessingException e) {
-      log.error(ERROR_MSG, e);
+      log.error(ERROR_MSG, "specimen", e);
       log.info("Message: {}", message);
       throw new InvalidRequestException();
     }
@@ -54,7 +54,7 @@ public void getMediaMessages(@Payload String message) throws DataCiteApiExceptio
       var event = mapper.readValue(message, DigitalMediaEvent.class);
       service.handleMessages(event);
     } catch (JsonProcessingException e) {
-      log.error(ERROR_MSG);
+      log.error(ERROR_MSG, "media", e);
       log.info("Message: {}", message);
       throw new InvalidRequestException();
     }

diff --git a/src/main/java/eu/dissco/core/datacitepublisher/service/DataCitePublisherService.java b/src/main/java/eu/dissco/core/datacitepublisher/service/DataCitePublisherService.java
@@ -181,6 +181,7 @@ private DcRequest buildDcRequest(String xmlLoc, String landingPage, String altId
                   .build()
           ).build();
     } catch (InvalidFdoProfileReceivedException e) {
+      log.error("Unable to parse Fdo Profile", e);
       throw new DataCiteMappingException();
     }
   }

diff --git a/src/main/resources/json-schema/digital-media.json b/src/main/resources/json-schema/digital-media.json
@@ -190,19 +190,6 @@
     "mediaType": {
       "type": "string",
       "description": "Describes the primary nature of the digital media",
-      "enum": [
-        "Collection",
-        "Dataset",
-        "Event",
-        "Image",
-        "InteractiveResource",
-        "MovingImage",
-        "PhysicalObject",
-        "Service",
-        "Software",
-        "Sound",
-        "Text"
-      ],
       "$comment": "idx = 407"
     },
     "mimeType": {