Resolve optional in service

RISDEV-0000
digitalservicebund · Dec 17, 2024 · d02b2ed · d02b2ed
1 parent bb469ff
commit d02b2ed
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/...nd/digitalservice/ris/caselaw/adapter/database/jpa/DatabaseLegalPeriodicalRepository.java b/...nd/digitalservice/ris/caselaw/adapter/database/jpa/DatabaseLegalPeriodicalRepository.java
@@ -1,7 +1,6 @@
 package de.bund.digitalservice.ris.caselaw.adapter.database.jpa;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -20,5 +19,5 @@ OR LOWER(ct.title) LIKE COALESCE(concat(LOWER(:searchStr), '%'), '%'))
                 ORDER BY ct.abbreviation
                 LIMIT 15
               """)
-  List<LegalPeriodicalDTO> findBySearchStr(@Param("searchStr") Optional<String> searchStr);
+  List<LegalPeriodicalDTO> findBySearchStr(@Param("searchStr") String searchStr);
 }
diff --git a/...igitalservice/ris/caselaw/adapter/database/jpa/PostgresLegalPeriodicalRepositoryImpl.java b/...igitalservice/ris/caselaw/adapter/database/jpa/PostgresLegalPeriodicalRepositoryImpl.java
@@ -4,7 +4,6 @@
 import de.bund.digitalservice.ris.caselaw.domain.LegalPeriodicalRepository;
 import de.bund.digitalservice.ris.caselaw.domain.lookuptable.LegalPeriodical;
 import java.util.List;
-import java.util.Optional;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -16,7 +15,7 @@ public PostgresLegalPeriodicalRepositoryImpl(DatabaseLegalPeriodicalRepository r
   }
 
   @Override
-  public List<LegalPeriodical> findAllBySearchStr(Optional<String> searchStr) {
+  public List<LegalPeriodical> findAllBySearchStr(String searchStr) {
     return repository.findBySearchStr(searchStr).stream()
         .map(LegalPeriodicalTransformer::transformToDomain)
         .toList();

diff --git a/...nd/src/main/java/de/bund/digitalservice/ris/caselaw/domain/LegalPeriodicalRepository.java b/...nd/src/main/java/de/bund/digitalservice/ris/caselaw/domain/LegalPeriodicalRepository.java
@@ -2,7 +2,6 @@
 
 import de.bund.digitalservice.ris.caselaw.domain.lookuptable.LegalPeriodical;
 import java.util.List;
-import java.util.Optional;
 import org.springframework.data.repository.NoRepositoryBean;
 
 /** Domain repository for legal periodicals */
@@ -15,5 +14,5 @@ public interface LegalPeriodicalRepository {
    * @return list of legal periodical which contain the search string or the whole list of legal
    *     periodical if no search string is given
    */
-  List<LegalPeriodical> findAllBySearchStr(Optional<String> searchStr);
+  List<LegalPeriodical> findAllBySearchStr(String searchStr);
 }
diff --git a/backend/src/main/java/de/bund/digitalservice/ris/caselaw/domain/LegalPeriodicalService.java b/backend/src/main/java/de/bund/digitalservice/ris/caselaw/domain/LegalPeriodicalService.java
@@ -24,6 +24,6 @@ public LegalPeriodicalService(LegalPeriodicalRepository legalPeriodicalRepositor
    *     periodical if no search string is given
    */
   public List<LegalPeriodical> getLegalPeriodicals(Optional<String> searchStr) {
-    return legalPeriodicalRepository.findAllBySearchStr(searchStr.map(String::trim));
+    return legalPeriodicalRepository.findAllBySearchStr(searchStr.map(String::trim).orElse(null));
   }
 }
diff --git a/...d/digitalservice/ris/caselaw/integration/tests/LegalPeriodicalEditionIntegrationTest.java b/...d/digitalservice/ris/caselaw/integration/tests/LegalPeriodicalEditionIntegrationTest.java
@@ -158,7 +158,7 @@ void setUp() {
                 }));
 
     legalPeriodical =
-        legalPeriodicalRepository.findAllBySearchStr(Optional.of("ABC")).stream()
+        legalPeriodicalRepository.findAllBySearchStr("ABC").stream()
             .findAny()
             .orElseThrow(
                 () ->
@@ -174,12 +174,11 @@ void tearDown() {
   @Test
   void testFindLegalPeriodical_byAbbreviationOrTitle_shouldSucceed() {
     Assertions.assertNotNull(
-        legalPeriodicalRepository.findAllBySearchStr(Optional.of("A&G")).stream().findFirst(),
+        legalPeriodicalRepository.findAllBySearchStr("A&G").stream().findFirst(),
         "Expected a legal periodical by abbreviation but none was found");
 
     Assertions.assertNotNull(
-        legalPeriodicalRepository.findAllBySearchStr(Optional.of("Arbeit & Gesundheit")).stream()
-            .findFirst(),
+        legalPeriodicalRepository.findAllBySearchStr("Arbeit & Gesundheit").stream().findFirst(),
         "Expected a legal periodical by title but none was found");
   }