OZG-6988 rename data types

pom.xml

@@ -287,6 +287,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<!--
 				<configuration>
 					<image>
 						<name>${imageName}:${imageTag}</name>
@@ -317,7 +318,7 @@
 							</additionalProperties>
 						</configuration>
 					</execution>
-				</executions>
+				</executions>-->
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -327,7 +328,7 @@
 <!--						<path>-->
 <!--							<groupId>org.mapstruct</groupId>-->
 <!--							<artifactId>mapstruct-processor</artifactId>-->
-<!--							<version>${mapstruct-processor.version}</version>-->
+<!--							<version>${mapstruct.version}</version>-->
 <!--						</path>-->
 <!--						<path>-->
 <!--							<groupId>org.projectlombok</groupId>-->
@@ -339,6 +340,11 @@
 <!--							<artifactId>lombok-mapstruct-binding</artifactId>-->
 <!--							<version>${lombok-mapstruct-binding.version}</version>-->
 <!--						</path>-->
+<!--						   <path>-->
+<!--						    <groupId>org.springframework.boot</groupId>-->
+<!--						    <artifactId>spring-boot-configuration-processor</artifactId>-->
+<!--						    <version>3.3.6</version>-->
+<!--						  </path>-->
 <!--					</annotationProcessorPaths>-->
 <!--				</configuration>-->
 			</plugin>

src/main/java/de/ozgcloud/admin/reporting/ReportingSetting.java → src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java

@@ -19,17 +19,17 @@ import lombok.Singular;
 import lombok.extern.jackson.Jacksonized;
 
 @Document("settings")
-@TypeAlias("fieldMapping")
+@TypeAlias("aggregationMapping")
 @Jacksonized
 @Builder
 @Getter
-public class ReportingSetting {
+public class AggregationMapping {
 
 	@Id
 	@JsonIgnore
 	private String id;
 	@Builder.Default
-	private String name = "fieldMapping";
+	private String name = "aggregationMapping";
 
 	@Valid
 	private FormIdentifierDto formIdentifier;

src/main/java/de/ozgcloud/admin/reporting/AggregationMappingMapper.java

@@ -11,5 +11,5 @@ public interface AggregationMappingMapper {
 
 	@Mapping(target = "fieldMapping", ignore = true)
 	@Mapping(target = "fieldMappings", source = "mappings")
-	AggregationMappingDto toMapping(ReportingSetting setting);
+	AggregationMappingDto toMapping(AggregationMapping setting);
 }

src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOService.java

@@ -11,7 +11,7 @@ import lombok.RequiredArgsConstructor;
 @DtoService(SettingConstants.AGGREGATION_MANAGER)
 class ReportingAggregationManagerSettingDTOService implements SettingDtoService {
 
-	private final ReportingSettingRepository repository;
+	private final AggregationMappingRepository repository;
 	private final AggregationMappingMapper mapper;
 
 	@Override
@@ -19,7 +19,7 @@ class ReportingAggregationManagerSettingDTOService implements SettingDtoService
 		return mapToDto(repository.findAll().stream());
 	}
 
-	ReportingSettingDto mapToDto(Stream<ReportingSetting> settings) {
+	ReportingSettingDto mapToDto(Stream<AggregationMapping> settings) {
 		return ReportingSettingDto.builder()
 				.aggregationMappings(settings.map(mapper::toMapping).toList())
 				.build();

src/main/java/de/ozgcloud/admin/reporting/ReportingSettingRepository.java

@@ -7,8 +7,8 @@ import org.springframework.data.mongodb.repository.Query;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 
 @RepositoryRestResource
-interface ReportingSettingRepository extends MongoRepository<ReportingSetting, String> {
+interface AggregationMappingRepository extends MongoRepository<AggregationMapping, String> {
 	@Override
-	@Query("{'_class': 'fieldMapping'}")
-	List<ReportingSetting> findAll();
+	@Query("{'_class': 'aggregationMapping'}")
+	List<AggregationMapping> findAll();
 }

src/test/java/de/ozgcloud/admin/reporting/ReportingSettingTestFactory.java → src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java

@@ -2,10 +2,10 @@ package de.ozgcloud.admin.reporting;
 
 import java.util.UUID;
 
-import de.ozgcloud.admin.reporting.ReportingSetting.FieldMapping;
+import de.ozgcloud.admin.reporting.AggregationMapping.FieldMapping;
 import de.ozgcloud.admin.reporting.ReportingSettingDto.FormIdentifierDto;
 
-class ReportingSettingTestFactory {
+class AggregationMappingTestFactory {
 
 	public static final String ID = UUID.randomUUID().toString();
 	public static final String FORM_ENGINE_NAME = "A12";
@@ -14,12 +14,12 @@ class ReportingSettingTestFactory {
 	public static final String SOURCE_PATH = "name";
 	public static final String TARGET_PATH = "antragsteller.name";
 
-	public static ReportingSetting create() {
+	public static AggregationMapping create() {
 		return createBuilder().build();
 	}
 
-	public static ReportingSetting.ReportingSettingBuilder createBuilder() {
-		return ReportingSetting.builder()
+	public static AggregationMapping.AggregationMappingBuilder createBuilder() {
+		return AggregationMapping.builder()
 				.id(UUID.randomUUID().toString())
 				.formIdentifier(FormIdentifierDto.builder()
 						.formEngineName(FORM_ENGINE_NAME)

src/test/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOServiceTest.java

@@ -21,7 +21,7 @@ class ReportingAggregationManagerSettingDTOServiceTest {
 	class TestMapToDto {
 		@Test
 		void shouldCreateDto() {
-			var dto = service.mapToDto(Stream.of(ReportingSettingTestFactory.create()));
+			var dto = service.mapToDto(Stream.of(AggregationMappingTestFactory.create()));
 
 			assertThat(dto).usingRecursiveComparison().isEqualTo(ReportingSettingDtoTestFactory.create());
 		}

src/test/java/de/ozgcloud/admin/reporting/ReportingSettingDtoTestFactory.java

 package de.ozgcloud.admin.reporting;
 
-import static de.ozgcloud.admin.reporting.ReportingSettingTestFactory.*;
+import static de.ozgcloud.admin.reporting.AggregationMappingTestFactory.*;
 
 import de.ozgcloud.admin.reporting.ReportingSettingDto.AggregationMappingDto;
 import de.ozgcloud.admin.reporting.ReportingSettingDto.FieldMappingDto;

src/test/java/de/ozgcloud/admin/reporting/ReportingSettingRepositoryITCase.java

@@ -14,7 +14,7 @@ import de.ozgcloud.common.test.DataITCase;
 class ReportingSettingRepositoryITCase {
 
 	@Autowired
-	private ReportingSettingRepository repository;
+	private AggregationMappingRepository repository;
 
 	@Autowired
 	private MongoOperations operations;
@@ -26,7 +26,7 @@ class ReportingSettingRepositoryITCase {
 
 	@Test
 	void shouldLoadOnlyFieldMapping() {
-		operations.save(ReportingSettingTestFactory.create());
+		operations.save(AggregationMappingTestFactory.create());
 		operations.save(SettingTestFactory.create());
 
 		var result = repository.findAll();