From 937983b223670169137e42bf0ce2ba355270fc52 Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Thu, 27 Mar 2025 16:06:02 +0100
Subject: [PATCH 1/2] OZG-7837 add name to AggregationMappingDto
---
.../admin/reporting/ReportingAggregationManagerSettingDto.java | 1 +
.../admin/reporting/AggregationMappingDtoTestFactory.java | 2 ++
2 files changed, 3 insertions(+)
diff --git a/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDto.java b/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDto.java
index 00e74b76..57952411 100644
--- a/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDto.java
+++ b/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDto.java
@@ -42,6 +42,7 @@ public class ReportingAggregationManagerSettingDto {
@Getter
static class AggregationMappingDto {
private FormIdentifierDto formIdentifier;
+ private String name;
@Singular
private List<FieldMappingDto> fieldMappings;
}
diff --git a/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingDtoTestFactory.java b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingDtoTestFactory.java
index f0c601d4..91e5f065 100644
--- a/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingDtoTestFactory.java
+++ b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingDtoTestFactory.java
@@ -9,6 +9,7 @@ import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.FormIde
public class AggregationMappingDtoTestFactory {
public static final FormIdentifierDto FORM_IDENTIFIER = FormIdentifierDto.builder().formId(FORM_ID).formEngineName(FORM_ENGINE_NAME).build();
+ public static final String NAME = AggregationMappingTestFactory.NAME;
public static AggregationMappingDto create() {
return createBuilder().build();
@@ -17,6 +18,7 @@ public class AggregationMappingDtoTestFactory {
public static AggregationMappingDto.AggregationMappingDtoBuilder createBuilder() {
return AggregationMappingDto.builder()
.formIdentifier(FORM_IDENTIFIER)
+ .name(NAME)
.fieldMapping(FieldMappingDto.builder().sourcePath(SOURCE_PATH).targetPath(TARGET_PATH).build());
}
}
--
GitLab
From e15c162600539f4158fa578000f3da13b904905b Mon Sep 17 00:00:00 2001
From: Felix Reichenbach <felix.reichenbach@mgm-tp.com>
Date: Thu, 27 Mar 2025 16:15:33 +0100
Subject: [PATCH 2/2] OZG-7837 fix itcase
---
.../reporting/AggregationMappingEnvironmentSettingITCase.java | 2 ++
.../java/de/ozgcloud/admin/setting/PropertiesTestFactory.java | 4 ++++
.../resources/jsonTemplates/settings/aggregation.json.tmpl | 2 ++
3 files changed, 8 insertions(+)
diff --git a/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingEnvironmentSettingITCase.java b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingEnvironmentSettingITCase.java
index 8f7ff069..495e2d65 100644
--- a/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingEnvironmentSettingITCase.java
+++ b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingEnvironmentSettingITCase.java
@@ -77,6 +77,7 @@ public class AggregationMappingEnvironmentSettingITCase {
.formEngineName(PropertiesTestFactory.FORM_ENGINE_NAME_1)
.formId(PropertiesTestFactory.FORM_ID_1)
.build())
+ .name(PropertiesTestFactory.NAME_1)
.mapping(AggregationMapping.FieldMapping.builder().sourcePath(PropertiesTestFactory.SOURCE_PATH_1_1)
.targetPath(PropertiesTestFactory.TARGET_PATH_1_1).build())
.mapping(AggregationMapping.FieldMapping.builder().sourcePath(PropertiesTestFactory.SOURCE_PATH_1_2)
@@ -89,6 +90,7 @@ public class AggregationMappingEnvironmentSettingITCase {
.formEngineName(PropertiesTestFactory.FORM_ENGINE_NAME_2)
.formId(PropertiesTestFactory.FORM_ID_2)
.build())
+ .name(PropertiesTestFactory.NAME_2)
.mapping(AggregationMapping.FieldMapping.builder().sourcePath(PropertiesTestFactory.SOURCE_PATH_2_1)
.targetPath(PropertiesTestFactory.TARGET_PATH_2_1).build())
.mapping(AggregationMapping.FieldMapping.builder().sourcePath(PropertiesTestFactory.SOURCE_PATH_2_2)
diff --git a/src/test/java/de/ozgcloud/admin/setting/PropertiesTestFactory.java b/src/test/java/de/ozgcloud/admin/setting/PropertiesTestFactory.java
index 62df9cc7..1bd220cf 100644
--- a/src/test/java/de/ozgcloud/admin/setting/PropertiesTestFactory.java
+++ b/src/test/java/de/ozgcloud/admin/setting/PropertiesTestFactory.java
@@ -36,6 +36,7 @@ public class PropertiesTestFactory {
public static final PostfachSettingBody POSTFACH = PostfachSettingBodyTestFactory.create();
public static final String FORM_ENGINE_NAME_1 = LoremIpsum.getInstance().getWords(1);
public static final String FORM_ID_1 = LoremIpsum.getInstance().getWords(1);
+ public static final String NAME_1 = LoremIpsum.getInstance().getWords(1);
public static final String SOURCE_PATH_1_1 = LoremIpsum.getInstance().getWords(1);
public static final String TARGET_PATH_1_1 = LoremIpsum.getInstance().getWords(1);
public static final String SOURCE_PATH_1_2 = LoremIpsum.getInstance().getWords(1);
@@ -44,6 +45,7 @@ public class PropertiesTestFactory {
public static final String TARGET_PATH_1_3 = LoremIpsum.getInstance().getWords(1);
public static final String FORM_ENGINE_NAME_2 = LoremIpsum.getInstance().getWords(1);
public static final String FORM_ID_2 = LoremIpsum.getInstance().getWords(1);
+ public static final String NAME_2 = LoremIpsum.getInstance().getWords(1);
public static final String SOURCE_PATH_2_1 = LoremIpsum.getInstance().getWords(1);
public static final String TARGET_PATH_2_1 = LoremIpsum.getInstance().getWords(1);
public static final String SOURCE_PATH_2_2 = LoremIpsum.getInstance().getWords(1);
@@ -76,6 +78,7 @@ public class PropertiesTestFactory {
return TestUtils.loadTextFile("jsonTemplates/settings/aggregation.json.tmpl",
FORM_ENGINE_NAME_1,
FORM_ID_1,
+ NAME_1,
SOURCE_PATH_1_1,
TARGET_PATH_1_1,
SOURCE_PATH_1_2,
@@ -84,6 +87,7 @@ public class PropertiesTestFactory {
TARGET_PATH_1_3,
FORM_ENGINE_NAME_2,
FORM_ID_2,
+ NAME_2,
SOURCE_PATH_2_1,
TARGET_PATH_2_1,
SOURCE_PATH_2_2,
diff --git a/src/test/resources/jsonTemplates/settings/aggregation.json.tmpl b/src/test/resources/jsonTemplates/settings/aggregation.json.tmpl
index ce56cc5a..e31e1bb6 100644
--- a/src/test/resources/jsonTemplates/settings/aggregation.json.tmpl
+++ b/src/test/resources/jsonTemplates/settings/aggregation.json.tmpl
@@ -12,6 +12,7 @@
"source": {
"ozgcloud.aggregation.aggregationMappings[0].formIdentifier.formEngineName": "%s",
"ozgcloud.aggregation.aggregationMappings[0].formIdentifier.formId": "%s",
+ "ozgcloud.aggregation.aggregationMappings[0].name": "%s",
"ozgcloud.aggregation.aggregationMappings[0].fieldMappings[0].sourcePath": "%s",
"ozgcloud.aggregation.aggregationMappings[0].fieldMappings[0].targetPath": "%s",
"ozgcloud.aggregation.aggregationMappings[0].fieldMappings[1].sourcePath": "%s",
@@ -20,6 +21,7 @@
"ozgcloud.aggregation.aggregationMappings[0].fieldMappings[2].targetPath": "%s",
"ozgcloud.aggregation.aggregationMappings[1].formIdentifier.formEngineName": "%s",
"ozgcloud.aggregation.aggregationMappings[1].formIdentifier.formId": "%s",
+ "ozgcloud.aggregation.aggregationMappings[1].name": "%s",
"ozgcloud.aggregation.aggregationMappings[1].fieldMappings[0].sourcePath": "%s",
"ozgcloud.aggregation.aggregationMappings[1].fieldMappings[0].targetPath": "%s",
"ozgcloud.aggregation.aggregationMappings[1].fieldMappings[1].sourcePath": "%s",
--
GitLab