OZG-5156 Accept FIM messages in XTA adapter

set fallback createdAt

fim-adapter/src/main/java/de/ozgcloud/eingang/fim/FimProperties.java

@@ -3,7 +3,6 @@ package de.ozgcloud.eingang.fim;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import lombok.Getter;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.ArrayList;
@@ -12,7 +11,6 @@ import java.util.List;
 @Validated
 @Configuration
 @ConfigurationProperties(prefix = FimProperties.PROPERTIES_PREFIX)
-@PropertySource("classpath:fim-application.yml")
 @Getter
 public class FimProperties {
     static final String PROPERTIES_PREFIX = "fim";

fim-adapter/src/main/java/de/ozgcloud/eingang/fim/FimService.java

@@ -91,9 +91,6 @@ public class FimService {
 
         adapter.extractZustaendigeStelle(builder, initialFormData);
 
-        // FIXME remove me please
-        builder.zustaendigeStelle(ZustaendigeStelle.builder().organisationseinheitenId("vbe:010550120100").build());
-
         return builder.build();
     }
 

fim-adapter/src/main/resources/fim-application.yml

-fim:
-  schemeLocations:
-    - fim-s17000652_1.4/S17000652V1.4_xfall.xsd
\ No newline at end of file

fim-adapter/src/test/resources/application-test.yml

-fim:
-  schemeLocations:
-    - fim-s17000652_1.4/S17000652V1.4_xfall.xsd
-    - test2/test2.xsd
\ No newline at end of file

xta-adapter/pom.xml

@@ -107,30 +107,6 @@
 					<profiles>local,sec</profiles>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>de.ozgcloud.eingang</groupId>
-									<artifactId>fim-adapter</artifactId>
-									<version>${project.version}</version>
-									<includes>**/*.yaml</includes>
-									<includes>**/*.xml</includes>
-									<includes>**/*.xsd</includes>
-								</artifactItem>
-							</artifactItems>
-							<outputDirectory>${project.build.directory}/classes/BOOT-INF</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>

xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMapperHelper.java

@@ -4,6 +4,8 @@ import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 
+import java.time.ZonedDateTime;
+
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class XtaMapperHelper {
 
@@ -18,4 +20,11 @@ public class XtaMapperHelper {
         }
         return null;
     }
+
+    public static ZonedDateTime getCreatedAt(XtaMessageMetaData metaData) {
+        if (metaData.getOrigin() != null) {
+            return metaData.getOrigin();
+        }
+        return ZonedDateTime.now();
+    }
 }

xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageMapper.java

@@ -29,7 +29,7 @@ interface XtaMessageMapper {
 	@Mapping(target = "requestId", source = "messageId")
 	@Mapping(target = "vorgangNummer", expression = "java(vorgangNummerSupplier.get(VORGANG_NUMMER_SUFFIX_LENGTH))")
 	@Mapping(target = "serviceKonto", ignore = true)
-	@Mapping(target = "createdAt", source = "origin")
+	@Mapping(target = "createdAt", expression = "java(XtaMapperHelper.getCreatedAt(metaData))")
 	@Mapping(target = "sender", constant = "XTA")
 	@Mapping(target = "channel", constant = "XTA")
 	@Mapping(target = "formName", ignore = true)

xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaRunner.java

@@ -11,7 +11,7 @@ import de.ozgcloud.eingang.semantik.SemantikAdapter;
 import lombok.NonNull;
 import lombok.extern.log4j.Log4j2;
 
-@Profile("!itcase")
+@Profile({"!itcase", "fim"})
 @Log4j2
 @Component
 class XtaRunner implements ApplicationListener<ContextRefreshedEvent> {