Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • ozg-cloud/app/administration
1 result
Select Git revision
Show changes
Commits on Source (3)
...@@ -42,6 +42,7 @@ public class ReportingAggregationManagerSettingDto { ...@@ -42,6 +42,7 @@ public class ReportingAggregationManagerSettingDto {
@Getter @Getter
static class AggregationMappingDto { static class AggregationMappingDto {
private FormIdentifierDto formIdentifier; private FormIdentifierDto formIdentifier;
private String name;
@Singular @Singular
private List<FieldMappingDto> fieldMappings; private List<FieldMappingDto> fieldMappings;
} }
......
...@@ -9,6 +9,7 @@ import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.FormIde ...@@ -9,6 +9,7 @@ import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.FormIde
public class AggregationMappingDtoTestFactory { public class AggregationMappingDtoTestFactory {
public static final FormIdentifierDto FORM_IDENTIFIER = FormIdentifierDto.builder().formId(FORM_ID).formEngineName(FORM_ENGINE_NAME).build(); 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() { public static AggregationMappingDto create() {
return createBuilder().build(); return createBuilder().build();
...@@ -17,6 +18,7 @@ public class AggregationMappingDtoTestFactory { ...@@ -17,6 +18,7 @@ public class AggregationMappingDtoTestFactory {
public static AggregationMappingDto.AggregationMappingDtoBuilder createBuilder() { public static AggregationMappingDto.AggregationMappingDtoBuilder createBuilder() {
return AggregationMappingDto.builder() return AggregationMappingDto.builder()
.formIdentifier(FORM_IDENTIFIER) .formIdentifier(FORM_IDENTIFIER)
.name(NAME)
.fieldMapping(FieldMappingDto.builder().sourcePath(SOURCE_PATH).targetPath(TARGET_PATH).build()); .fieldMapping(FieldMappingDto.builder().sourcePath(SOURCE_PATH).targetPath(TARGET_PATH).build());
} }
} }
...@@ -77,6 +77,7 @@ public class AggregationMappingEnvironmentSettingITCase { ...@@ -77,6 +77,7 @@ public class AggregationMappingEnvironmentSettingITCase {
.formEngineName(PropertiesTestFactory.FORM_ENGINE_NAME_1) .formEngineName(PropertiesTestFactory.FORM_ENGINE_NAME_1)
.formId(PropertiesTestFactory.FORM_ID_1) .formId(PropertiesTestFactory.FORM_ID_1)
.build()) .build())
.name(PropertiesTestFactory.NAME_1)
.mapping(AggregationMapping.FieldMapping.builder().sourcePath(PropertiesTestFactory.SOURCE_PATH_1_1) .mapping(AggregationMapping.FieldMapping.builder().sourcePath(PropertiesTestFactory.SOURCE_PATH_1_1)
.targetPath(PropertiesTestFactory.TARGET_PATH_1_1).build()) .targetPath(PropertiesTestFactory.TARGET_PATH_1_1).build())
.mapping(AggregationMapping.FieldMapping.builder().sourcePath(PropertiesTestFactory.SOURCE_PATH_1_2) .mapping(AggregationMapping.FieldMapping.builder().sourcePath(PropertiesTestFactory.SOURCE_PATH_1_2)
...@@ -89,6 +90,7 @@ public class AggregationMappingEnvironmentSettingITCase { ...@@ -89,6 +90,7 @@ public class AggregationMappingEnvironmentSettingITCase {
.formEngineName(PropertiesTestFactory.FORM_ENGINE_NAME_2) .formEngineName(PropertiesTestFactory.FORM_ENGINE_NAME_2)
.formId(PropertiesTestFactory.FORM_ID_2) .formId(PropertiesTestFactory.FORM_ID_2)
.build()) .build())
.name(PropertiesTestFactory.NAME_2)
.mapping(AggregationMapping.FieldMapping.builder().sourcePath(PropertiesTestFactory.SOURCE_PATH_2_1) .mapping(AggregationMapping.FieldMapping.builder().sourcePath(PropertiesTestFactory.SOURCE_PATH_2_1)
.targetPath(PropertiesTestFactory.TARGET_PATH_2_1).build()) .targetPath(PropertiesTestFactory.TARGET_PATH_2_1).build())
.mapping(AggregationMapping.FieldMapping.builder().sourcePath(PropertiesTestFactory.SOURCE_PATH_2_2) .mapping(AggregationMapping.FieldMapping.builder().sourcePath(PropertiesTestFactory.SOURCE_PATH_2_2)
......
...@@ -36,6 +36,7 @@ public class PropertiesTestFactory { ...@@ -36,6 +36,7 @@ public class PropertiesTestFactory {
public static final PostfachSettingBody POSTFACH = PostfachSettingBodyTestFactory.create(); public static final PostfachSettingBody POSTFACH = PostfachSettingBodyTestFactory.create();
public static final String FORM_ENGINE_NAME_1 = LoremIpsum.getInstance().getWords(1); 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 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 SOURCE_PATH_1_1 = LoremIpsum.getInstance().getWords(1);
public static final String TARGET_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); public static final String SOURCE_PATH_1_2 = LoremIpsum.getInstance().getWords(1);
...@@ -44,6 +45,7 @@ public class PropertiesTestFactory { ...@@ -44,6 +45,7 @@ public class PropertiesTestFactory {
public static final String TARGET_PATH_1_3 = LoremIpsum.getInstance().getWords(1); 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_ENGINE_NAME_2 = LoremIpsum.getInstance().getWords(1);
public static final String FORM_ID_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 SOURCE_PATH_2_1 = LoremIpsum.getInstance().getWords(1);
public static final String TARGET_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); public static final String SOURCE_PATH_2_2 = LoremIpsum.getInstance().getWords(1);
...@@ -76,6 +78,7 @@ public class PropertiesTestFactory { ...@@ -76,6 +78,7 @@ public class PropertiesTestFactory {
return TestUtils.loadTextFile("jsonTemplates/settings/aggregation.json.tmpl", return TestUtils.loadTextFile("jsonTemplates/settings/aggregation.json.tmpl",
FORM_ENGINE_NAME_1, FORM_ENGINE_NAME_1,
FORM_ID_1, FORM_ID_1,
NAME_1,
SOURCE_PATH_1_1, SOURCE_PATH_1_1,
TARGET_PATH_1_1, TARGET_PATH_1_1,
SOURCE_PATH_1_2, SOURCE_PATH_1_2,
...@@ -84,6 +87,7 @@ public class PropertiesTestFactory { ...@@ -84,6 +87,7 @@ public class PropertiesTestFactory {
TARGET_PATH_1_3, TARGET_PATH_1_3,
FORM_ENGINE_NAME_2, FORM_ENGINE_NAME_2,
FORM_ID_2, FORM_ID_2,
NAME_2,
SOURCE_PATH_2_1, SOURCE_PATH_2_1,
TARGET_PATH_2_1, TARGET_PATH_2_1,
SOURCE_PATH_2_2, SOURCE_PATH_2_2,
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
"source": { "source": {
"ozgcloud.aggregation.aggregationMappings[0].formIdentifier.formEngineName": "%s", "ozgcloud.aggregation.aggregationMappings[0].formIdentifier.formEngineName": "%s",
"ozgcloud.aggregation.aggregationMappings[0].formIdentifier.formId": "%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].sourcePath": "%s",
"ozgcloud.aggregation.aggregationMappings[0].fieldMappings[0].targetPath": "%s", "ozgcloud.aggregation.aggregationMappings[0].fieldMappings[0].targetPath": "%s",
"ozgcloud.aggregation.aggregationMappings[0].fieldMappings[1].sourcePath": "%s", "ozgcloud.aggregation.aggregationMappings[0].fieldMappings[1].sourcePath": "%s",
...@@ -20,6 +21,7 @@ ...@@ -20,6 +21,7 @@
"ozgcloud.aggregation.aggregationMappings[0].fieldMappings[2].targetPath": "%s", "ozgcloud.aggregation.aggregationMappings[0].fieldMappings[2].targetPath": "%s",
"ozgcloud.aggregation.aggregationMappings[1].formIdentifier.formEngineName": "%s", "ozgcloud.aggregation.aggregationMappings[1].formIdentifier.formEngineName": "%s",
"ozgcloud.aggregation.aggregationMappings[1].formIdentifier.formId": "%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].sourcePath": "%s",
"ozgcloud.aggregation.aggregationMappings[1].fieldMappings[0].targetPath": "%s", "ozgcloud.aggregation.aggregationMappings[1].fieldMappings[0].targetPath": "%s",
"ozgcloud.aggregation.aggregationMappings[1].fieldMappings[1].sourcePath": "%s", "ozgcloud.aggregation.aggregationMappings[1].fieldMappings[1].sourcePath": "%s",
......