feat: add file attachments to iris-messages

iris-client-bff/pom.xml

@@ -229,6 +229,11 @@
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.tika</groupId>
+			<artifactId>tika-core</artifactId>
+			<version>2.2.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>

iris-client-bff/src/main/java/iris/client_bff/config/DataSubmissionConfig.java

@@ -2,6 +2,7 @@
 
 import iris.client_bff.cases.eps.CaseDataController;
 import iris.client_bff.events.eps.EventDataController;
+import iris.client_bff.iris_messages.eps.IrisMessageDataController;
 import lombok.AllArgsConstructor;
 
 import org.springframework.context.annotation.Bean;
@@ -21,6 +22,8 @@ public class DataSubmissionConfig {
 
 	EventDataController eventDataController;
 
+	IrisMessageDataController irisMessageDataController;
+
 	@Bean(name = DATA_SUBMISSION_ENDPOINT)
 	public CompositeJsonServiceExporter jsonRpcServiceImplExporter() {
 		return createCompositeJsonServiceExporter();
@@ -34,7 +37,7 @@ public CompositeJsonServiceExporter jsonRpcServiceImplExporterWithSlash() {
 	private CompositeJsonServiceExporter createCompositeJsonServiceExporter() {
 
 		CompositeJsonServiceExporter compositeJsonServiceExporter = new CompositeJsonServiceExporter();
-		compositeJsonServiceExporter.setServices(new Object[] { caseDataController, eventDataController });
+		compositeJsonServiceExporter.setServices(new Object[] { caseDataController, eventDataController, irisMessageDataController });
 		compositeJsonServiceExporter.setAllowExtraParams(true); // Used to allow the EPS to add common parameters (e.g. a signature) and not have to change all methods.
 
 		return compositeJsonServiceExporter;

iris-client-bff/src/main/java/iris/client_bff/config/HibernateSearchConfig.java

@@ -4,6 +4,8 @@
 import iris.client_bff.cases.CaseDataRequest.DataRequestIdentifier;
 import iris.client_bff.events.EventDataRequest;
 import iris.client_bff.events.model.Location.LocationIdentifier;
+import iris.client_bff.iris_messages.IrisMessage;
+import iris.client_bff.iris_messages.IrisMessageFolder;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -24,8 +26,10 @@
 import org.hibernate.search.mapper.orm.massindexing.MassIndexer;
 import org.hibernate.search.mapper.orm.session.SearchSession;
 import org.hibernate.search.mapper.pojo.bridge.IdentifierBridge;
+import org.hibernate.search.mapper.pojo.bridge.ValueBridge;
 import org.hibernate.search.mapper.pojo.bridge.runtime.IdentifierBridgeFromDocumentIdentifierContext;
 import org.hibernate.search.mapper.pojo.bridge.runtime.IdentifierBridgeToDocumentIdentifierContext;
+import org.hibernate.search.mapper.pojo.bridge.runtime.ValueBridgeToIndexedValueContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
@@ -138,6 +142,58 @@ public LocationIdentifier fromDocumentIdentifier(String value,
 							return value == null ? null : LocationIdentifier.of(value);
 						}
 					});
+
+			context.bridges().exactType(IrisMessage.IrisMessageIdentifier.class)
+					.identifierBridge(new IdentifierBridge<>() {
+
+						@Override
+						public String toDocumentIdentifier(
+								IrisMessage.IrisMessageIdentifier value,
+								IdentifierBridgeToDocumentIdentifierContext context
+						) {
+							return value.toString();
+						}
+
+						@Override
+						public IrisMessage.IrisMessageIdentifier fromDocumentIdentifier(
+								String value,
+								IdentifierBridgeFromDocumentIdentifierContext context
+						) {
+							return value == null ? null : IrisMessage.IrisMessageIdentifier.of(value);
+						}
+					});
+
+			context.bridges().exactType(IrisMessageFolder.IrisMessageFolderIdentifier.class)
+					.identifierBridge(new IdentifierBridge<>() {
+
+						@Override
+						public String toDocumentIdentifier(
+								IrisMessageFolder.IrisMessageFolderIdentifier value,
+								IdentifierBridgeToDocumentIdentifierContext context
+						) {
+							return value.toString();
+						}
+
+						@Override
+						public IrisMessageFolder.IrisMessageFolderIdentifier fromDocumentIdentifier(
+								String value,
+								IdentifierBridgeFromDocumentIdentifierContext context
+						) {
+							return value == null ? null : IrisMessageFolder.IrisMessageFolderIdentifier.of(value);
+						}
+					});
+
+			context.bridges().exactType(IrisMessageFolder.IrisMessageFolderIdentifier.class)
+					.valueBridge(new ValueBridge<IrisMessageFolder.IrisMessageFolderIdentifier, String>() {
+						@Override
+						public String toIndexedValue(
+								IrisMessageFolder.IrisMessageFolderIdentifier value,
+								ValueBridgeToIndexedValueContext context
+						) {
+							return value == null ? null : value.toString();
+						}
+					});
+
 		}
 	}
 }

iris-client-bff/src/main/java/iris/client_bff/core/utils/HibernateSearcher.java

@@ -40,15 +40,15 @@ public <T> SearchResult<T> search(String search, Pageable pageable, String[] fie
 	}
 
 	private PredicateFinalStep createQuery(String keyword, String[] fields,
-			UnaryOperator<BooleanPredicateClausesStep<?>> statusMatchFunc, SearchPredicateFactory f) {
+			UnaryOperator<BooleanPredicateClausesStep<?>> searchInterceptor, SearchPredicateFactory f) {
 
 		var boolPred = f.bool();
 
 		for (var keywordPart : StringUtils.split(keyword)) {
 			boolPred = boolPred.must(f2 -> createQueryPart(keywordPart, fields, f2));
 		}
 
-		return statusMatchFunc.apply(boolPred);
+		return searchInterceptor.apply(boolPred);
 	}
 
 	private PredicateFinalStep createQueryPart(String keyword, String[] fields, SearchPredicateFactory f) {

iris-client-bff/src/main/java/iris/client_bff/core/web/error/GlobalControllerExceptionHandler.java

@@ -1,25 +1,33 @@
 package iris.client_bff.core.web.error;
 
+import static org.apache.commons.lang3.ArrayUtils.*;
 import static org.apache.commons.lang3.StringUtils.*;
 
 import iris.client_bff.core.web.filter.ApplicationRequestSizeLimitFilter.BlockLimitExceededException;
 import iris.client_bff.events.exceptions.IRISDataRequestException;
 import iris.client_bff.search_client.exceptions.IRISSearchException;
 import iris.client_bff.ui.messages.ErrorMessages;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.http.HttpStatus;
+import org.springframework.util.unit.DataSize;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
 @Slf4j
 @ControllerAdvice
+@RequiredArgsConstructor
 public class GlobalControllerExceptionHandler extends ResponseEntityExceptionHandler {
 
+	private final MessageSourceAccessor messages;
+
 	@ResponseStatus(value = HttpStatus.SERVICE_UNAVAILABLE, reason = ErrorMessages.LOCATION_SEARCH)
 	@ExceptionHandler(IRISSearchException.class)
 	public void handleIRISSearchException(IRISSearchException ex) {
@@ -48,6 +56,16 @@ public void handleException(Exception ex) throws Exception {
 		throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, getInternalMessage(ex));
 	}
 
+	@ExceptionHandler(MaxUploadSizeExceededException.class)
+	public void handleMaxUploadSizeExceededException(MaxUploadSizeExceededException ex) {
+
+		var maxSize = DataSize.ofBytes(ex.getMaxUploadSize());
+
+		throw new ResponseStatusException(
+				HttpStatus.PAYLOAD_TOO_LARGE,
+				messages.getMessage("iris_message.max_upload_file_size", toArray(maxSize.toMegabytes() + " MB")));
+	}
+
 	private String getInternalMessage(Exception ex) {
 
 		var msg = defaultString(ex.getMessage());

iris-client-bff/src/main/java/iris/client_bff/hd_search/HdSearchException.java

@@ -0,0 +1,27 @@
+package iris.client_bff.hd_search;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
+import java.io.Serial;
+
+public class HdSearchException extends RuntimeException {
+
+    @Serial
+    private static final long serialVersionUID = -3649251457000674951L;
+
+    public HdSearchException(String failedMethod, Throwable cause) {
+        super("Call to '" + failedMethod + "' failed", cause);
+    }
+
+    public HdSearchException(String message) {
+        super(message);
+    }
+
+    public HdSearchException(Throwable cause) {
+        super(cause);
+    }
+
+    public String getErrorMessage() {
+        return ExceptionUtils.getRootCause(this).getMessage();
+    }
+}

iris-client-bff/src/main/java/iris/client_bff/hd_search/HealthDepartment.java

@@ -0,0 +1,36 @@
+package iris.client_bff.hd_search;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class HealthDepartment {
+
+    private String name;
+    private String rkiCode;
+    private String epsName;
+    private String department;
+    private Address address;
+    private ContactData contactData;
+    private ContactData covid19ContactData;
+    private ContactData entryContactData;
+
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    private class Address {
+        private String street;
+        private String zipCode;
+        private String city;
+    }
+
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    private class ContactData {
+        private String phone;
+        private String fax;
+        @JsonProperty("eMail")
+        private String eMail;
+    }
+}

iris-client-bff/src/main/java/iris/client_bff/hd_search/eps/EPSHdSearchClient.java

@@ -0,0 +1,34 @@
+package iris.client_bff.hd_search.eps;
+
+import com.googlecode.jsonrpc4j.JsonRpcHttpClient;
+import iris.client_bff.config.BackendServiceProperties;
+import iris.client_bff.hd_search.HdSearchException;
+import iris.client_bff.hd_search.HealthDepartment;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Service
+@AllArgsConstructor
+public class EPSHdSearchClient {
+
+    private final JsonRpcHttpClient epsRpcClient;
+    private BackendServiceProperties config;
+
+    public List<HealthDepartment> searchForHd(String search) {
+
+        var methodName = config.getEndpoint() + ".searchForHd";
+        Map<String, String> payload  = Map.of("searchKeyword", search);
+
+        try {
+            return Arrays.stream(epsRpcClient.invoke(methodName, payload, HealthDepartment[].class)).toList();
+        } catch (Throwable t) {
+            throw new HdSearchException(methodName, t);
+        }
+    }
+}

iris-client-bff/src/main/java/iris/client_bff/iris_messages/IrisMessage.java

@@ -0,0 +1,94 @@
+package iris.client_bff.iris_messages;
+
+import iris.client_bff.core.Aggregate;
+import iris.client_bff.core.Id;
+import lombok.*;
+import org.hibernate.search.engine.backend.types.Sortable;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.*;
+
+import javax.persistence.*;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+@Entity
+@Table(name = "iris_message")
+@Indexed
+@Data
+@EqualsAndHashCode(callSuper = true, exclude = "folder")
+@NoArgsConstructor
+public class IrisMessage extends Aggregate<IrisMessage, IrisMessage.IrisMessageIdentifier> {
+
+    public static final int SUBJECT_MAX_LENGTH = 500;
+    public static final int BODY_MAX_LENGTH = 6000;
+
+    {
+        id = IrisMessage.IrisMessageIdentifier.of(UUID.randomUUID());
+    }
+
+    @ManyToOne
+    @JoinColumn(name="folder_id", nullable=false)
+    @IndexedEmbedded(includeEmbeddedObjectId = true)
+    private IrisMessageFolder folder;
+
+    @Column(nullable = false)
+    @KeywordField(sortable = Sortable.YES, normalizer = "german")
+    private String subject;
+
+    @Column(nullable = false)
+    private String body;
+
+    @Column(nullable = false)
+    @Embedded
+    @IndexedEmbedded
+    @AttributeOverrides({
+            @AttributeOverride( name = "id", column = @Column(name = "hd_author_id")),
+            @AttributeOverride( name = "name", column = @Column(name = "hd_author_name"))
+    })
+    private IrisMessageHdContact hdAuthor;
+
+    @Column(nullable = false)
+    @Embedded
+    @IndexedEmbedded
+    @AttributeOverrides({
+            @AttributeOverride( name = "id", column = @Column(name = "hd_recipient_id")),
+            @AttributeOverride( name = "name", column = @Column(name = "hd_recipient_name"))
+    })
+    private IrisMessageHdContact hdRecipient;
+
+    private Boolean isRead;
+
+    @OneToMany(mappedBy = "message", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<IrisMessageFile> fileAttachments = new ArrayList<>();
+
+    @Embeddable
+    @EqualsAndHashCode
+    @RequiredArgsConstructor(staticName = "of")
+    @NoArgsConstructor(force = true, access = AccessLevel.PRIVATE)
+    public static class IrisMessageIdentifier implements Id, Serializable {
+
+        @Serial
+        private static final long serialVersionUID = 1140444389070674189L;
+
+        private final UUID id;
+
+        /**
+         * for JSON deserialization
+         */
+        public static IrisMessage.IrisMessageIdentifier of(String uuid) {
+            return of(UUID.fromString(uuid));
+        }
+
+        @Override
+        public String toString() {
+            return id.toString();
+        }
+
+        public UUID toUUID() {
+            return id;
+        }
+    }
+
+}