api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/metadata/MetadataEncryptionIssue.java

@@ -2,14 +2,14 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.metadata;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-public class MetadataEncryptionIssue extends Problem {
+public final class MetadataEncryptionIssue extends Problem {
 
-    private static final String type = SCHEMA_URL + "encryption-issue";
-    private static final String title = "Entschlüsselungs-Fehler";
-    private static final String detail = "Die Entschlüsselung des Metadatensatzes ist fehlgeschlagen.";
-    private static final String instance = "metadata";
+    private static final String TYPE = SCHEMA_URL + "encryption-issue";
+    private static final String TITLE = "Decryption failure";
+    private static final String DETAIL = "Decrypting metadata failed.";
+    private static final String INSTANCE = "metadata";
 
     public MetadataEncryptionIssue() {
-        super(type, title, detail, instance);
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/metadata/MetadataEncryptionKeyIssue.java

@@ -4,14 +4,14 @@ import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
 import static java.lang.String.format;
 
-public class MetadataEncryptionKeyIssue extends Problem {
+public final class MetadataEncryptionKeyIssue extends Problem {
 
-    private static final String type = SCHEMA_URL + "encryption-issue";
-    private static final String title = "Entschlüsselungs-Fehler";
-    private static final String detail = "Der Schlüssel %s ist nicht der zu diesem Zweck vorgesehene Schlüssel.";
-    private static final String instance = "metadata";
+    private static final String TYPE = SCHEMA_URL + "encryption-issue";
+    private static final String TITLE = "Encryption failure";
+    private static final String DETAIL = "The key %s is not the key intended for this purpose.";
+    private static final String INSTANCE = "metadata";
 
     public MetadataEncryptionKeyIssue(final String keyId) {
-        super(type, title, format(detail, keyId), instance);
+        super(TYPE, TITLE, format(DETAIL, keyId), INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/metadata/MetadataJsonSyntaxViolation.java

@@ -2,14 +2,14 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.metadata;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-public class MetadataJsonSyntaxViolation extends Problem {
+public final class MetadataJsonSyntaxViolation extends Problem {
 
-    private static final String type = SCHEMA_URL + "syntax-violation";
-    private static final String title = "Syntax-Fehler";
-    private static final String detail = "Der Metadatensatz ist kein valides JSON.";
-    private static final String instance = "metadata";
+    private static final String TYPE = SCHEMA_URL + "syntax-violation";
+    private static final String TITLE = "Syntax violation";
+    private static final String DETAIL = "Metadata record is no valid JSON.";
+    private static final String INSTANCE = "metadata";
 
     public MetadataJsonSyntaxViolation() {
-        super(type, title, detail, instance);
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/metadata/MetadataSchemaViolation.java

@@ -2,14 +2,14 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.metadata;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-public class MetadataSchemaViolation extends Problem {
+public final class MetadataSchemaViolation extends Problem {
 
-    private static final String type = SCHEMA_URL + "schema-violation";
-    private static final String title = "Schema-Fehler";
-    private static final String detail = "Der Metadatensatz ist nicht schema-valide.";
-    private static final String instance = "metadata";
+    private static final String TYPE = SCHEMA_URL + "schema-violation";
+    private static final String TITLE = "Schema violation";
+    private static final String DETAIL = "Submission data does not comply to schema.";
+    private static final String INSTANCE = "metadata";
 
     public MetadataSchemaViolation() {
-        super(type, title, detail, instance);
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/metadata/MissingData.java

@@ -2,14 +2,14 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.metadata;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-public class MissingData extends Problem {
+public final class MissingData extends Problem {
 
-    private static final String type = SCHEMA_URL + "missing-data";
-    private static final String title = "Fachdatensatz fehlt";
-    private static final String detail = "Der Fachdatensatz fehlt.";
-    private static final String instance = "metadata";
+    private static final String TYPE = SCHEMA_URL + "missing-data";
+    private static final String TITLE = "Submission data missing";
+    private static final String DETAIL = "Submission data is missing";
+    private static final String INSTANCE = "metadata";
 
     public MissingData() {
-        super(type, title, detail, instance);
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/metadata/MissingSchemaReference.java

@@ -2,14 +2,14 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.metadata;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-public class MissingSchemaReference extends Problem {
+public final class MissingSchemaReference extends Problem {
 
-    private static final String type = SCHEMA_URL + "missing-schema";
-    private static final String title = "Schema-Referenz fehlt";
-    private static final String detail = "Die Schema-Referenz fehlt im Metadatensatz.";
-    private static final String instance = "metadata";
+    private static final String TYPE = SCHEMA_URL + "missing-schema";
+    private static final String TITLE = "Schema reference missing";
+    private static final String DETAIL = "Metadata does not contain a schema reference.";
+    private static final String INSTANCE = "metadata";
 
     public MissingSchemaReference() {
-        super(type, title, detail, instance);
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/metadata/ServiceMismatch.java

@@ -2,14 +2,14 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.metadata;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-public class ServiceMismatch extends Problem {
+public final class ServiceMismatch extends Problem {
 
-    private static final String type = SCHEMA_URL + "service-mismatch";
-    private static final String title = "Verwaltungsleistung stimmt nicht überein";
-    private static final String detail = "Die Verwaltungsleistung in Submission und Metadatensatz stimmen nicht überein.";
-    private static final String instance = "metadata";
+    private static final String TYPE = SCHEMA_URL + "service-mismatch";
+    private static final String TITLE = "Service type does not match";
+    private static final String DETAIL = "Service type of metadata does not match submission.";
+    private static final String INSTANCE = "metadata";
 
     public ServiceMismatch() {
-        super(type, title, detail, instance);
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/metadata/UnsupportedDataSchema.java

@@ -2,14 +2,14 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.metadata;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-public class UnsupportedDataSchema extends Problem {
+public final class UnsupportedDataSchema extends Problem {
 
-    private static final String type = SCHEMA_URL + "unsupported-schema";
-    private static final String title = "Fachdatenschema nicht unterstützt";
-    private static final String detail = "Das angegebene Fachdatenschema wird nicht unterstützt.";
-    private static final String instance = "metadata";
+    private static final String TYPE = SCHEMA_URL + "unsupported-schema";
+    private static final String TITLE = "Data schema not supported";
+    private static final String DETAIL = "Submission data schema is not supported.";
+    private static final String INSTANCE = "metadata";
 
     public UnsupportedDataSchema() {
-        super(type, title, detail, instance);
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/metadata/UnsupportedMetadataSchema.java

@@ -4,14 +4,14 @@ import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
 import static java.lang.String.format;
 
-public class UnsupportedMetadataSchema extends Problem {
+public final class UnsupportedMetadataSchema extends Problem {
 
-    private static final String type = SCHEMA_URL + "unsupported-schema";
-    private static final String title = "Metadatenschema nicht unterstützt";
-    private static final String detail = "Die angegebene Metadatenschema-URI ('%s') ist keines der unterstützten Metadatenschemas.";
-    private static final String instance = "metadata";
+    private static final String TYPE = SCHEMA_URL + "unsupported-schema";
+    private static final String TITLE = "Metadata schema not supported";
+    private static final String DETAIL = "The specified metadata schema URI ('%s') is not referring to a supported metadata schema.";
+    private static final String INSTANCE = "metadata";
 
     public UnsupportedMetadataSchema(final String metadataSchemaUri) {
-        super(type, title, format(detail, metadataSchemaUri), instance);
+        super(TYPE, TITLE, format(DETAIL, metadataSchemaUri), INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/metadata/UnsupportedReplyChannel.java

@@ -2,14 +2,14 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.metadata;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-public class UnsupportedReplyChannel extends Problem {
+public final class UnsupportedReplyChannel extends Problem {
 
-    private static final String type = SCHEMA_URL + "unsupported-reply-channel";
-    private static final String title = "Rückkanal nicht unterstützt";
-    private static final String detail = "Der gewählte Rückkanal wird nicht unterstützt.";
-    private static final String instance = "metadata";
+    private static final String TYPE = SCHEMA_URL + "unsupported-reply-channel";
+    private static final String TITLE = "Reply channel is not supported";
+    private static final String DETAIL = "The chosen reply channel is not supported.";
+    private static final String INSTANCE = "metadata";
 
     public UnsupportedReplyChannel() {
-        super(type, title, detail, instance);
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/metadata/UnsupportedService.java

@@ -2,14 +2,14 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.metadata;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-public class UnsupportedService extends Problem {
+public final class UnsupportedService extends Problem {
 
-    private static final String type = SCHEMA_URL + "unsupported-service";
-    private static final String title = "Verwaltungsleistung nicht unterstützt";
-    private static final String detail = "Die angegebene Verwaltungsleistung wird nicht unterstützt.";
-    private static final String instance = "metadata";
+    private static final String TYPE = SCHEMA_URL + "unsupported-service";
+    private static final String TITLE = "Service nor supported";
+    private static final String DETAIL = "The specified service is not supported.";
+    private static final String INSTANCE = "metadata";
 
     public UnsupportedService() {
-        super(type, title, detail, instance);
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/other/TechnicalError.java

@@ -2,14 +2,14 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.other;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-public class TechnicalError extends Problem {
+public final class TechnicalError extends Problem {
 
-    private static final String type = SCHEMA_URL + "technical-error";
-    private static final String title = "Technischer Fehler";
-    private static final String detail = "Bei der Verarbeitung im empfangenden System trat ein technischer Fehler auf.";
-    private static final String instance = "other";
+    private static final String TYPE = SCHEMA_URL + "technical-error";
+    private static final String TITLE = "Technical error";
+    private static final String DETAIL = "A technical error occurred during processing in the receiving system.";
+    private static final String INSTANCE = "other";
 
     public TechnicalError() {
-        super(type, title, detail, instance);
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/submission/AttachmentsMismatch.java

@@ -2,13 +2,13 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.submission;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-public class AttachmentsMismatch extends Problem {
-    private static final String type = SCHEMA_URL + "attachments-mismatch";
-    private static final String title = "Fehlerhafte Anlagen-Liste";
-    private static final String detail = "Die Liste der Anlagen in Submission und Event-Log stimmt nicht überein.";
-    private static final String instance = "submission";
+public final class AttachmentsMismatch extends Problem {
+    private static final String TYPE = SCHEMA_URL + "attachments-mismatch";
+    private static final String TITLE = "List of attachments is invalid";
+    private static final String DETAIL = "List of attachments in submission does not match list on event log.";
+    private static final String INSTANCE = "submission";
 
     public AttachmentsMismatch() {
-        super(type, title, detail, instance);
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/submission/InvalidEventLog.java

@@ -2,13 +2,14 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.submission;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-public class InvalidEventLog extends Problem {
-    private static final String type = SCHEMA_URL + "invalid-event-log";
-    private static final String title = "Inkonsistentes Event-Log";
-    private static final String detail = "Das Event-Log ist inkonsistent.";
-    private static final String instance = "submission";
+public final class InvalidEventLog extends Problem {
+
+    private static final String TYPE = SCHEMA_URL + "invalid-event-log";
+    private static final String TITLE = "Inconsistent Event-Log";
+    private static final String DETAIL = "The Event-Log is inconsistent.";
+    private static final String INSTANCE = "submission";
 
     public InvalidEventLog() {
-        super(type, title, detail, instance);
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/submission/MissingAuthenticationTags.java

@@ -2,15 +2,13 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.submission;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-import static java.lang.String.format;
-
 public class MissingAuthenticationTags extends Problem {
-    private static final String type = SCHEMA_URL + "missing-authentication-tags";
-    private static final String title = "Fehlende Authentication-Tags";
-    private static final String detail = "Das Event 'submit-submission' enthält keine Authentication-Tags.";
-    private static final String instance = "submission";
+    private static final String TYPE = SCHEMA_URL + "missing-authentication-tags";
+    private static final String TITLE = "Authentication tags missing";
+    private static final String DETAIL = "The 'submit-submission' event does not contain authentication tags.";
+    private static final String INSTANCE = "submission";
 
-    public MissingAuthenticationTags(final String attachmentId){
-        super(type, title, format(detail, attachmentId), format(instance, attachmentId));
+    public MissingAuthenticationTags(){
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/submission/NotExactlyOneSubmitEvent.java

+package dev.fitko.fitconnect.api.domain.model.event.problems.submission;
+
+import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
+
+public class NotExactlyOneSubmitEvent extends Problem {
+
+    private static final String TYPE = SCHEMA_URL + "invalid-event-log";
+    private static final String TITLE = "Inconsistent Event-Log";
+    private static final String DETAIL = "The Event-Log is inconsistent because it does not contain exactly one 'submit' event.";
+    private static final String INSTANCE = "submission";
+
+    public NotExactlyOneSubmitEvent() {
+        super(TYPE, TITLE, DETAIL, INSTANCE);
+    }
+
+}

api/src/main/java/dev/fitko/fitconnect/api/domain/model/event/problems/submission/SubmissionTimeout.java

@@ -2,13 +2,13 @@ package dev.fitko.fitconnect.api.domain.model.event.problems.submission;
 
 import dev.fitko.fitconnect.api.domain.model.event.problems.Problem;
 
-public class SubmissionTimeout extends Problem {
-    private static final String type = SCHEMA_URL + "timeout";
-    private static final String title = "Zeitablauf";
-    private static final String detail = "Die Einreichung wurde automatisch zurückgewiesen.";
-    private static final String instance = "submission";
+public final class SubmissionTimeout extends Problem {
+    private static final String TYPE = SCHEMA_URL + "timeout";
+    private static final String TITLE = "Submission Timeout";
+    private static final String DETAIL = "The submission was automatically rejected.";
+    private static final String INSTANCE = "submission";
 
     public SubmissionTimeout() {
-        super(type, title, detail, instance);
+        super(TYPE, TITLE, DETAIL, INSTANCE);
     }
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/Metadata.java

@@ -5,38 +5,31 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import dev.fitko.fitconnect.api.domain.model.metadata.payment.PaymentInformation;
 import dev.fitko.fitconnect.api.domain.model.replychannel.ReplyChannel;
 import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 import java.util.List;
 
-@Setter
+@Data
 @EqualsAndHashCode
 @AllArgsConstructor
 @NoArgsConstructor
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class Metadata {
 
-    @Getter
     @JsonProperty("$schema")
     private String schema;
 
-    @Getter
     private ContentStructure contentStructure;
 
     private PublicServiceType publicServiceType;
 
-    @Getter
     private List<AuthenticationInformation> authenticationInformation;
 
-    @Getter
     private PaymentInformation paymentInformation;
 
-    @Getter
     private ReplyChannel replyChannel;
 
-    @Getter
     private AdditionalReferenceInfo additionalReferenceInfo;
 }

api/src/main/java/dev/fitko/fitconnect/api/domain/model/metadata/attachment/AttachmentForValidation.java

+package dev.fitko.fitconnect.api.domain.model.metadata.attachment;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.UUID;
+
+@Data
+@AllArgsConstructor
+public class AttachmentForValidation {
+
+    private UUID attachmentId;
+    private String metadataHash;
+    private byte[] decryptedData;
+    private String encryptedData;
+    private ApiAttachment attachmentMetadata;
+
+    public AttachmentForValidation(final ApiAttachment attachmentMetadata, final String encryptedData, final byte[] decryptedData){
+        attachmentId = attachmentMetadata.getAttachmentId();
+        metadataHash = attachmentMetadata.getHash().getContent();
+        this.attachmentMetadata = attachmentMetadata;
+        this.decryptedData = decryptedData;
+        this.encryptedData = encryptedData;
+    }
+}

api/src/main/java/dev/fitko/fitconnect/api/domain/validation/ValidationContext.java

@@ -39,7 +39,7 @@ public class ValidationContext {
         }
     }
 
-    public void addResult(final boolean test, final String message) {
+    public void addErrorIfTestFailed(final boolean test, final String message) {
         if (!test) {
             addResult(ValidationResult.error(new ValidationException(message)));
         }