Skip to content

Commit

Permalink
hotfix: improve code structure and readability in AnalyticsController
Browse files Browse the repository at this point in the history
  • Loading branch information
@LeonardoMeireles55
LeonardoMeireles55 committed Feb 7, 2025
1 parent 0f41e94 commit 366714f
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 55 deletions.
15 changes: 7 additions & 8 deletions ...eonardo/labutilities/qualitylabpro/controllers/analytics/AbstractAnalyticsController.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand All @@ -42,7 +41,7 @@ public abstract ResponseEntity<CollectionModel<EntityModel<AnalyticsDTO>>> getAl
public abstract ResponseEntity<Page<AnalyticsDTO>> 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")
Expand Down
29 changes: 14 additions & 15 deletions ...rdo/labutilities/qualitylabpro/controllers/analytics/BiochemistryAnalyticsController.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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")
Expand Down Expand Up @@ -51,9 +50,9 @@ public ResponseEntity<CollectionModel<EntityModel<AnalyticsDTO>>> getAllAnalytic
public ResponseEntity<Page<AnalyticsDTO>> 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));
}

Expand All @@ -63,8 +62,8 @@ public ResponseEntity<Page<AnalyticsDTO>> 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
Expand All @@ -74,7 +73,7 @@ public ResponseEntity<List<AnalyticsDTO>> 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));
}

Expand All @@ -86,7 +85,7 @@ public ResponseEntity<MeanAndStdDeviationDTO> 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));
}
}
32 changes: 16 additions & 16 deletions ...ardo/labutilities/qualitylabpro/controllers/analytics/CoagulationAnalyticsController.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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")
Expand Down Expand Up @@ -49,9 +48,10 @@ 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",
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));
}

Expand All @@ -61,8 +61,8 @@ public ResponseEntity<Page<AnalyticsDTO>> 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));
}


Expand All @@ -73,7 +73,7 @@ public ResponseEntity<List<AnalyticsDTO>> 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));
}

Expand All @@ -85,7 +85,7 @@ public ResponseEntity<MeanAndStdDeviationDTO> 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));
}
}
32 changes: 16 additions & 16 deletions ...nardo/labutilities/qualitylabpro/controllers/analytics/HematologyAnalyticsController.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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")
Expand Down Expand Up @@ -48,9 +47,10 @@ 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",
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));
}

Expand All @@ -60,7 +60,7 @@ public ResponseEntity<Page<AnalyticsDTO>> 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));
}

Expand All @@ -71,8 +71,8 @@ public ResponseEntity<List<AnalyticsDTO>> 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));
}


Expand All @@ -83,8 +83,8 @@ public ResponseEntity<MeanAndStdDeviationDTO> 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));
}


Expand Down

0 comments on commit 366714f

Please sign in to comment.