From 43fc0c7a76d308041e148fcbd87a9175c8b13109 Mon Sep 17 00:00:00 2001
From: Tobias Bruns <tobias.bruns@mgm-tp.com>
Date: Fri, 3 Jan 2025 12:54:03 +0100
Subject: [PATCH] OZG-6988 fix data structure
---
pom.xml | 2 +-
.../de/ozgcloud/admin/reporting/AggregationMapping.java | 7 ++++---
...=> ReportingAggregationManagerSettingDtoService.java} | 2 +-
.../admin/keycloak/KeycloakApiServiceITCase.java | 9 +++++----
.../admin/reporting/AggregationMappingTestFactory.java | 4 ++--
...eportingAggregationManagerSettingDtoServiceTest.java} | 4 ++--
.../admin/reporting/ReportingSettingDtoTestFactory.java | 2 +-
7 files changed, 16 insertions(+), 14 deletions(-)
rename src/main/java/de/ozgcloud/admin/reporting/{ReportingAggregationManagerSettingDTOService.java => ReportingAggregationManagerSettingDtoService.java} (93%)
rename src/test/java/de/ozgcloud/admin/reporting/{ReportingAggregationManagerSettingDTOServiceTest.java => ReportingAggregationManagerSettingDtoServiceTest.java} (84%)
diff --git a/pom.xml b/pom.xml
index 8b9b615b..57499b2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId>
- <version>4.7.0-SNAPSHOT</version>
+ <version>4.8.0-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java b/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java
index 970a1a1f..962142f1 100644
--- a/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java
+++ b/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java
@@ -12,7 +12,6 @@ import org.springframework.data.mongodb.core.mapping.Document;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.FormIdentifierDto;
import lombok.Builder;
import lombok.Getter;
import lombok.Singular;
@@ -32,7 +31,7 @@ public class AggregationMapping {
private String name = "aggregationMapping";
@Valid
- private FormIdentifierDto formIdentifier;
+ private FormIdentifier formIdentifier;
@NotEmpty
@Singular
@@ -47,7 +46,9 @@ public class AggregationMapping {
private String targetPath;
}
- static class FormIdentifer {
+ @Builder
+ @Getter
+ static class FormIdentifier {
@NotBlank
private String formEngineName;
@NotBlank
diff --git a/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOService.java b/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDtoService.java
similarity index 93%
rename from src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOService.java
rename to src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDtoService.java
index f75b2d10..bd387c77 100644
--- a/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOService.java
+++ b/src/main/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDtoService.java
@@ -9,7 +9,7 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
@DtoService(SettingConstants.AGGREGATION_MANAGER)
-class ReportingAggregationManagerSettingDTOService implements SettingDtoService {
+class ReportingAggregationManagerSettingDtoService implements SettingDtoService {
private final AggregationMappingRepository repository;
private final AggregationMappingMapper mapper;
diff --git a/src/test/java/de/ozgcloud/admin/keycloak/KeycloakApiServiceITCase.java b/src/test/java/de/ozgcloud/admin/keycloak/KeycloakApiServiceITCase.java
index dc560c4e..8f121650 100644
--- a/src/test/java/de/ozgcloud/admin/keycloak/KeycloakApiServiceITCase.java
+++ b/src/test/java/de/ozgcloud/admin/keycloak/KeycloakApiServiceITCase.java
@@ -29,6 +29,7 @@ import static org.assertj.core.groups.Tuple.tuple;
import java.util.List;
import java.util.Optional;
+import org.assertj.core.api.InstanceOfAssertFactories;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.keycloak.representations.idm.GroupRepresentation;
@@ -122,9 +123,9 @@ class KeycloakApiServiceITCase {
private String getOrganisationsEinheitId(GroupRepresentation group) {
var attributes = group.getAttributes();
- return attributes.containsKey(properties.getOrganisationsEinheitIdKey()) ?
- attributes.get(properties.getOrganisationsEinheitIdKey()).getFirst() :
- null;
+ return attributes.containsKey(properties.getOrganisationsEinheitIdKey())
+ ? attributes.get(properties.getOrganisationsEinheitIdKey()).getFirst()
+ : null;
}
}
@@ -175,7 +176,7 @@ class KeycloakApiServiceITCase {
var groupId = service.addGroup(groupToAdd);
assertThat(findGroupInKeycloak(groupId)).isPresent().get().extracting(GroupRepresentation::getSubGroups)
- .asList().isEmpty();
+ .asInstanceOf(InstanceOfAssertFactories.LIST).isEmpty();
}
private GroupRepresentation createUniqueGroupRepresentation(String nameSuffix) {
diff --git a/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java
index a29204fd..1054ba6c 100644
--- a/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java
+++ b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java
@@ -3,7 +3,7 @@ package de.ozgcloud.admin.reporting;
import java.util.UUID;
import de.ozgcloud.admin.reporting.AggregationMapping.FieldMapping;
-import de.ozgcloud.admin.reporting.ReportingAggregationManagerSettingDto.FormIdentifierDto;
+import de.ozgcloud.admin.reporting.AggregationMapping.FormIdentifier;
class AggregationMappingTestFactory {
@@ -21,7 +21,7 @@ class AggregationMappingTestFactory {
public static AggregationMapping.AggregationMappingBuilder createBuilder() {
return AggregationMapping.builder()
.id(UUID.randomUUID().toString())
- .formIdentifier(FormIdentifierDto.builder()
+ .formIdentifier(FormIdentifier.builder()
.formEngineName(FORM_ENGINE_NAME)
.formId(FORM_ID)
.build())
diff --git a/src/test/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOServiceTest.java b/src/test/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDtoServiceTest.java
similarity index 84%
rename from src/test/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOServiceTest.java
rename to src/test/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDtoServiceTest.java
index 550a4364..ca109e6b 100644
--- a/src/test/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDTOServiceTest.java
+++ b/src/test/java/de/ozgcloud/admin/reporting/ReportingAggregationManagerSettingDtoServiceTest.java
@@ -10,10 +10,10 @@ import org.mapstruct.factory.Mappers;
import org.mockito.InjectMocks;
import org.mockito.Spy;
-class ReportingAggregationManagerSettingDTOServiceTest {
+class ReportingAggregationManagerSettingDtoServiceTest {
@InjectMocks
- private ReportingAggregationManagerSettingDTOService service;
+ private ReportingAggregationManagerSettingDtoService service;
@Spy
private AggregationMappingMapper mapper = Mappers.getMapper(AggregationMappingMapper.class);
diff --git a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingDtoTestFactory.java b/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingDtoTestFactory.java
index 9bf014f1..48fa582c 100644
--- a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingDtoTestFactory.java
+++ b/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingDtoTestFactory.java
@@ -14,7 +14,7 @@ class ReportingSettingDtoTestFactory {
return createBuilder().build();
}
- public static ReportingAggregationManagerSettingDto.ReportingSettingDtoBuilder createBuilder() {
+ public static ReportingAggregationManagerSettingDto.ReportingAggregationManagerSettingDtoBuilder createBuilder() {
return ReportingAggregationManagerSettingDto.builder()
.aggregationMapping(AggregationMappingDto.builder()
.formIdentifier(FORM_IDENTIFIER)
--
GitLab