diff --git a/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDto.java b/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDto.java index 00e74b76d4eaad2b3bbe9937c781f505852ff942..57952411bebbdf38559346f1fb49443636075720 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 f0c601d43a316e0456cd6b73acd012535d1d6033..91e5f0659cea5df5bca0d6aec9d98065acb2f74d 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()); } } diff --git a/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingEnvironmentSettingITCase.java b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingEnvironmentSettingITCase.java index 8f7ff06904aa7944a209d49a4dc649ee1a885429..495e2d65c783afce27eef22d6c0a2164e9c3f18c 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 62df9cc7d05c095068b1bd12a0585d5ba08b8ccd..1bd220cfdbc1f53f53cc4bc49ef2a9e779db348b 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 ce56cc5aebc81c35d9678f6d152118217a5241a3..e31e1bb689e8715e91e82c7dc412defb0ac4893e 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",