diff --git a/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AbstractAnalyticsController.java b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AbstractAnalyticsController.java index fd16e0c..5ad16cb 100644 --- a/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AbstractAnalyticsController.java +++ b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AbstractAnalyticsController.java @@ -1,9 +1,7 @@ package leonardo.labutilities.qualitylabpro.controllers.analytics; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import leonardo.labutilities.qualitylabpro.dtos.analytics.AnalyticsDTO; -import leonardo.labutilities.qualitylabpro.dtos.analytics.MeanAndStdDeviationDTO; -import leonardo.labutilities.qualitylabpro.services.analytics.AbstractAnalyticHelperService; +import java.time.LocalDateTime; +import java.util.List; import org.springdoc.core.annotations.ParameterObject; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -17,9 +15,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; - -import java.time.LocalDateTime; -import java.util.List; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import leonardo.labutilities.qualitylabpro.dtos.analytics.AnalyticsDTO; +import leonardo.labutilities.qualitylabpro.dtos.analytics.MeanAndStdDeviationDTO; +import leonardo.labutilities.qualitylabpro.services.analytics.AbstractAnalyticHelperService; @Validated @@ -42,7 +41,7 @@ public abstract ResponseEntity>> getAl public abstract ResponseEntity> getAnalyticsDateBetween( @RequestParam("startDate") LocalDateTime startDate, @RequestParam("endDate") LocalDateTime endDate, - @PageableDefault(size = 100, sort = "date", + @PageableDefault(size = 500, sort = "date", direction = Sort.Direction.DESC) @ParameterObject Pageable pageable); @GetMapping("/level-date-range") 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 0b0866e..e009f39 100644 --- a/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/BiochemistryAnalyticsController.java +++ b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/BiochemistryAnalyticsController.java @@ -1,10 +1,7 @@ package leonardo.labutilities.qualitylabpro.controllers.analytics; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import leonardo.labutilities.qualitylabpro.dtos.analytics.AnalyticsDTO; -import leonardo.labutilities.qualitylabpro.dtos.analytics.MeanAndStdDeviationDTO; -import leonardo.labutilities.qualitylabpro.services.analytics.BiochemistryAnalyticService; -import leonardo.labutilities.qualitylabpro.utils.constants.AvailableBiochemistryAnalytics; +import java.time.LocalDateTime; +import java.util.List; import org.springdoc.core.annotations.ParameterObject; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -18,9 +15,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; - -import java.time.LocalDateTime; -import java.util.List; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import leonardo.labutilities.qualitylabpro.dtos.analytics.AnalyticsDTO; +import leonardo.labutilities.qualitylabpro.dtos.analytics.MeanAndStdDeviationDTO; +import leonardo.labutilities.qualitylabpro.services.analytics.BiochemistryAnalyticService; +import leonardo.labutilities.qualitylabpro.utils.constants.AvailableBiochemistryAnalytics; @Validated @SecurityRequirement(name = "bearer-key") @@ -51,9 +50,9 @@ public ResponseEntity>> getAllAnalytic public ResponseEntity> getAnalyticsDateBetween( @RequestParam("startDate") LocalDateTime startDate, @RequestParam("endDate") LocalDateTime endDate, - @PageableDefault(size = 100, sort = "date", - direction = Sort.Direction.DESC) @ParameterObject Pageable pageable) { - return ResponseEntity.ok(biochemistryAnalyticsService + @PageableDefault(sort = "date", direction = Sort.Direction.DESC, + size = 500) @ParameterObject Pageable pageable) { + return ResponseEntity.ok(this.biochemistryAnalyticsService .findAnalyticsByNameInAndDateBetween(names, startDate, endDate, pageable)); } @@ -63,8 +62,8 @@ public ResponseEntity> getAllAnalyticsByLevelDateRange( @RequestParam String level, @RequestParam("startDate") LocalDateTime startDate, @RequestParam("endDate") LocalDateTime endDate, @PageableDefault(size = 100) @ParameterObject Pageable pageable) { - return ResponseEntity.ok(biochemistryAnalyticsService.findAnalyticsByNameInByLevel(names, - level, startDate, endDate, pageable)); + return ResponseEntity.ok(this.biochemistryAnalyticsService + .findAnalyticsByNameInByLevel(names, level, startDate, endDate, pageable)); } @Override @@ -74,7 +73,7 @@ public ResponseEntity> getAllAnalyticsByNameAndLevelDateRange @RequestParam("startDate") LocalDateTime startDate, @RequestParam("endDate") LocalDateTime endDate, @PageableDefault(size = 100) @ParameterObject Pageable pageable) { - return ResponseEntity.ok(biochemistryAnalyticsService + return ResponseEntity.ok(this.biochemistryAnalyticsService .findAnalyticsByNameAndLevelAndDate(name, level, startDate, endDate, pageable)); } @@ -86,7 +85,7 @@ public ResponseEntity getMeanAndStandardDeviation( @RequestParam("startDate") LocalDateTime startDate, @RequestParam("endDate") LocalDateTime endDate, @PageableDefault(size = 100) @ParameterObject Pageable pageable) { - return ResponseEntity.ok(biochemistryAnalyticsService + return ResponseEntity.ok(this.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 8087e50..f52e21c 100644 --- a/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/CoagulationAnalyticsController.java +++ b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/CoagulationAnalyticsController.java @@ -1,10 +1,7 @@ package leonardo.labutilities.qualitylabpro.controllers.analytics; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import leonardo.labutilities.qualitylabpro.dtos.analytics.AnalyticsDTO; -import leonardo.labutilities.qualitylabpro.dtos.analytics.MeanAndStdDeviationDTO; -import leonardo.labutilities.qualitylabpro.services.analytics.CoagulationAnalyticService; -import leonardo.labutilities.qualitylabpro.utils.constants.AvailableCoagulationAnalytics; +import java.time.LocalDateTime; +import java.util.List; import org.springdoc.core.annotations.ParameterObject; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -18,9 +15,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; - -import java.time.LocalDateTime; -import java.util.List; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import leonardo.labutilities.qualitylabpro.dtos.analytics.AnalyticsDTO; +import leonardo.labutilities.qualitylabpro.dtos.analytics.MeanAndStdDeviationDTO; +import leonardo.labutilities.qualitylabpro.services.analytics.CoagulationAnalyticService; +import leonardo.labutilities.qualitylabpro.utils.constants.AvailableCoagulationAnalytics; @Validated @SecurityRequirement(name = "bearer-key") @@ -49,9 +48,10 @@ public ResponseEntity>> getAllAnalytic @GetMapping("/date-range") public ResponseEntity> getAnalyticsDateBetween( @RequestParam("startDate") LocalDateTime startDate, - @RequestParam("endDate") LocalDateTime endDate, @PageableDefault(sort = "date", - direction = Sort.Direction.DESC) @ParameterObject Pageable pageable) { - return ResponseEntity.ok(coagulationAnalyticsService + @RequestParam("endDate") LocalDateTime endDate, + @PageableDefault(sort = "date", direction = Sort.Direction.DESC, + size = 500) @ParameterObject Pageable pageable) { + return ResponseEntity.ok(this.coagulationAnalyticsService .findAnalyticsByNameInAndDateBetween(names, startDate, endDate, pageable)); } @@ -61,8 +61,8 @@ public ResponseEntity> getAllAnalyticsByLevelDateRange( @RequestParam String level, @RequestParam("startDate") LocalDateTime startDate, @RequestParam("endDate") LocalDateTime endDate, @PageableDefault(size = 100) @ParameterObject Pageable pageable) { - return ResponseEntity.ok(coagulationAnalyticsService.findAnalyticsByNameInByLevel(names, - level, startDate, endDate, pageable)); + return ResponseEntity.ok(this.coagulationAnalyticsService + .findAnalyticsByNameInByLevel(names, level, startDate, endDate, pageable)); } @@ -73,7 +73,7 @@ public ResponseEntity> getAllAnalyticsByNameAndLevelDateRange @RequestParam("startDate") LocalDateTime startDate, @RequestParam("endDate") LocalDateTime endDate, @PageableDefault(size = 100) @ParameterObject Pageable pageable) { - return ResponseEntity.ok(coagulationAnalyticsService + return ResponseEntity.ok(this.coagulationAnalyticsService .findAnalyticsByNameAndLevelAndDate(name, level, startDate, endDate, pageable)); } @@ -85,7 +85,7 @@ public ResponseEntity getMeanAndStandardDeviation( @RequestParam("startDate") LocalDateTime startDate, @RequestParam("endDate") LocalDateTime endDate, @PageableDefault(size = 100) @ParameterObject Pageable pageable) { - return ResponseEntity.ok(coagulationAnalyticsService.calculateMeanAndStandardDeviation(name, - level, startDate, endDate, pageable)); + return ResponseEntity.ok(this.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 6b0e617..eae9d7a 100644 --- a/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/HematologyAnalyticsController.java +++ b/src/main/java/leonardo/labutilities/qualitylabpro/controllers/analytics/HematologyAnalyticsController.java @@ -1,10 +1,7 @@ package leonardo.labutilities.qualitylabpro.controllers.analytics; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import leonardo.labutilities.qualitylabpro.dtos.analytics.AnalyticsDTO; -import leonardo.labutilities.qualitylabpro.dtos.analytics.MeanAndStdDeviationDTO; -import leonardo.labutilities.qualitylabpro.services.analytics.HematologyAnalyticService; -import leonardo.labutilities.qualitylabpro.utils.constants.AvailableHematologyAnalytics; +import java.time.LocalDateTime; +import java.util.List; import org.springdoc.core.annotations.ParameterObject; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -18,9 +15,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; - -import java.time.LocalDateTime; -import java.util.List; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import leonardo.labutilities.qualitylabpro.dtos.analytics.AnalyticsDTO; +import leonardo.labutilities.qualitylabpro.dtos.analytics.MeanAndStdDeviationDTO; +import leonardo.labutilities.qualitylabpro.services.analytics.HematologyAnalyticService; +import leonardo.labutilities.qualitylabpro.utils.constants.AvailableHematologyAnalytics; @Validated @SecurityRequirement(name = "bearer-key") @@ -48,9 +47,10 @@ public ResponseEntity>> getAllAnalytic @GetMapping("/date-range") public ResponseEntity> getAnalyticsDateBetween( @RequestParam("startDate") LocalDateTime startDate, - @RequestParam("endDate") LocalDateTime endDate, @PageableDefault(sort = "date", - direction = Sort.Direction.DESC) @ParameterObject Pageable pageable) { - return ResponseEntity.ok(hematologyAnalyticsService + @RequestParam("endDate") LocalDateTime endDate, + @PageableDefault(sort = "date", direction = Sort.Direction.DESC, + size = 500) @ParameterObject Pageable pageable) { + return ResponseEntity.ok(this.hematologyAnalyticsService .findAnalyticsByNameInAndDateBetween(names, startDate, endDate, pageable)); } @@ -60,7 +60,7 @@ public ResponseEntity> getAllAnalyticsByLevelDateRange( @RequestParam String level, @RequestParam("startDate") LocalDateTime startDate, @RequestParam("endDate") LocalDateTime endDate, @PageableDefault(size = 100) @ParameterObject Pageable pageable) { - return ResponseEntity.ok(hematologyAnalyticsService.findAnalyticsByNameInByLevel(names, + return ResponseEntity.ok(this.hematologyAnalyticsService.findAnalyticsByNameInByLevel(names, level, startDate, endDate, pageable)); } @@ -71,8 +71,8 @@ public ResponseEntity> getAllAnalyticsByNameAndLevelDateRange @RequestParam("startDate") LocalDateTime startDate, @RequestParam("endDate") LocalDateTime endDate, @PageableDefault(size = 100) @ParameterObject Pageable pageable) { - return ResponseEntity.ok(hematologyAnalyticsService.findAnalyticsByNameAndLevelAndDate(name, - level, startDate, endDate, pageable)); + return ResponseEntity.ok(this.hematologyAnalyticsService + .findAnalyticsByNameAndLevelAndDate(name, level, startDate, endDate, pageable)); } @@ -83,8 +83,8 @@ public ResponseEntity getMeanAndStandardDeviation( @RequestParam("startDate") LocalDateTime startDate, @RequestParam("endDate") LocalDateTime endDate, @PageableDefault(size = 100) @ParameterObject Pageable pageable) { - return ResponseEntity.ok(hematologyAnalyticsService.calculateMeanAndStandardDeviation(name, - level, startDate, endDate, pageable)); + return ResponseEntity.ok(this.hematologyAnalyticsService + .calculateMeanAndStandardDeviation(name, level, startDate, endDate, pageable)); }