diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMetaData.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMetaData.java index 1fdae1e706a5763db254cb4dbbe6e3fba9683a7a..652a9998e88c705332066c7adc340ed54fef1501 100644 --- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMetaData.java +++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMetaData.java @@ -3,6 +3,7 @@ package de.ozgcloud.eingang.xta; import java.time.ZonedDateTime; import de.ozgcloud.eingang.common.formdata.FormMetaData; +import de.ozgcloud.eingang.common.formdata.IncomingFile; import lombok.Builder; import lombok.Getter; import lombok.ToString; @@ -11,30 +12,45 @@ import lombok.ToString; @Getter @ToString class XtaMessageMetaData implements FormMetaData { + static final String SERVICE = "service"; static final String MESSAGE_TYPE_ENTRY_NAME = "messageType"; + static final String MESSAGE_TYPE_LIST_VERSION = "messageTypeListVersion"; static final String MESSAGE_ID_ENTRY_NAME = "messageId"; static final String DESTINATION_ID_ENTRY_NAME = "destinationId"; // MsgIdentification.MessageId private XtaMessageId messageId; + // DeliveryAttributes.origin private ZonedDateTime origin; // DeliveryAttributes.delivery private ZonedDateTime delivery; + // Qualifier.MessageType.code private String messageType; + // Qualifier.MessageType.listVersion + private String messageTypeListVersion; + // Qualifier.Service + private String service; private String destinationId; + private IncomingFile metaDataFile; + @Override public String getEntry(String name) { switch (name) { case MESSAGE_TYPE_ENTRY_NAME: return getMessageType(); + case MESSAGE_TYPE_LIST_VERSION: + return getMessageTypeListVersion(); case MESSAGE_ID_ENTRY_NAME: return getMessageId().toString(); case DESTINATION_ID_ENTRY_NAME: return getDestinationId(); + case SERVICE: + return getService(); + default: return null; } diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMetaDataTestFactory.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMetaDataTestFactory.java index 194bea1206b571e05b81d63b7597fcac51c62588..ec7487e3b16772e180cf99ddeea15df6390121b2 100644 --- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMetaDataTestFactory.java +++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaMessageMetaDataTestFactory.java @@ -11,6 +11,8 @@ class XtaMessageMetaDataTestFactory { static final String MESSAGE_TYPE = "Geschaeftsgang.Geschaeftsgang.0201"; static final String FIM_MESSAGE_TYPE = "fim.S17000652.17000652001004"; static final ZonedDateTime ORIGIN = ZonedDateTime.parse("2022-10-29T15:45:52.4942149+02:00"); + static final String SERVICE = "urn:fim:Versammlungsanzeige:1.4"; + static final String MESSAGE_TYPE_LIST_VERSION = "1.0"; static XtaMessageMetaData create() { return createBuilder().build(); @@ -20,8 +22,10 @@ class XtaMessageMetaDataTestFactory { return XtaMessageMetaData.builder() .messageId(MESSAGE_ID) .messageType(MESSAGE_TYPE) + .messageTypeListVersion(MESSAGE_TYPE_LIST_VERSION) .origin(ORIGIN) - .destinationId(FormMetaDataTestFactory.DESTINATION_ID); + .destinationId(FormMetaDataTestFactory.DESTINATION_ID) + .service(SERVICE); } static XtaMessageMetaData createFim() { @@ -29,10 +33,7 @@ class XtaMessageMetaDataTestFactory { } static XtaMessageMetaData.XtaMessageMetaDataBuilder createFimBuilder() { - return XtaMessageMetaData.builder() - .messageId(MESSAGE_ID) - .messageType(FIM_MESSAGE_TYPE) - .origin(ORIGIN) - .destinationId(FormMetaDataTestFactory.DESTINATION_ID); + return createBuilder() + .messageType(FIM_MESSAGE_TYPE); } }