Merge branch 'main' of github.com:BIBSYSDEV/nva-publication-api into NP-3239-SPLIT-HIGHER-LEVEL-EXCEPTIONS-IN-S3

Author: Eirik-Eide-Saur

create-publication/build.gradle

@@ -3,13 +3,15 @@
 import static java.util.Objects.isNull;
 import static no.unit.nva.cristin.lambda.constants.HardcodedValues.HARDCODED_PUBLICATIONS_OWNER;
 import static no.unit.nva.publication.s3imports.ApplicationConstants.MAX_SLEEP_TIME;
+import static no.unit.nva.publication.s3imports.FileImportUtils.timestampToString;
 import static nva.commons.core.JsonUtils.objectMapperWithEmpty;
 import static nva.commons.core.attempt.Try.attempt;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
 import com.amazonaws.services.lambda.runtime.Context;
 import com.fasterxml.jackson.databind.JsonNode;
 import java.time.Clock;
+import java.time.Instant;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Random;
@@ -186,9 +188,11 @@ private void saveReportToS3(Failure<Publication> fail,
     private UriWrapper constructErrorFileUri(AwsEventBridgeEvent<FileContentsEvent<JsonNode>> event,
                                              Exception exception) {
         UriWrapper fileUri = new UriWrapper(event.getDetail().getFileUri());
+        Instant timestamp = event.getDetail().getTimestamp();
         UriWrapper bucket = fileUri.getHost();
         return bucket
                    .addChild(ERRORS_FOLDER)
+                   .addChild(timestampToString(timestamp))
                    .addChild(exception.getClass().getSimpleName())
                    .addChild(fileUri.getPath())
                    .addChild(createErrorReportFilename(event));

cristin-import/src/main/java/no/unit/nva/cristin/lambda/CristinEntryEventConsumer.java

@@ -4,6 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 import java.net.URI;
+import java.time.Instant;
+
 import no.unit.nva.publication.s3imports.FileContentsEvent;
 
 /**
@@ -14,8 +16,9 @@ public class CristinObjectEvent extends FileContentsEvent<JsonNode> {
 
     @JsonCreator
     public CristinObjectEvent(@JsonProperty(FILE_URI) URI fileUri,
+                              @JsonProperty(TIMESTAMP) Instant timestamp,
                               @JsonProperty(CONTENTS_FIELD) JsonNode contents) {
 
-        super(fileUri, contents);
+        super(fileUri, timestamp, contents);
     }
 }

cristin-import/src/main/java/no/unit/nva/cristin/lambda/dtos/CristinObjectEvent.java

@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.javafaker.Faker;
 import java.net.URI;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.util.Calendar;
 import java.util.Date;
@@ -199,7 +200,7 @@ public static CristinObject randomObject(String secondaryCategory) {
     public static <T> AwsEventBridgeEvent<FileContentsEvent<JsonNode>> toAwsEvent(T inputData) {
         AwsEventBridgeEvent<FileContentsEvent<JsonNode>> event = new AwsEventBridgeEvent<>();
         JsonNode cristinData = convertToJsonNode(inputData);
-        FileContentsEvent<JsonNode> eventDetail = new FileContentsEvent<>(randomUri(), cristinData);
+        FileContentsEvent<JsonNode> eventDetail = new FileContentsEvent<>(randomUri(), Instant.now(), cristinData);
         event.setDetailType(CristinEntryEventConsumer.EVENT_DETAIL_TYPE);
         event.setDetail(eventDetail);
         return event;

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

@@ -10,6 +10,7 @@
 import static no.unit.nva.cristin.lambda.constants.HardcodedValues.UNIT_CUSTOMER_ID;
 import static no.unit.nva.cristin.lambda.constants.MappingConstants.NVA_API_DOMAIN;
 import static no.unit.nva.cristin.lambda.constants.MappingConstants.PATH_CUSTOMER;
+import static no.unit.nva.publication.s3imports.FileImportUtils.timestampToString;
 import static nva.commons.core.JsonUtils.objectMapperNoEmpty;
 import static nva.commons.core.attempt.Try.attempt;
 import static nva.commons.core.ioutils.IoUtils.stringToStream;
@@ -32,6 +33,7 @@
 import java.io.InputStream;
 import java.nio.file.Path;
 import java.time.Clock;
+import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
@@ -326,7 +328,7 @@ public void handlerCreatesFileWithCustomNameWhenCristinIdIsNotFound() throws Jso
     }
 
     @Test
-    public void savesFileInInputFolderErrorExceptionNameInputFileLocationInputFileWhenFailingToSaveInDynamo()
+    public void savesFileInInputFolderErrorTimestampExceptionNameInputFileLocationInputFileWhenFailingToSaveInDynamo()
         throws Throwable {
         CristinObject cristinObject = CristinDataGenerator.randomObject();
         JsonNode cristinObjectWithCustomSecondaryCategory =
@@ -341,9 +343,11 @@ public void savesFileInInputFolderErrorExceptionNameInputFileLocationInputFileWh
 
         S3Driver s3Driver = new S3Driver(s3Client, "bucket");
         String expectedFilePath = awsEvent.getDetail().getFileUri().getPath();
+        Instant expectedTimestamp = awsEvent.getDetail().getTimestamp();
         String exceptionName = exception.getCause().getClass().getSimpleName();
         String fileIdWithEnding = cristinObject.getId().toString() + JSON;
         UnixPath expectedErrorFileLocation = UnixPath.of(ERRORS_FOLDER,
+                                                         timestampToString(expectedTimestamp),
                                                          exceptionName,
                                                          expectedFilePath,
                                                          fileIdWithEnding);
@@ -439,6 +443,7 @@ private UnixPath constructExpectedFilePathForEntryWithUnkownFields(
         AwsEventBridgeEvent<FileContentsEvent<Identifiable>> event,
         RuntimeException exception) {
         return UnixPath.of(ERRORS_FOLDER)
+                   .addChild(timestampToString(event.getDetail().getTimestamp()))
                    .addChild(exception.getCause().getClass().getSimpleName())
                    .addChild(event.getDetail().getFileUri().getPath())
                    .addChild(event.getDetail().getContents().getId() + JSON);
@@ -480,8 +485,10 @@ private UriWrapper constructErrorFileUri(AwsEventBridgeEvent<FileContentsEvent<J
         String cristinObjectId = awsEvent.getDetail().getContents().get(ID_FIELD_NAME).asText();
         String errorReportFilename = cristinObjectId + JSON;
         UriWrapper inputFile = new UriWrapper(awsEvent.getDetail().getFileUri());
+        Instant timestamp = awsEvent.getDetail().getTimestamp();
         UriWrapper bucket = inputFile.getHost();
         return bucket.addChild(ERRORS_FOLDER)
+                   .addChild(timestampToString(timestamp))
                    .addChild(exception.getClass().getSimpleName())
                    .addChild(inputFile.getPath())
                    .addChild(errorReportFilename);

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

@@ -12,6 +12,7 @@
   "detail": {
     "publicationsowner": "someRandomUser",
     "fileUri": "s3://bucket/parent/child/filename.json",
+    "timestamp": "2017-02-03T11:25:30.00Z",
     "contents": {
       "unknownProperty": "helloworld",
       "id": 417536,

cristin-import/src/test/resources/cristin_entry_with_unknown_property.json

@@ -16,3 +16,25 @@ dependencies {
 
     testImplementation project(":publication-testing")
 }
+
+dependencies {
+    implementation project(":publication-events")
+
+    implementation(libs.nva.datamodel) {
+        exclude group: 'com.github.bibsysdev', module: 'nva-commons'
+    }
+
+    implementation libs.nva.core
+    implementation libs.nva.identifiers
+    implementation libs.nva.eventhandlers
+    implementation libs.aws.lambda.java.core
+
+    runtimeOnly libs.jackson.databind
+    testImplementation libs.jackson.databind
+    runtimeOnly libs.jackson.core
+    testImplementation libs.jackson.core
+
+    compileOnly(libs.aws.sdk.apigateway) {
+        because "PMD complains for the com/amazonaws/regions/Regions class"
+    }
+}