fix: serch moog upper case

InseeFr · Sep 20, 2024 · 57ed52c · 57ed52c
1 parent 5018aae
commit 57ed52c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.3</version>
+		<version>3.3.4</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>fr.insee.survey</groupId>

diff --git a/src/main/java/fr/insee/survey/datacollectionmanagement/query/controller/MoogController.java b/src/main/java/fr/insee/survey/datacollectionmanagement/query/controller/MoogController.java
@@ -20,6 +20,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
@@ -53,12 +54,11 @@ public ResponseEntity<Page<MoogSearchDto>> moogSearch(@RequestParam(required = f
                                                           @RequestParam(defaultValue = "0", required = false) int pageNo,
                                                           @RequestParam(defaultValue = "20", required = false) int pageSize) {
 
-        List<View> listView = moogService.moogSearch(filter1);
+        List<View> listView = moogService.moogSearch(StringUtils.upperCase(filter1));
 
         Pageable pageable = PageRequest.of(pageNo, pageSize);
         int start = (int) pageable.getOffset();
-        int end = (start + pageable.getPageSize()) > listView.size() ? listView.size()
-                : (start + pageable.getPageSize());
+        int end = Math.min((start + pageable.getPageSize()), listView.size());
 
         if (start <= end) {
             Page<MoogSearchDto> page = new PageImpl<>(

diff --git a/src/main/java/fr/insee/survey/datacollectionmanagement/query/service/MoogService.java b/src/main/java/fr/insee/survey/datacollectionmanagement/query/service/MoogService.java
@@ -24,5 +24,5 @@ public interface MoogService {
 
     Collection<MoogExtractionRowDto> getSurveyUnitsToFollowUp(String idCampaign);
 
-    public String getReadOnlyUrl(String idCampaign, String surveyUnitId) throws NotFoundException;
+    String getReadOnlyUrl(String idCampaign, String surveyUnitId) throws NotFoundException;
 }