diff --git a/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsController.java b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsController.java index 2f812c2..a53a6e7 100644 --- a/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsController.java +++ b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsController.java @@ -34,32 +34,36 @@ protected AnalyticsController(AnalyticHelperService analyticHelperService) { @GetMapping() public abstract ResponseEntity>> getAllAnalytics( - @PageableDefault(sort = "date", + @PageableDefault(size = 100, sort = "date", direction = Sort.Direction.DESC) @ParameterObject Pageable pageable); @GetMapping("/date-range") public abstract ResponseEntity> 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> 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> 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 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/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsHelperController.java b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsHelperController.java index c469597..34da6f3 100644 --- a/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsHelperController.java +++ b/src/main/java/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 updateAnalyticsMean( @GetMapping("/grouped-by-level") public ResponseEntity> 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 groupedData = analyticHelperService .findAnalyticsWithGroupedResults(name, startDate, endDate, pageable); return ResponseEntity.ok(groupedData); @@ -72,14 +75,15 @@ public ResponseEntity> getGroupedByLevel( @GetMapping("/grouped-by-level/mean-deviation") public ResponseEntity> 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 groupedData = analyticHelperService .calculateGroupedMeanAndStandardDeviation(name, startDate, endDate, pageable); return ResponseEntity.ok(groupedData); } public ResponseEntity>> getAllAnalyticsWithLinks( - List names, Pageable pageable) { + List names, @PageableDefault(size = 100) @ParameterObject Pageable pageable) { Page resultsList = analyticHelperService.findAnalyticsPagedByNameIn(names, pageable); @@ -91,7 +95,8 @@ public ResponseEntity>> getAllAnalytic } public ResponseEntity>> getAnalyticsByDateBetweenWithLinks( - List names, LocalDateTime startDate, LocalDateTime endDate, Pageable pageable) { + List names, LocalDateTime startDate, LocalDateTime endDate, + @PageableDefault(size = 100) @ParameterObject Pageable pageable) { Page analyticsRecordPaged = analyticHelperService .findAnalyticsByNameInAndDateBetweenWithLinks(names, startDate, endDate, pageable); diff --git a/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/BiochemistryAnalyticsController.java b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/BiochemistryAnalyticsController.java index 2373a6c..0df32a5 100644 --- a/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/BiochemistryAnalyticsController.java +++ b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/BiochemistryAnalyticsController.java @@ -41,7 +41,7 @@ public BiochemistryAnalyticsController( @Override @GetMapping() public ResponseEntity>> 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>> getAllAnalytic @GetMapping("/date-range") public ResponseEntity> 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> getAnalyticsDateBetween( @GetMapping("/level-date-range") public ResponseEntity> 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> getAllAnalyticsByLevelDateRange( public ResponseEntity> 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> getAllAnalyticsByNameAndLevelDateRange public ResponseEntity 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/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/CoagulationAnalyticsController.java b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/CoagulationAnalyticsController.java index f3b8af6..4e03b53 100644 --- a/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/CoagulationAnalyticsController.java +++ b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/CoagulationAnalyticsController.java @@ -59,7 +59,8 @@ public ResponseEntity> getAnalyticsDateBetween( @GetMapping("/level-date-range") public ResponseEntity> 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> getAllAnalyticsByLevelDateRange( public ResponseEntity> 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> getAllAnalyticsByNameAndLevelDateRange public ResponseEntity 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/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/HematologyAnalyticsController.java b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/HematologyAnalyticsController.java index 4e8c823..a4c6f70 100644 --- a/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/HematologyAnalyticsController.java +++ b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/HematologyAnalyticsController.java @@ -58,7 +58,8 @@ public ResponseEntity> getAnalyticsDateBetween( @GetMapping("/level-date-range") public ResponseEntity> 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> getAllAnalyticsByLevelDateRange( public ResponseEntity> 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> getAllAnalyticsByNameAndLevelDateRange public ResponseEntity 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)); }