OZG-4428 change json format

enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryData.java

 package de.ozgcloud.eingang.enterprise.entry;
 
-import java.util.Map;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -14,7 +14,7 @@ import lombok.extern.jackson.Jacksonized;
 public class EntryData {
 
 	private ControlData control;
-	private Map<String, EntryFormDataItem> formData;
+	private List<EntryFormDataItem> formData;
 
 	@Builder
 	@Getter

enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/EntryFormDataSubForm.java

 package de.ozgcloud.eingang.enterprise.entry;
 
-import java.util.Map;
+import java.util.List;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -19,7 +19,7 @@ public class EntryFormDataSubForm implements EntryFormDataItem {
 	private String label;
 
 	@Singular
-	private Map<String, EntryFormDataItem> formItems;
+	private List<EntryFormDataItem> formItems;
 
 	@Override
 	public boolean isSubForm() {

enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/FormDataMapper.java

 package de.ozgcloud.eingang.enterprise.entry;
 
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -42,11 +43,9 @@ public interface FormDataMapper {
 		return ZustaendigeStelle.builder().organisationseinheitenId(organisationsEinheitenId).build();
 	}
 
-	default Map<String, Object> mapFormItems(Map<String, EntryFormDataItem> map) {
-		return map.entrySet().stream()
-				.map(entry -> Pair.of(entry.getKey(),
-						entry.getValue().isFormField() ? mapFormField((EntryFormDataField) entry.getValue())
-								: mapSubForm((EntryFormDataSubForm) entry.getValue())))
+	default Map<String, Object> mapFormItems(List<EntryFormDataItem> items) {
+		return items.stream().map(item -> Pair.of(item.getName(),
+				item.isFormField() ? mapFormField((EntryFormDataField) item) : mapSubForm((EntryFormDataSubForm) item)))
 				.collect(Collectors.toMap(Pair::getKey, Pair::getValue));
 	}
 

enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryFormDataTestFactory.java

@@ -2,6 +2,7 @@ package de.ozgcloud.eingang.enterprise.entry;
 
 import static de.ozgcloud.eingang.enterprise.entry.FormDataMapper.*;
 
+import java.util.List;
 import java.util.Map;
 
 public class EntryFormDataTestFactory {
@@ -17,12 +18,16 @@ public class EntryFormDataTestFactory {
 	public static final String SUB_FORM_FIELD_LABEL = "Nachname";
 	public static final String SUB_FORM_FIELD_VALUE = "Täst";
 
-	public static Map<String, EntryFormDataItem> create() {
-		return Map.of(
-				FORM_FIELD_NAME, EntryFormDataField.builder().label(FORM_FIELD_LABEL).stringValue(FORM_FIELD_VALUE).build(),
-				SUB_FORM_NAME, EntryFormDataSubForm.builder().label(SUB_FORM_LABEL)
-						.formItem(SUB_FORM_FIELD_NAME,
-								EntryFormDataField.builder().label(SUB_FORM_FIELD_LABEL).stringValue(SUB_FORM_FIELD_VALUE).build())
+	public static List<EntryFormDataItem> create() {
+		return List.of(
+				EntryFormDataField.builder().name(FORM_FIELD_NAME).label(FORM_FIELD_LABEL).stringValue(FORM_FIELD_VALUE).build(),
+				EntryFormDataSubForm.builder().name(SUB_FORM_NAME).label(SUB_FORM_LABEL)
+						.formItem(
+								EntryFormDataField.builder()
+										.name(SUB_FORM_FIELD_NAME)
+										.label(SUB_FORM_FIELD_LABEL)
+										.stringValue(SUB_FORM_FIELD_VALUE)
+										.build())
 						.build());
 	}
 

enterprise-adapter/src/test/resources/request/simple.json

@@ -12,19 +12,22 @@
 		"formId": "KFAS_LIVE_KI_10_Haltverbot_befristet",
 		"name": "Anmeldung zur Einrichtung einer zeitlich befristeten Haltverbotszone gem. § 45 Abs. 1 Straßenverkehrsordnung (StVO)"
 	},
-	"formData": {
-		"field_name": {
+	"formData": [
+		{
+			"name": "field_name",
 			"label": "field_label",
 			"stringValue": "field_string_value"
 		},
-		"antragsteller": {
+		{
+			"name": "antragsteller",
 			"label": "Antragstellende Person",
-			"formItems": {
-				"lastname": {
+			"formItems": [
+				{
+					"name": "lastname",
 					"label": "Nachname",
 					"stringValue": "Täst"
 				}
-			}
+			]
 		}
-	}
+	]
 }
\ No newline at end of file