Merge pull request #572 from BIBSYSDEV/NP-3276-EXCEPTION-FOR-MISSING-CONTRIBUTORS

Np 3276 exception for missing contributors

Author: Eirik-Eide-Saur

cristin-import/src/main/java/no/unit/nva/cristin/CristinImportConfig.java

@@ -17,8 +17,8 @@ private CristinImportConfig() {
     }
 
     private static ObjectMapper objectMapperFailingOnUnknown() {
-        return JsonUtils.dtoObjectMapper.
-            copy().configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true)
-            .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true);
+        return JsonUtils.dtoObjectMapper
+                .copy().configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true)
+                .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true);
     }
 }

cristin-import/src/main/java/no/unit/nva/cristin/mapper/CristinMapper.java

@@ -39,6 +39,7 @@
 import no.unit.nva.cristin.mapper.nva.NvaReportBuilder;
 import no.unit.nva.cristin.mapper.nva.exceptions.InvalidIsbnRuntimeException;
 import no.unit.nva.cristin.mapper.nva.exceptions.InvalidIssnRuntimeException;
+import no.unit.nva.cristin.mapper.nva.exceptions.MissingContributorsException;
 import no.unit.nva.model.AdditionalIdentifier;
 import no.unit.nva.model.Contributor;
 import no.unit.nva.model.EntityDescription;
@@ -164,11 +165,15 @@ private EntityDescription generateEntityDescription() {
     }
 
     private List<Contributor> extractContributors() {
+        if (isNull(cristinObject.getContributors())) {
+            throw new MissingContributorsException();
+        }
         return cristinObject.getContributors()
-            .stream()
-            .map(attempt(CristinContributor::toNvaContributor))
-            .map(Try::orElseThrow)
-            .collect(Collectors.toList());
+                .stream()
+                .map(attempt(CristinContributor::toNvaContributor))
+                .map(Try::orElseThrow)
+                .collect(Collectors.toList());
+
     }
 
     private List<URI> generateNvaHrcsCategoriesAndActivities() {

cristin-import/src/main/java/no/unit/nva/cristin/mapper/nva/exceptions/MissingContributorsException.java

@@ -0,0 +1,11 @@
+package no.unit.nva.cristin.mapper.nva.exceptions;
+
+public class MissingContributorsException extends RuntimeException {
+
+    public static final String MISSING_CONTRIBUTORS_ERROR_MESSAGE =
+            "No contributors present. All publications must have contributors.";
+
+    public MissingContributorsException() {
+        super(MISSING_CONTRIBUTORS_ERROR_MESSAGE);
+    }
+}

cristin-import/src/test/java/no/unit/nva/cristin/CristinDataGenerator.java

@@ -263,6 +263,12 @@ public static JsonNode objectWithInvalidIssn() throws JsonProcessingException {
         return cristinObjectAsObjectNode(cristinObject);
     }
 
+    public static JsonNode objectWithoutContributors() throws JsonProcessingException {
+        CristinObject cristinObject = randomBook();
+        cristinObject.setContributors(null);
+        return eventHandlerObjectMapper.readTree(cristinObject.toJsonString());
+    }
+
     public static CristinObject newCristinObjectWithRoleCode(CristinContributorRoleCode roleCode) {
         return createObjectWithCristinContributorRoleCode(0, createContributors(roleCode));
     }
@@ -665,4 +671,5 @@ private static String randomDoiSuffix() {
                                                                  MAX_DOI_PREFIX_SUBPART_LENGTH))
             .collect(Collectors.joining(DOI_SUBPART_DELIMITER));
     }
+
 }

cristin-import/src/test/java/no/unit/nva/cristin/lambda/CristinEntryEventConsumerTest.java

@@ -49,6 +49,7 @@
 import no.unit.nva.cristin.mapper.nva.exceptions.InvalidIssnRuntimeException;
 import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedMainCategoryException;
 import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedSecondaryCategoryException;
+import no.unit.nva.cristin.mapper.nva.exceptions.MissingContributorsException;
 import no.unit.nva.events.models.AwsEventBridgeEvent;
 import no.unit.nva.model.Publication;
 import no.unit.nva.model.PublicationStatus;
@@ -299,6 +300,21 @@ public void handlerThrowsInvalidIssnRuntimeExceptionWhenTheIssnIsInvalid() throw
         assertThat(cause, is(instanceOf(InvalidIssnRuntimeException.class)));
     }
 
+    @Test
+    public void handlerThrowsMissingContributorsRuntimeExceptionWhenTheCristinObjectHasNoContributors()
+            throws JsonProcessingException {
+        JsonNode cristinObjectWithoutContributors = CristinDataGenerator.objectWithoutContributors();
+        AwsEventBridgeEvent<FileContentsEvent<JsonNode>> awsEvent =
+                CristinDataGenerator.toAwsEvent(cristinObjectWithoutContributors);
+        InputStream inputStream = IoUtils.stringToStream(awsEvent.toJsonString());
+
+        Executable action = () -> handler.handleRequest(inputStream, outputStream, CONTEXT);
+
+        RuntimeException exception = assertThrows(RuntimeException.class, action);
+        Throwable cause = exception.getCause();
+        assertThat(cause, is(instanceOf(MissingContributorsException.class)));
+    }
+
     @Test
     public void handlerCreatesFileWithCustomNameWhenCristinIdIsNotFound() throws JsonProcessingException {
         JsonNode cristinObjectWithoutId = CristinDataGenerator.objectWithoutId();
@@ -451,9 +467,10 @@ private AwsEventBridgeEvent<FileContentsEvent<Identifiable>> parseEventAsIdentif
         throws JsonProcessingException {
         JavaType fileContentsType = eventHandlerObjectMapper.getTypeFactory()
                                         .constructParametricType(FileContentsEvent.class, Identifiable.class);
-        JavaType eventType = eventHandlerObjectMapper.getTypeFactory().constructParametricType(AwsEventBridgeEvent.class,
-                                                                                               fileContentsType);
-        AwsEventBridgeEvent<FileContentsEvent<Identifiable>> event = eventHandlerObjectMapper.readValue(input, eventType);
+        JavaType eventType = eventHandlerObjectMapper.getTypeFactory()
+                .constructParametricType(AwsEventBridgeEvent.class, fileContentsType);
+        AwsEventBridgeEvent<FileContentsEvent<Identifiable>> event =
+                eventHandlerObjectMapper.readValue(input, eventType);
         return event;
     }