hotfix: add default pagination settings to analytics endpoints

LabGraphTeam · Jan 29, 2025 · 0d5b313 · 0d5b313
1 parent 65af326
commit 0d5b313
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 20 deletions.
diff --git a/...n/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsController.java b/...n/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsController.java
@@ -34,32 +34,36 @@ protected AnalyticsController(AnalyticHelperService analyticHelperService) {
 
 	@GetMapping()
 	public abstract ResponseEntity<CollectionModel<EntityModel<AnalyticsDTO>>> getAllAnalytics(
-			@PageableDefault(sort = "date",
+			@PageableDefault(size = 100, sort = "date",
 					direction = Sort.Direction.DESC) @ParameterObject Pageable pageable);
 
 
 	@GetMapping("/date-range")
 	public abstract ResponseEntity<Page<AnalyticsDTO>> getAnalyticsDateBetween(
 			@RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @PageableDefault(sort = "date",
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100, sort = "date",
 					direction = Sort.Direction.DESC) @ParameterObject Pageable pageable);
 
 	@GetMapping("/level-date-range")
 	public abstract ResponseEntity<Page<AnalyticsDTO>> getAllAnalyticsByLevelDateRange(
 			@RequestParam String level, @RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @ParameterObject Pageable pageable);
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable);
 
 	@GetMapping("/name-and-level-date-range")
 	public abstract ResponseEntity<List<AnalyticsDTO>> getAllAnalyticsByNameAndLevelDateRange(
 			@RequestParam String name, @RequestParam String level,
 			@RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @ParameterObject Pageable pageable);
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable);
 
 	@GetMapping("/mean-standard-deviation")
 	public abstract ResponseEntity<MeanAndStdDeviationDTO> getMeanAndStandardDeviation(
 			@RequestParam String name, @RequestParam String level,
 			@RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @ParameterObject Pageable pageable);
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable);
 }
 
 
diff --git a/.../leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsHelperController.java b/.../leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsHelperController.java
@@ -6,8 +6,10 @@
 import leonardo.labutilities.qualitylabpro.dtos.analytics.GroupedResultsByLevelDTO;
 import leonardo.labutilities.qualitylabpro.dtos.analytics.UpdateAnalyticsMeanDTO;
 import leonardo.labutilities.qualitylabpro.services.analytics.AnalyticHelperService;
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.hateoas.CollectionModel;
 import org.springframework.hateoas.EntityModel;
 import org.springframework.hateoas.Link;
@@ -63,7 +65,8 @@ public ResponseEntity<Void> updateAnalyticsMean(
 	@GetMapping("/grouped-by-level")
 	public ResponseEntity<List<GroupedResultsByLevelDTO>> getGroupedByLevel(
 			@RequestParam String name, @RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, Pageable pageable) {
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable) {
 		List<GroupedResultsByLevelDTO> groupedData = analyticHelperService
 				.findAnalyticsWithGroupedResults(name, startDate, endDate, pageable);
 		return ResponseEntity.ok(groupedData);
@@ -72,14 +75,15 @@ public ResponseEntity<List<GroupedResultsByLevelDTO>> getGroupedByLevel(
 	@GetMapping("/grouped-by-level/mean-deviation")
 	public ResponseEntity<List<GroupedMeanAndStdByLevelDTO>> getMeanAndDeviationGrouped(
 			@RequestParam String name, @RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, Pageable pageable) {
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable) {
 		List<GroupedMeanAndStdByLevelDTO> groupedData = analyticHelperService
 				.calculateGroupedMeanAndStandardDeviation(name, startDate, endDate, pageable);
 		return ResponseEntity.ok(groupedData);
 	}
 
 	public ResponseEntity<CollectionModel<EntityModel<AnalyticsDTO>>> getAllAnalyticsWithLinks(
-			List<String> names, Pageable pageable) {
+			List<String> names, @PageableDefault(size = 100) @ParameterObject Pageable pageable) {
 		Page<AnalyticsDTO> resultsList =
 				analyticHelperService.findAnalyticsPagedByNameIn(names, pageable);
 
@@ -91,7 +95,8 @@ public ResponseEntity<CollectionModel<EntityModel<AnalyticsDTO>>> getAllAnalytic
 	}
 
 	public ResponseEntity<CollectionModel<EntityModel<AnalyticsDTO>>> getAnalyticsByDateBetweenWithLinks(
-			List<String> names, LocalDateTime startDate, LocalDateTime endDate, Pageable pageable) {
+			List<String> names, LocalDateTime startDate, LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable) {
 
 		Page<AnalyticsDTO> analyticsRecordPaged = analyticHelperService
 				.findAnalyticsByNameInAndDateBetweenWithLinks(names, startDate, endDate, pageable);

diff --git a/...rdo/labutilities/qualitylabpro/controllers/analytics/BiochemistryAnalyticsController.java b/...rdo/labutilities/qualitylabpro/controllers/analytics/BiochemistryAnalyticsController.java
@@ -41,7 +41,7 @@ public BiochemistryAnalyticsController(
 	@Override
 	@GetMapping()
 	public ResponseEntity<CollectionModel<EntityModel<AnalyticsDTO>>> getAllAnalytics(
-			@PageableDefault(sort = "date",
+			@PageableDefault(size = 100, sort = "date",
 					direction = Sort.Direction.DESC) @ParameterObject Pageable pageable) {
 		return this.getAllAnalyticsWithLinks(names, pageable);
 	}
@@ -50,7 +50,8 @@ public ResponseEntity<CollectionModel<EntityModel<AnalyticsDTO>>> getAllAnalytic
 	@GetMapping("/date-range")
 	public ResponseEntity<Page<AnalyticsDTO>> getAnalyticsDateBetween(
 			@RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @PageableDefault(sort = "date",
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100, sort = "date",
 					direction = Sort.Direction.DESC) @ParameterObject Pageable pageable) {
 		return ResponseEntity.ok(biochemistryAnalyticsService
 				.findAnalyticsByNameInAndDateBetween(names, startDate, endDate, pageable));
@@ -60,7 +61,8 @@ public ResponseEntity<Page<AnalyticsDTO>> getAnalyticsDateBetween(
 	@GetMapping("/level-date-range")
 	public ResponseEntity<Page<AnalyticsDTO>> getAllAnalyticsByLevelDateRange(
 			@RequestParam String level, @RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @ParameterObject Pageable pageable) {
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable) {
 		return ResponseEntity.ok(biochemistryAnalyticsService.findAnalyticsByNameInByLevel(names,
 				level, startDate, endDate, pageable));
 	}
@@ -70,7 +72,8 @@ public ResponseEntity<Page<AnalyticsDTO>> getAllAnalyticsByLevelDateRange(
 	public ResponseEntity<List<AnalyticsDTO>> getAllAnalyticsByNameAndLevelDateRange(
 			@RequestParam String name, @RequestParam String level,
 			@RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @ParameterObject Pageable pageable) {
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable) {
 		return ResponseEntity.ok(biochemistryAnalyticsService
 				.findAnalyticsByNameAndLevelAndDate(name, level, startDate, endDate, pageable));
 	}
@@ -81,7 +84,8 @@ public ResponseEntity<List<AnalyticsDTO>> getAllAnalyticsByNameAndLevelDateRange
 	public ResponseEntity<MeanAndStdDeviationDTO> getMeanAndStandardDeviation(
 			@RequestParam String name, @RequestParam String level,
 			@RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @ParameterObject Pageable pageable) {
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable) {
 		return ResponseEntity.ok(biochemistryAnalyticsService
 				.calculateMeanAndStandardDeviation(name, level, startDate, endDate, pageable));
 	}

diff --git a/...ardo/labutilities/qualitylabpro/controllers/analytics/CoagulationAnalyticsController.java b/...ardo/labutilities/qualitylabpro/controllers/analytics/CoagulationAnalyticsController.java
@@ -59,7 +59,8 @@ public ResponseEntity<Page<AnalyticsDTO>> getAnalyticsDateBetween(
 	@GetMapping("/level-date-range")
 	public ResponseEntity<Page<AnalyticsDTO>> getAllAnalyticsByLevelDateRange(
 			@RequestParam String level, @RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @ParameterObject Pageable pageable) {
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable) {
 		return ResponseEntity.ok(coagulationAnalyticsService.findAnalyticsByNameInByLevel(names,
 				level, startDate, endDate, pageable));
 	}
@@ -70,7 +71,8 @@ public ResponseEntity<Page<AnalyticsDTO>> getAllAnalyticsByLevelDateRange(
 	public ResponseEntity<List<AnalyticsDTO>> getAllAnalyticsByNameAndLevelDateRange(
 			@RequestParam String name, @RequestParam String level,
 			@RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @ParameterObject Pageable pageable) {
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable) {
 		return ResponseEntity.ok(coagulationAnalyticsService
 				.findAnalyticsByNameAndLevelAndDate(name, level, startDate, endDate, pageable));
 	}
@@ -81,7 +83,8 @@ public ResponseEntity<List<AnalyticsDTO>> getAllAnalyticsByNameAndLevelDateRange
 	public ResponseEntity<MeanAndStdDeviationDTO> getMeanAndStandardDeviation(
 			@RequestParam String name, @RequestParam String level,
 			@RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @ParameterObject Pageable pageable) {
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable) {
 		return ResponseEntity.ok(coagulationAnalyticsService.calculateMeanAndStandardDeviation(name,
 				level, startDate, endDate, pageable));
 	}

diff --git a/...nardo/labutilities/qualitylabpro/controllers/analytics/HematologyAnalyticsController.java b/...nardo/labutilities/qualitylabpro/controllers/analytics/HematologyAnalyticsController.java
@@ -58,7 +58,8 @@ public ResponseEntity<Page<AnalyticsDTO>> getAnalyticsDateBetween(
 	@GetMapping("/level-date-range")
 	public ResponseEntity<Page<AnalyticsDTO>> getAllAnalyticsByLevelDateRange(
 			@RequestParam String level, @RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @ParameterObject Pageable pageable) {
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable) {
 		return ResponseEntity.ok(hematologyAnalyticsService.findAnalyticsByNameInByLevel(names,
 				level, startDate, endDate, pageable));
 	}
@@ -68,7 +69,8 @@ public ResponseEntity<Page<AnalyticsDTO>> getAllAnalyticsByLevelDateRange(
 	public ResponseEntity<List<AnalyticsDTO>> getAllAnalyticsByNameAndLevelDateRange(
 			@RequestParam String name, @RequestParam String level,
 			@RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @ParameterObject Pageable pageable) {
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable) {
 		return ResponseEntity.ok(hematologyAnalyticsService.findAnalyticsByNameAndLevelAndDate(name,
 				level, startDate, endDate, pageable));
 	}
@@ -79,7 +81,8 @@ public ResponseEntity<List<AnalyticsDTO>> getAllAnalyticsByNameAndLevelDateRange
 	public ResponseEntity<MeanAndStdDeviationDTO> getMeanAndStandardDeviation(
 			@RequestParam String name, @RequestParam String level,
 			@RequestParam("startDate") LocalDateTime startDate,
-			@RequestParam("endDate") LocalDateTime endDate, @ParameterObject Pageable pageable) {
+			@RequestParam("endDate") LocalDateTime endDate,
+			@PageableDefault(size = 100) @ParameterObject Pageable pageable) {
 		return ResponseEntity.ok(hematologyAnalyticsService.calculateMeanAndStandardDeviation(name,
 				level, startDate, endDate, pageable));
 	}