Limit combobox court results to 200 (#2433)

RISDEV-5901 Doc offices complained that 10 is not enough to find matching courts.
digitalservicebund · Dec 18, 2024 · 2b57ce4 · 2b57ce4
1 parent 5f34914
commit 2b57ce4
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 27 deletions.
diff --git a/backend/src/main/java/de/bund/digitalservice/ris/caselaw/adapter/CourtController.java b/backend/src/main/java/de/bund/digitalservice/ris/caselaw/adapter/CourtController.java
@@ -30,7 +30,9 @@ public CourtController(CourtService service) {
    */
   @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
   @PreAuthorize("isAuthenticated()")
-  public List<Court> getCourts(@RequestParam(value = "q", required = false) String searchStr) {
-    return service.getCourts(searchStr);
+  public List<Court> getCourts(
+      @RequestParam(value = "q", required = false) String searchStr,
+      @RequestParam(value = "sz", required = false, defaultValue = "200") Integer size) {
+    return service.getCourts(searchStr, size);
   }
 }
diff --git a/...java/de/bund/digitalservice/ris/caselaw/adapter/database/jpa/DatabaseCourtRepository.java b/...java/de/bund/digitalservice/ris/caselaw/adapter/database/jpa/DatabaseCourtRepository.java
@@ -61,7 +61,7 @@ label LIKE UPPER('%' || :searchStr || '%')
                       ORDER BY
                         weight,
                         label
-                      LIMIT 10
+                      LIMIT :size
                       """)
-  List<CourtDTO> findBySearchStr(@Param("searchStr") String searchStr);
+  List<CourtDTO> findBySearchStr(@Param("searchStr") String searchStr, @Param("size") Integer size);
 }
diff --git a/.../de/bund/digitalservice/ris/caselaw/adapter/database/jpa/PostgresCourtRepositoryImpl.java b/.../de/bund/digitalservice/ris/caselaw/adapter/database/jpa/PostgresCourtRepositoryImpl.java
@@ -18,8 +18,8 @@ public PostgresCourtRepositoryImpl(DatabaseCourtRepository repository) {
   }
 
   @Override
-  public List<Court> findBySearchStr(String searchString) {
-    return repository.findBySearchStr(searchString).stream()
+  public List<Court> findBySearchStr(String searchString, Integer size) {
+    return repository.findBySearchStr(searchString, size).stream()
         .map(CourtTransformer::transformToDomain)
         .toList();
   }
@@ -48,8 +48,8 @@ public Optional<Court> findUniqueBySearchString(String searchString) {
   }
 
   @Override
-  public List<Court> findAllByOrderByTypeAscLocationAsc() {
-    return repository.findByOrderByTypeAscLocationAsc(Limit.of(10)).stream()
+  public List<Court> findAllByOrderByTypeAscLocationAsc(Integer size) {
+    return repository.findByOrderByTypeAscLocationAsc(Limit.of(size)).stream()
         .map(CourtTransformer::transformToDomain)
         .toList();
   }

diff --git a/backend/src/main/java/de/bund/digitalservice/ris/caselaw/domain/CourtService.java b/backend/src/main/java/de/bund/digitalservice/ris/caselaw/domain/CourtService.java
@@ -15,11 +15,11 @@ public CourtService(CourtRepository courtRepository) {
     this.courtRepository = courtRepository;
   }
 
-  public List<Court> getCourts(String searchStr) {
+  public List<Court> getCourts(String searchStr, Integer size) {
     if (searchStr != null && !searchStr.trim().isBlank()) {
-      return courtRepository.findBySearchStr(searchStr.trim());
+      return courtRepository.findBySearchStr(searchStr.trim(), size);
     }
 
-    return courtRepository.findAllByOrderByTypeAscLocationAsc();
+    return courtRepository.findAllByOrderByTypeAscLocationAsc(size);
   }
 }
diff --git a/backend/src/main/java/de/bund/digitalservice/ris/caselaw/domain/court/CourtRepository.java b/backend/src/main/java/de/bund/digitalservice/ris/caselaw/domain/court/CourtRepository.java
@@ -6,11 +6,11 @@
 
 @NoRepositoryBean
 public interface CourtRepository {
-  List<Court> findBySearchStr(String searchString);
+  List<Court> findBySearchStr(String searchString, Integer size);
 
   Optional<Court> findByTypeAndLocation(String type, String location);
 
   Optional<Court> findUniqueBySearchString(String searchString);
 
-  List<Court> findAllByOrderByTypeAscLocationAsc();
+  List<Court> findAllByOrderByTypeAscLocationAsc(Integer size);
 }
diff --git a/backend/src/test/java/de/bund/digitalservice/ris/caselaw/adapter/CourtControllerTest.java b/backend/src/test/java/de/bund/digitalservice/ris/caselaw/adapter/CourtControllerTest.java
@@ -1,5 +1,7 @@
 package de.bund.digitalservice.ris.caselaw.adapter;
 
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -28,8 +30,8 @@ class CourtControllerTest {
   @MockBean private ClientRegistrationRepository clientRegistrationRepository;
 
   @Test
-  void testGetCourts() {
-    when(service.getCourts(null)).thenReturn(new ArrayList<>());
+  void testGetCourtsWithoutSize() {
+    when(service.getCourts(anyString(), anyInt())).thenReturn(new ArrayList<>());
 
     risWebTestClient
         .withDefaultLogin()
@@ -39,6 +41,36 @@ void testGetCourts() {
         .expectStatus()
         .isOk();
 
-    verify(service, times(1)).getCourts(null);
+    verify(service, times(1)).getCourts(null, 200);
+  }
+
+  @Test
+  void testGetCourtsWithSize() {
+    when(service.getCourts(anyString(), anyInt())).thenReturn(new ArrayList<>());
+
+    risWebTestClient
+        .withDefaultLogin()
+        .get()
+        .uri("/api/v1/caselaw/courts?sz=100")
+        .exchange()
+        .expectStatus()
+        .isOk();
+
+    verify(service, times(1)).getCourts(null, 100);
+  }
+
+  @Test
+  void testGetCourtsWithQuery() {
+    when(service.getCourts(anyString(), anyInt())).thenReturn(new ArrayList<>());
+
+    risWebTestClient
+        .withDefaultLogin()
+        .get()
+        .uri("/api/v1/caselaw/courts?q=test")
+        .exchange()
+        .expectStatus()
+        .isOk();
+
+    verify(service, times(1)).getCourts("test", 200);
   }
 }
diff --git a/backend/src/test/java/de/bund/digitalservice/ris/caselaw/adapter/CourtServiceTest.java b/backend/src/test/java/de/bund/digitalservice/ris/caselaw/adapter/CourtServiceTest.java
@@ -33,13 +33,13 @@ void testGetTwoDifferentCourts() {
     Court courtB = Court.builder().type("XYZ").location("Hamburg").build();
 
     List<Court> returnedCourts = List.of(courtA, courtB);
-    when(courtRepository.findAllByOrderByTypeAscLocationAsc()).thenReturn(returnedCourts);
+    when(courtRepository.findAllByOrderByTypeAscLocationAsc(100)).thenReturn(returnedCourts);
 
-    List<Court> resultCourts = service.getCourts(null);
+    List<Court> resultCourts = service.getCourts(null, 100);
 
     Assertions.assertEquals(returnedCourts, resultCourts);
 
-    verify(courtRepository).findAllByOrderByTypeAscLocationAsc();
+    verify(courtRepository).findAllByOrderByTypeAscLocationAsc(100);
   }
 
   @Test
@@ -51,13 +51,13 @@ void testGetCourtsWithSearchString() {
     String trimmedSearchString = searchString.trim();
 
     List<Court> returnedCourts = List.of(courtA, courtB);
-    when(courtRepository.findBySearchStr(trimmedSearchString)).thenReturn(returnedCourts);
+    when(courtRepository.findBySearchStr(trimmedSearchString, 100)).thenReturn(returnedCourts);
 
-    List<Court> resultCourts = service.getCourts(searchString);
+    List<Court> resultCourts = service.getCourts(searchString, 100);
 
     Assertions.assertEquals(returnedCourts, resultCourts);
 
-    verify(courtRepository).findBySearchStr(trimmedSearchString);
+    verify(courtRepository).findBySearchStr(trimmedSearchString, 100);
   }
 
   @Test
@@ -66,12 +66,12 @@ void testGetCourtsWithBlankSearchString() {
     Court courtB = Court.builder().type("XYZ").location("Hamburg").build();
 
     List<Court> returnedCourts = List.of(courtA, courtB);
-    when(courtRepository.findAllByOrderByTypeAscLocationAsc()).thenReturn(returnedCourts);
+    when(courtRepository.findAllByOrderByTypeAscLocationAsc(100)).thenReturn(returnedCourts);
 
-    List<Court> resultCourts = service.getCourts("");
+    List<Court> resultCourts = service.getCourts("", 100);
 
     Assertions.assertEquals(returnedCourts, resultCourts);
 
-    verify(courtRepository).findAllByOrderByTypeAscLocationAsc();
+    verify(courtRepository).findAllByOrderByTypeAscLocationAsc(100);
   }
 }
diff --git a/...e/bund/digitalservice/ris/caselaw/integration/tests/DocumentationUnitIntegrationTest.java b/...e/bund/digitalservice/ris/caselaw/integration/tests/DocumentationUnitIntegrationTest.java
@@ -216,7 +216,7 @@ void testParametrizedDocumentationUnitCreation() {
     when(documentNumberPatternConfig.getDocumentNumberPatterns())
         .thenReturn(Map.of("DS", "XXRE0******YY"));
 
-    var court = databaseCourtRepository.findBySearchStr("AG Aachen").get(0);
+    var court = databaseCourtRepository.findBySearchStr("AG Aachen", 100).getFirst();
 
     risWebTestClient
         .withDefaultLogin()

diff --git a/frontend/src/services/comboboxItemService.ts b/frontend/src/services/comboboxItemService.ts
@@ -143,7 +143,7 @@ type ComboboxItemService = {
 
 const service: ComboboxItemService = {
   getCourts: (filter: Ref<string | undefined>) =>
-    fetchFromEndpoint(Endpoint.courts, filter),
+    fetchFromEndpoint(Endpoint.courts, filter, 200),
   getDocumentTypes: (filter: Ref<string | undefined>) =>
     fetchFromEndpoint(Endpoint.documentTypes, filter),
   getDependentLiteratureDocumentTypes: (filter: Ref<string | undefined>) =>