diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java index 2a2f81643..38e65e111 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/manualredactions/ManualRedactionMapper.java @@ -68,12 +68,15 @@ public class ManualRedactionMapper { .positions(addRedactionRequest.getPositions()) .sourceId(addRedactionRequest.getSourceId()) .dossierId(dossierId) - .dictionaryEntryType(addRedactionRequest.getDictionaryEntryType()) + .dictionaryEntryType(addRedactionRequest.getDictionaryEntryType() != null ? addRedactionRequest.getDictionaryEntryType() : DictionaryEntryType.ENTRY) .build(); } - public List toRemoveRedactionRequestList(String dossierId, String fileId, String dossierTemplateId,Set removeRedactionRequests) { + public List toRemoveRedactionRequestList(String dossierId, + String fileId, + String dossierTemplateId, + Set removeRedactionRequests) { List requests = new ArrayList<>(); RedactionLog redactionLog = redactionLogService.getRedactionLog(dossierId, fileId); @@ -160,10 +163,11 @@ public class ManualRedactionMapper { return requests; } + public List toResizeRedactionRequestList(Set resizeRedactionRequests) { return resizeRedactionRequests.stream() - .map(resizeRedactionRequest ->ResizeRedactionRequest.builder() + .map(resizeRedactionRequest -> ResizeRedactionRequest.builder() .annotationId(resizeRedactionRequest.getAnnotationId()) .user(KeycloakSecurity.getUserId()) .status(AnnotationStatus.APPROVED) diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/manual/AddRedactionRequestModel.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/manual/AddRedactionRequestModel.java index e6d0e7d33..801dc95d1 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/manual/AddRedactionRequestModel.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/manual/AddRedactionRequestModel.java @@ -45,8 +45,7 @@ public class AddRedactionRequestModel { private boolean rectangle; private String sourceId; - - @Builder.Default - private DictionaryEntryType dictionaryEntryType = DictionaryEntryType.ENTRY; + + private DictionaryEntryType dictionaryEntryType; } diff --git a/publish-custom-image.sh b/publish-custom-image.sh new file mode 100755 index 000000000..4f282415d --- /dev/null +++ b/publish-custom-image.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +# This script compiles the project, builds a docker image with the tag - and pushes it to our nexus. + +# Set the Nexus repository URL +NEXUS_REPO="nexus.knecon.com:5001" +# Set the image name +IMAGE_NAME="red/persistence-service-server-v1" +# path to image repo +IMAGE_REPO="persistence-service-image-v1" + +echo "Running build" +mvn clean install -Pquickbuild + +# Get the current Git branch +GIT_BRANCH=$(git symbolic-ref --short HEAD) +# Get the first 5 characters of the commit hash +GIT_COMMIT_HASH=$(git rev-parse --short=5 HEAD) +# Create the image tag by combining branch and commit hash +IMAGE_TAG="${GIT_BRANCH}-${GIT_COMMIT_HASH}" +IMAGE_NAME="$NEXUS_REPO/$IMAGE_NAME:$IMAGE_TAG" + +echo "Building docker image: {$IMAGE_NAME}" +# Build the Docker image with the specified name and tag and push to nexus +mvn -f $IMAGE_REPO docker:build docker:push -Ddocker.image.version=$IMAGE_TAG + +echo "Docker image '$IMAGE_NAME' has been built and pushed to Nexus."