diff --git a/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java b/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java index 962142f10dbf00a19003a99363601e974dd0c5e4..24dd93719eef6177413972147ad75e9bc9ed152b 100644 --- a/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java +++ b/src/main/java/de/ozgcloud/admin/reporting/AggregationMapping.java @@ -15,6 +15,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Builder; import lombok.Getter; import lombok.Singular; +import lombok.ToString; import lombok.extern.jackson.Jacksonized; @Document("settings") @@ -22,6 +23,7 @@ import lombok.extern.jackson.Jacksonized; @Jacksonized @Builder @Getter +@ToString public class AggregationMapping { @Id @@ -39,6 +41,7 @@ public class AggregationMapping { @Builder @Getter + @ToString static class FieldMapping { @NotBlank private String sourcePath; @@ -48,6 +51,7 @@ public class AggregationMapping { @Builder @Getter + @ToString static class FormIdentifier { @NotBlank private String formEngineName; diff --git a/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java index 1054ba6c3dd37de4155d595fc5eee830d7ab5507..a5628289cc4a9ddd8912b8d7cc0a67f243eb2e3f 100644 --- a/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java +++ b/src/test/java/de/ozgcloud/admin/reporting/AggregationMappingTestFactory.java @@ -9,7 +9,7 @@ class AggregationMappingTestFactory { public static final String ID = UUID.randomUUID().toString(); public static final String FORM_ENGINE_NAME = "A12"; - public static final String FORM_ID = "123AABC"; + public static final String FORM_ID = "42"; public static final String SOURCE_PATH = "name"; public static final String TARGET_PATH = "antragsteller.name"; diff --git a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingITCase.java b/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingITCase.java index 298e5a192005f109e819bee8996965af1465961a..076a7b93649a7786117d611e4474529e11074c83 100644 --- a/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingITCase.java +++ b/src/test/java/de/ozgcloud/admin/reporting/ReportingSettingITCase.java @@ -3,6 +3,7 @@ package de.ozgcloud.admin.reporting; import static org.assertj.core.api.Assertions.*; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; import org.junit.jupiter.api.BeforeEach; @@ -39,13 +40,14 @@ class ReportingSettingITCase { void shouldHaveLinkToReporting() { mockMvc.perform(get("/api/configuration")) .andExpect(status().is2xxSuccessful()) - .andExpect(jsonPath("$._links.reportingSettings").exists()); + .andDo(print()) + .andExpect(jsonPath("$._links.aggregationMappings").exists()); } @Test @SneakyThrows void shouldDenyWhileMissingFields() { - mockMvc.perform(post("/api/configuration/reportingSettings").with(csrf()) + mockMvc.perform(post("/api/configuration/aggregationMappings").with(csrf()) .contentType(MediaType.APPLICATION_JSON).content("{}")) .andExpect(status().isUnprocessableEntity()); } @@ -53,18 +55,20 @@ class ReportingSettingITCase { @Test @SneakyThrows void shouldAddReportingSetting() { - mockMvc.perform(post("/api/configuration/reportingSettings").with(csrf()) + mockMvc.perform(post("/api/configuration/aggregationMappings").with(csrf()) .contentType(MediaType.APPLICATION_JSON).content(TestUtils.loadTextFile("reporting/request.json"))) .andExpect(status().isCreated()); var collection = mongoOperations.getCollection("settings"); assertThat(collection.countDocuments()).isEqualTo(1); + var mapping = mongoOperations.findAll(AggregationMapping.class).getFirst(); + assertThat(mapping).usingRecursiveComparison().ignoringFields("id").isEqualTo(AggregationMappingTestFactory.create()); } @Test @SneakyThrows void shouldListReportings() { - mockMvc.perform(get("/api/configuration/reportingSettings")) + mockMvc.perform(get("/api/configuration/aggregationMappings")) .andExpect(status().is2xxSuccessful()); } diff --git a/src/test/resources/reporting/request.json b/src/test/resources/reporting/request.json index 19608183fde4c05f0d33b7bc72ce76f411b9bb40..c2db9de85906742429d7bcd56bc4ae61a28f2580 100644 --- a/src/test/resources/reporting/request.json +++ b/src/test/resources/reporting/request.json @@ -1,6 +1,6 @@ { "formIdentifier": { - "formEngineName": "AFM", + "formEngineName": "A12", "formId": "42" }, "mappings": [