findById(UUID id);
-
- /**
- * Create or update a {@link TheEntity}.
- *
- * If the id already exists, the {@link TheEntity} will be overridden, hence update. If the id does
- * not already exist, a new {@link TheEntity} will be
- * created, hence create.
- *
- *
- * @param theEntity The {@link TheEntity} that will be saved.
- * @return the saved {@link TheEntity}.
- */
- @Override
- @CachePut(value = CACHE, key = "#p0.id")
- @PreAuthorize("hasAuthority(T(de.muenchen.oss.wahllokalsystem.basisdatenservice.security.AuthoritiesEnum).WLS_BASISDATEN_SERVICE_WRITE_THEENTITY.name())")
- S save(S theEntity);
-
- /**
- * Create or update a collection of {@link TheEntity}.
- *
- * If the id already exists, the {@link TheEntity}s will be overridden, hence update. If the id does
- * not already exist, the new {@link TheEntity}s will be
- * created, hence create.
- *
- *
- * @param entities The {@link TheEntity} that will be saved.
- * @return the collection saved {@link TheEntity}.
- */
- @Override
- @PreAuthorize("hasAuthority(T(de.muenchen.oss.wahllokalsystem.basisdatenservice.security.AuthoritiesEnum).WLS_BASISDATEN_SERVICE_WRITE_THEENTITY.name())")
- Iterable saveAll(Iterable entities);
-
- /**
- * Delete the {@link TheEntity} by a specified id.
- *
- * @param id the unique id of the {@link TheEntity} that will be deleted.
- */
- @Override
- @CacheEvict(value = CACHE, key = "#p0")
- @PreAuthorize("hasAuthority(T(de.muenchen.oss.wahllokalsystem.basisdatenservice.security.AuthoritiesEnum).WLS_BASISDATEN_SERVICE_DELETE_THEENTITY.name())")
- void deleteById(UUID id);
-
- /**
- * Delete a {@link TheEntity} by entity.
- *
- * @param entity The {@link TheEntity} that will be deleted.
- */
- @Override
- @CacheEvict(value = CACHE, key = "#p0.id")
- @PreAuthorize("hasAuthority(T(de.muenchen.oss.wahllokalsystem.basisdatenservice.security.AuthoritiesEnum).WLS_BASISDATEN_SERVICE_DELETE_THEENTITY.name())")
- void delete(TheEntity entity);
-
- /**
- * Delete multiple {@link TheEntity} entities by their id.
- *
- * @param entities The Iterable of {@link TheEntity} that will be deleted.
- */
- @Override
- @CacheEvict(value = CACHE, allEntries = true)
- @PreAuthorize("hasAuthority(T(de.muenchen.oss.wahllokalsystem.basisdatenservice.security.AuthoritiesEnum).WLS_BASISDATEN_SERVICE_DELETE_THEENTITY.name())")
- void deleteAll(Iterable entities);
-
- /**
- * Delete all {@link TheEntity} entities.
- */
- @Override
- @CacheEvict(value = CACHE, allEntries = true)
- @PreAuthorize("hasAuthority(T(de.muenchen.oss.wahllokalsystem.basisdatenservice.security.AuthoritiesEnum).WLS_BASISDATEN_SERVICE_DELETE_THEENTITY.name())")
- void deleteAll();
-
-}
diff --git a/wls-basisdaten-service/src/main/resources/db/migrations/h2/V9_0__dropTableTheEntity.sql b/wls-basisdaten-service/src/main/resources/db/migrations/h2/V9_0__dropTableTheEntity.sql
new file mode 100644
index 000000000..25bcba5ac
--- /dev/null
+++ b/wls-basisdaten-service/src/main/resources/db/migrations/h2/V9_0__dropTableTheEntity.sql
@@ -0,0 +1 @@
+DROP TABLE theEntity
\ No newline at end of file
diff --git a/wls-basisdaten-service/src/main/resources/db/migrations/oracle/V9_0__dropTableTheEntity.sql b/wls-basisdaten-service/src/main/resources/db/migrations/oracle/V9_0__dropTableTheEntity.sql
new file mode 100644
index 000000000..25bcba5ac
--- /dev/null
+++ b/wls-basisdaten-service/src/main/resources/db/migrations/oracle/V9_0__dropTableTheEntity.sql
@@ -0,0 +1 @@
+DROP TABLE theEntity
\ No newline at end of file
diff --git a/wls-basisdaten-service/src/test/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/CacheControlConfigurationTest.java b/wls-basisdaten-service/src/test/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/CacheControlConfigurationTest.java
deleted file mode 100644
index 581326377..000000000
--- a/wls-basisdaten-service/src/test/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/CacheControlConfigurationTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c): it@M - Dienstleister für Informations- und Telekommunikationstechnik
- * der Landeshauptstadt München, 2024
- */
-package de.muenchen.oss.wahllokalsystem.basisdatenservice.configuration;
-
-import static de.muenchen.oss.wahllokalsystem.basisdatenservice.TestConstants.SPRING_NO_SECURITY_PROFILE;
-import static de.muenchen.oss.wahllokalsystem.basisdatenservice.TestConstants.SPRING_TEST_PROFILE;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import de.muenchen.oss.wahllokalsystem.basisdatenservice.MicroServiceApplication;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.ActiveProfiles;
-
-@SpringBootTest(
- classes = { MicroServiceApplication.class },
- webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
- properties = {
- "spring.datasource.url=jdbc:h2:mem:testexample;DB_CLOSE_ON_EXIT=FALSE",
- "refarch.gracefulshutdown.pre-wait-seconds=0"
- }
-)
-@ActiveProfiles(profiles = { SPRING_TEST_PROFILE, SPRING_NO_SECURITY_PROFILE })
-class CacheControlConfigurationTest {
-
- private static final String ENTITY_ENDPOINT_URL = "/theEntities";
-
- private static final String EXPECTED_CACHE_CONTROL_HEADER_VALUES = "no-cache, no-store, must-revalidate";
-
- @Autowired
- private TestRestTemplate testRestTemplate;
-
- @Test
- @Disabled
- void testForCacheControlHeadersForEntityEndpoint() {
- ResponseEntity response = testRestTemplate.exchange(ENTITY_ENDPOINT_URL, HttpMethod.GET, null, String.class);
- assertEquals(HttpStatus.OK, response.getStatusCode());
- assertTrue(response.getHeaders().containsKey(HttpHeaders.CACHE_CONTROL));
- assertEquals(EXPECTED_CACHE_CONTROL_HEADER_VALUES, response.getHeaders().getCacheControl());
- }
-
-}
diff --git a/wls-basisdaten-service/src/test/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/UnicodeConfigurationTest.java b/wls-basisdaten-service/src/test/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/UnicodeConfigurationTest.java
index 46e962965..58a2a9ef8 100644
--- a/wls-basisdaten-service/src/test/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/UnicodeConfigurationTest.java
+++ b/wls-basisdaten-service/src/test/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/UnicodeConfigurationTest.java
@@ -6,16 +6,21 @@
import static de.muenchen.oss.wahllokalsystem.basisdatenservice.TestConstants.SPRING_NO_SECURITY_PROFILE;
import static de.muenchen.oss.wahllokalsystem.basisdatenservice.TestConstants.SPRING_TEST_PROFILE;
-import static de.muenchen.oss.wahllokalsystem.basisdatenservice.TestConstants.TheEntityDto;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import de.muenchen.oss.wahllokalsystem.basisdatenservice.MicroServiceApplication;
-import de.muenchen.oss.wahllokalsystem.basisdatenservice.domain.TheEntity;
-import de.muenchen.oss.wahllokalsystem.basisdatenservice.rest.TheEntityRepository;
+import de.muenchen.oss.wahllokalsystem.basisdatenservice.domain.Wahltag;
+import de.muenchen.oss.wahllokalsystem.basisdatenservice.domain.WahltagRepository;
+import de.muenchen.oss.wahllokalsystem.basisdatenservice.domain.wahl.Farbe;
+import de.muenchen.oss.wahllokalsystem.basisdatenservice.domain.wahl.WahlRepository;
+import de.muenchen.oss.wahllokalsystem.basisdatenservice.domain.wahl.Wahlart;
+import de.muenchen.oss.wahllokalsystem.basisdatenservice.rest.wahlen.WahlDTO;
import java.net.URI;
-import java.util.UUID;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.jupiter.api.Disabled;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import lombok.val;
+import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -33,7 +38,7 @@
@ActiveProfiles(profiles = { SPRING_TEST_PROFILE, SPRING_NO_SECURITY_PROFILE })
class UnicodeConfigurationTest {
- private static final String ENTITY_ENDPOINT_URL = "/theEntities";
+ private static final String WAHLEN_ENDPOINT_URL = "/businessActions/wahlen/";
/**
* Decomposed string: String "Ä-é" represented with unicode letters "A◌̈-e◌́"
@@ -49,28 +54,36 @@ class UnicodeConfigurationTest {
private TestRestTemplate testRestTemplate;
@Autowired
- private TheEntityRepository theEntityRepository;
+ private WahlRepository wahlRepository;
+
+ @Autowired
+ WahltagRepository wahltagRepository;
@Test
- @Disabled
void testForNfcNormalization() {
- // Persist entity with decomposed string.
- final TheEntityDto theEntityDto = new TheEntityDto();
- theEntityDto.setTextAttribute(TEXT_ATTRIBUTE_DECOMPOSED);
- assertEquals(TEXT_ATTRIBUTE_DECOMPOSED.length(), theEntityDto.getTextAttribute().length());
- final TheEntityDto response = testRestTemplate.postForEntity(URI.create(ENTITY_ENDPOINT_URL), theEntityDto, TheEntityDto.class).getBody();
- // Check whether response contains a composed string.
- assertEquals(TEXT_ATTRIBUTE_COMPOSED, response.getTextAttribute());
- assertEquals(TEXT_ATTRIBUTE_COMPOSED.length(), response.getTextAttribute().length());
+ // Persist entity with decomposed string
+ // wahltag required for next step to store a list of wahlen
+ var searchingForWahltag = new Wahltag("wahltagID", LocalDate.now(), "beschreibung5", "1");
+ wahltagRepository.save(searchingForWahltag);
+ // create a list of Wahl with only one Wahl containing the TEXT_ATTRIBUTE_DECOMPOSED as 'name'
+ val wahlDTOList = createControllerListOfWahlDTO(searchingForWahltag);
+ Assertions.assertThat(wahlDTOList.get(0).name()).hasSize(TEXT_ATTRIBUTE_DECOMPOSED.length());
+ // store list of Wahl
+ testRestTemplate.postForEntity(URI.create(WAHLEN_ENDPOINT_URL + searchingForWahltag.getWahltagID()), wahlDTOList, Void.class);
+
+ // Get the one and only Wahl from repo which now should contain a composed string in the 'name' attribute
+ val wahl = wahlRepository.findById("wahlID1").orElseThrow();
+ Assertions.assertThat(TEXT_ATTRIBUTE_COMPOSED).isEqualTo(wahl.getName());
+ Assertions.assertThat(wahl.getName()).hasSize(TEXT_ATTRIBUTE_COMPOSED.length());
+ }
- // Extract uuid from self link.
- final UUID uuid = UUID.fromString(StringUtils.substringAfterLast(response.getRequiredLink("self").getHref(), "/"));
+ private List createControllerListOfWahlDTO(Wahltag searchingForWahltag) {
+ val wahl1 = new de.muenchen.oss.wahllokalsystem.basisdatenservice.rest.wahlen.WahlDTO("wahlID1", TEXT_ATTRIBUTE_DECOMPOSED, 3L, 1L,
+ searchingForWahltag.getWahltag(),
+ Wahlart.BAW, new Farbe(1, 1, 1), "1");
- // Check persisted entity contains a composed string via JPA repository.
- final TheEntity theEntity = theEntityRepository.findById(uuid).orElse(null);
- assertEquals(TEXT_ATTRIBUTE_COMPOSED, theEntity.getTextAttribute());
- assertEquals(TEXT_ATTRIBUTE_COMPOSED.length(), theEntity.getTextAttribute().length());
+ return Stream.of(wahl1).filter(wahl -> (wahl.wahltag().equals(searchingForWahltag.getWahltag()))).collect(Collectors.toList());
}
}
diff --git a/wls-basisdaten-service/src/test/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/rest/TheEntityRepositoryTest.java b/wls-basisdaten-service/src/test/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/rest/TheEntityRepositoryTest.java
deleted file mode 100644
index e1104b2c1..000000000
--- a/wls-basisdaten-service/src/test/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/rest/TheEntityRepositoryTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c): it@M - Dienstleister für Informations- und Telekommunikationstechnik
- * der Landeshauptstadt München, 2024
- */
-package de.muenchen.oss.wahllokalsystem.basisdatenservice.rest;
-
-import static de.muenchen.oss.wahllokalsystem.basisdatenservice.TestConstants.SPRING_NO_SECURITY_PROFILE;
-import static de.muenchen.oss.wahllokalsystem.basisdatenservice.TestConstants.SPRING_TEST_PROFILE;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-import de.muenchen.oss.wahllokalsystem.basisdatenservice.MicroServiceApplication;
-import de.muenchen.oss.wahllokalsystem.basisdatenservice.domain.TheEntity;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-@SpringBootTest(
- classes = { MicroServiceApplication.class },
- webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
- properties = {
- "spring.datasource.url=jdbc:h2:mem:wls;DB_CLOSE_ON_EXIT=FALSE",
- "refarch.gracefulshutdown.pre-wait-seconds=0"
- }
-)
-@ActiveProfiles(profiles = { SPRING_TEST_PROFILE, SPRING_NO_SECURITY_PROFILE })
-class TheEntityRepositoryTest {
-
- @Autowired
- private TheEntityRepository repository;
-
- @Test
- @Transactional(propagation = Propagation.REQUIRED, noRollbackFor = Exception.class)
- void testSave() {
-
- // Implement your logic here by replacing and/or extending the code
-
- // initialize
- TheEntity original = new TheEntity();
- original.setTextAttribute("test");
-
- // persist
- original = repository.save(original);
-
- // check
- TheEntity persisted = repository.findById(original.getId()).orElse(null);
- assertNotNull(persisted);
- assertEquals(original, persisted);
-
- }
-
-}