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.briefwahlservice.security.AuthoritiesEnum).WLS_BRIEFWAHL_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.briefwahlservice.security.AuthoritiesEnum).WLS_BRIEFWAHL_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.briefwahlservice.security.AuthoritiesEnum).WLS_BRIEFWAHL_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.briefwahlservice.security.AuthoritiesEnum).WLS_BRIEFWAHL_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.briefwahlservice.security.AuthoritiesEnum).WLS_BRIEFWAHL_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.briefwahlservice.security.AuthoritiesEnum).WLS_BRIEFWAHL_SERVICE_DELETE_THEENTITY.name())")
- void deleteAll();
-
-}
diff --git a/wls-briefwahl-service/src/main/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/security/AuthoritiesEnum.java b/wls-briefwahl-service/src/main/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/security/AuthoritiesEnum.java
deleted file mode 100644
index 4dcc9c51e..000000000
--- a/wls-briefwahl-service/src/main/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/security/AuthoritiesEnum.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c): it@M - Dienstleister für Informations- und Telekommunikationstechnik
- * der Landeshauptstadt München, 2024
- */
-package de.muenchen.oss.wahllokalsystem.briefwahlservice.security;
-
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.security.access.prepost.PreAuthorize;
-
-/**
- * Each possible authority in this project is represented by an enum. The enums are used within the
- * {@link PagingAndSortingRepository} in the annotation e.g.
- * {@link PreAuthorize}.
- */
-public enum AuthoritiesEnum {
- WLS_BRIEFWAHL_SERVICE_READ_THEENTITY, WLS_BRIEFWAHL_SERVICE_WRITE_THEENTITY, WLS_BRIEFWAHL_SERVICE_DELETE_THEENTITY,
- // add your authorities here and also add these new authorities to sso-authorisation.json.
-
-}
diff --git a/wls-briefwahl-service/src/main/resources/db/migrations/h2/V0_1__createTableTheEntity.sql b/wls-briefwahl-service/src/main/resources/db/migrations/h2/V0_1__createTableTheEntity.sql
deleted file mode 100644
index 1f2b83f72..000000000
--- a/wls-briefwahl-service/src/main/resources/db/migrations/h2/V0_1__createTableTheEntity.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE TABLE theEntity
-(
- id varchar2(36) NOT NULL primary key,
- textAttribute varchar2(8) NOT NULL
-)
\ No newline at end of file
diff --git a/wls-briefwahl-service/src/main/resources/db/migrations/oracle/V0_1__createTableTheEntity.sql b/wls-briefwahl-service/src/main/resources/db/migrations/oracle/V0_1__createTableTheEntity.sql
deleted file mode 100644
index 1f2b83f72..000000000
--- a/wls-briefwahl-service/src/main/resources/db/migrations/oracle/V0_1__createTableTheEntity.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE TABLE theEntity
-(
- id varchar2(36) NOT NULL primary key,
- textAttribute varchar2(8) NOT NULL
-)
\ No newline at end of file
diff --git a/wls-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/TestConstants.java b/wls-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/TestConstants.java
index 5d23a4b7c..a1fa8ece2 100644
--- a/wls-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/TestConstants.java
+++ b/wls-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/TestConstants.java
@@ -5,12 +5,7 @@
package de.muenchen.oss.wahllokalsystem.briefwahlservice;
import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-import org.springframework.hateoas.RepresentationModel;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class TestConstants {
@@ -19,15 +14,4 @@ public final class TestConstants {
public static final String SPRING_NO_SECURITY_PROFILE = "no-security";
- @NoArgsConstructor
- @Getter
- @Setter
- @EqualsAndHashCode(callSuper = true)
- @ToString(callSuper = true)
- public static class TheEntityDto extends RepresentationModel {
-
- private String textAttribute;
-
- }
-
}
diff --git a/wls-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/configuration/CacheControlConfigurationTest.java b/wls-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/configuration/CacheControlConfigurationTest.java
deleted file mode 100644
index 1e2809db5..000000000
--- a/wls-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/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.briefwahlservice.configuration;
-
-import static de.muenchen.oss.wahllokalsystem.briefwahlservice.TestConstants.SPRING_NO_SECURITY_PROFILE;
-import static de.muenchen.oss.wahllokalsystem.briefwahlservice.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.briefwahlservice.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-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/configuration/UnicodeConfigurationTest.java b/wls-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/configuration/UnicodeConfigurationTest.java
index d1df5d2f6..721b712ce 100644
--- a/wls-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/configuration/UnicodeConfigurationTest.java
+++ b/wls-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/configuration/UnicodeConfigurationTest.java
@@ -6,20 +6,20 @@
import static de.muenchen.oss.wahllokalsystem.briefwahlservice.TestConstants.SPRING_NO_SECURITY_PROFILE;
import static de.muenchen.oss.wahllokalsystem.briefwahlservice.TestConstants.SPRING_TEST_PROFILE;
-import static de.muenchen.oss.wahllokalsystem.briefwahlservice.TestConstants.TheEntityDto;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import de.muenchen.oss.wahllokalsystem.briefwahlservice.MicroServiceApplication;
-import de.muenchen.oss.wahllokalsystem.briefwahlservice.domain.TheEntity;
-import de.muenchen.oss.wahllokalsystem.briefwahlservice.rest.TheEntityRepository;
+import de.muenchen.oss.wahllokalsystem.briefwahlservice.common.beanstandetewahlbriefe.Zurueckweisungsgrund;
+import de.muenchen.oss.wahllokalsystem.briefwahlservice.domain.BeanstandeteWahlbriefeRepository;
+import de.muenchen.oss.wahllokalsystem.briefwahlservice.rest.beanstandetewahlbriefe.BeanstandeteWahlbriefeDTO;
import java.net.URI;
-import java.util.UUID;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.jupiter.api.Disabled;
+import java.util.Map;
+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;
import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.data.util.Streamable;
import org.springframework.test.context.ActiveProfiles;
@SpringBootTest(
@@ -33,7 +33,7 @@
@ActiveProfiles(profiles = { SPRING_TEST_PROFILE, SPRING_NO_SECURITY_PROFILE })
class UnicodeConfigurationTest {
- private static final String ENTITY_ENDPOINT_URL = "/theEntities";
+ private static final String BEANSTANDETE_WAHLBRIEFE_ENDPOINT_URL = "/businessActions/beanstandeteWahlbriefe/";
/**
* Decomposed string: String "Ä-é" represented with unicode letters "A◌̈-e◌́"
@@ -49,28 +49,38 @@ class UnicodeConfigurationTest {
private TestRestTemplate testRestTemplate;
@Autowired
- private TheEntityRepository theEntityRepository;
+ private BeanstandeteWahlbriefeRepository beanstandeteWahlbriefeRepository;
@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();
+ val wahlbezirkID = "wahlbezirkID";
+ val waehlerVerzeichnisNummer = 1L;
+ val key1 = "key1";
+ val key2 = "key2";
+ val beanstandeteWahlbriefeDTO = createControllerBeanstandeteWahlbriefeDTO(wahlbezirkID, waehlerVerzeichnisNummer, key1, key2,
+ TEXT_ATTRIBUTE_DECOMPOSED);
+ Assertions.assertThat((String) beanstandeteWahlbriefeDTO.beanstandeteWahlbriefe().keySet().toArray()[0])
+ .hasSize(key1.length() + TEXT_ATTRIBUTE_DECOMPOSED.length());
+ Assertions.assertThat((String) beanstandeteWahlbriefeDTO.beanstandeteWahlbriefe().keySet().toArray()[1])
+ .hasSize(key2.length() + TEXT_ATTRIBUTE_DECOMPOSED.length());
- // Check whether response contains a composed string.
- assertEquals(TEXT_ATTRIBUTE_COMPOSED, response.getTextAttribute());
- assertEquals(TEXT_ATTRIBUTE_COMPOSED.length(), response.getTextAttribute().length());
+ testRestTemplate.postForEntity(URI.create(BEANSTANDETE_WAHLBRIEFE_ENDPOINT_URL + wahlbezirkID + "/" + waehlerVerzeichnisNummer),
+ beanstandeteWahlbriefeDTO, Void.class);
- // Extract uuid from self link.
- final UUID uuid = UUID.fromString(StringUtils.substringAfterLast(response.getRequiredLink("self").getHref(), "/"));
+ val beantstandeteWahlbriefeInRepo = Streamable.of(beanstandeteWahlbriefeRepository.findAll()).toList();
+ Assertions.assertThat(beantstandeteWahlbriefeInRepo).hasSize(1);
+ Assertions.assertThat(beantstandeteWahlbriefeInRepo.get(0).getBeanstandeteWahlbriefe().keySet().toArray()[0]).isEqualTo(key1 + TEXT_ATTRIBUTE_COMPOSED);
+ Assertions.assertThat(beantstandeteWahlbriefeInRepo.get(0).getBeanstandeteWahlbriefe().keySet().toArray()[1]).isEqualTo(key2 + TEXT_ATTRIBUTE_COMPOSED);
+ }
- // 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());
+ private BeanstandeteWahlbriefeDTO createControllerBeanstandeteWahlbriefeDTO(String wahlbezirkID, Long waehlerverzeichnisNummer, String key1, String key2,
+ String textAttributeDecomposed) {
+ return new BeanstandeteWahlbriefeDTO(wahlbezirkID, waehlerverzeichnisNummer,
+ Map.of(key1 + textAttributeDecomposed,
+ new Zurueckweisungsgrund[] { Zurueckweisungsgrund.NICHT_WAHLBERECHTIGT, Zurueckweisungsgrund.GEGENSTAND_IM_UMSCHLAG },
+ key2 + textAttributeDecomposed,
+ new Zurueckweisungsgrund[] { Zurueckweisungsgrund.UNTERSCHRIFT_FEHLT, Zurueckweisungsgrund.LOSE_STIMMZETTEL }));
}
}
diff --git a/wls-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/rest/TheEntityRepositoryTest.java b/wls-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/rest/TheEntityRepositoryTest.java
deleted file mode 100644
index 69ef7bf69..000000000
--- a/wls-briefwahl-service/src/test/java/de/muenchen/oss/wahllokalsystem/briefwahlservice/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.briefwahlservice.rest;
-
-import static de.muenchen.oss.wahllokalsystem.briefwahlservice.TestConstants.SPRING_NO_SECURITY_PROFILE;
-import static de.muenchen.oss.wahllokalsystem.briefwahlservice.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.briefwahlservice.MicroServiceApplication;
-import de.muenchen.oss.wahllokalsystem.briefwahlservice.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);
-
- }
-
-}