Skip to content
Snippets Groups Projects
Commit d3b1ff0c authored by Tobias Bruns's avatar Tobias Bruns
Browse files

OZG-6988 rename dtos

parent d29cc735
No related branches found
No related tags found
1 merge request!3Ozg 6988 add reporting
This commit is part of merge request !3. Comments created here will be created in the context of that merge request.
...@@ -12,7 +12,7 @@ import org.springframework.data.mongodb.core.mapping.Document; ...@@ -12,7 +12,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import de.ozgcloud.admin.reporting.ReportingSettingDto.FormIdentifierDto; import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.FormIdentifierDto;
import lombok.Builder; import lombok.Builder;
import lombok.Getter; import lombok.Getter;
import lombok.Singular; import lombok.Singular;
......
...@@ -4,7 +4,7 @@ import org.mapstruct.Mapper; ...@@ -4,7 +4,7 @@ import org.mapstruct.Mapper;
import org.mapstruct.Mapping; import org.mapstruct.Mapping;
import org.mapstruct.NullValueCheckStrategy; import org.mapstruct.NullValueCheckStrategy;
import de.ozgcloud.admin.reporting.ReportingSettingDto.AggregationMappingDto; import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.AggregationMappingDto;
@Mapper(nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) @Mapper(nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface AggregationMappingMapper { public interface AggregationMappingMapper {
......
...@@ -15,12 +15,12 @@ class ReportingAggregationManagerSettingDTOService implements SettingDtoService ...@@ -15,12 +15,12 @@ class ReportingAggregationManagerSettingDTOService implements SettingDtoService
private final AggregationMappingMapper mapper; private final AggregationMappingMapper mapper;
@Override @Override
public ReportingSettingDto getDataTransferObject() { public ReportingAggregationManagerSettingDto getDataTransferObject() {
return mapToDto(repository.findAll().stream()); return mapToDto(repository.findAll().stream());
} }
ReportingSettingDto mapToDto(Stream<AggregationMapping> settings) { ReportingAggregationManagerSettingDto mapToDto(Stream<AggregationMapping> settings) {
return ReportingSettingDto.builder() return ReportingAggregationManagerSettingDto.builder()
.aggregationMappings(settings.map(mapper::toMapping).toList()) .aggregationMappings(settings.map(mapper::toMapping).toList())
.build(); .build();
} }
......
...@@ -10,7 +10,7 @@ import lombok.ToString; ...@@ -10,7 +10,7 @@ import lombok.ToString;
@Builder @Builder
@Getter @Getter
@ToString @ToString
public class ReportingSettingDto { public class ReportingAggregationManagerSettingDto {
@Singular @Singular
private List<AggregationMappingDto> aggregationMappings; private List<AggregationMappingDto> aggregationMappings;
......
...@@ -3,7 +3,7 @@ package de.ozgcloud.admin.reporting; ...@@ -3,7 +3,7 @@ package de.ozgcloud.admin.reporting;
import java.util.UUID; import java.util.UUID;
import de.ozgcloud.admin.reporting.AggregationMapping.FieldMapping; import de.ozgcloud.admin.reporting.AggregationMapping.FieldMapping;
import de.ozgcloud.admin.reporting.ReportingSettingDto.FormIdentifierDto; import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.FormIdentifierDto;
class AggregationMappingTestFactory { class AggregationMappingTestFactory {
......
...@@ -2,20 +2,20 @@ package de.ozgcloud.admin.reporting; ...@@ -2,20 +2,20 @@ package de.ozgcloud.admin.reporting;
import static de.ozgcloud.admin.reporting.AggregationMappingTestFactory.*; import static de.ozgcloud.admin.reporting.AggregationMappingTestFactory.*;
import de.ozgcloud.admin.reporting.ReportingSettingDto.AggregationMappingDto; import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.AggregationMappingDto;
import de.ozgcloud.admin.reporting.ReportingSettingDto.FieldMappingDto; import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.FieldMappingDto;
import de.ozgcloud.admin.reporting.ReportingSettingDto.FormIdentifierDto; import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.FormIdentifierDto;
class ReportingSettingDtoTestFactory { class ReportingSettingDtoTestFactory {
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 ReportingSettingDto create() { public static ReportingAggregationManagerSettingDto create() {
return createBuilder().build(); return createBuilder().build();
} }
public static ReportingSettingDto.ReportingSettingDtoBuilder createBuilder() { public static ReportingAggregationManagerSettingDto.ReportingSettingDtoBuilder createBuilder() {
return ReportingSettingDto.builder() return ReportingAggregationManagerSettingDto.builder()
.aggregationMapping(AggregationMappingDto.builder() .aggregationMapping(AggregationMappingDto.builder()
.formIdentifier(FORM_IDENTIFIER) .formIdentifier(FORM_IDENTIFIER)
.fieldMapping(FieldMappingDto.builder().sourcePath(SOURCE_PATH).targetPath(TARGET_PATH).build()) .fieldMapping(FieldMappingDto.builder().sourcePath(SOURCE_PATH).targetPath(TARGET_PATH).build())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment