hotfix: enhance analytics endpoints with pagination support and updat…

…e email templates
LabGraphTeam · Jan 29, 2025 · f34ee62 · f34ee62
1 parent efcf3b7
commit f34ee62
Show file tree

Hide file tree

Showing 25 changed files with 978 additions and 906 deletions.
diff --git a/pom.xml b/pom.xml
@@ -45,9 +45,10 @@
             <artifactId>spring-boot-starter-hateoas</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
-            <version>11.2.0</version>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>3.5.1</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
@@ -62,11 +63,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>3.5.1</version>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -142,4 +138,31 @@
             </plugin>
         </plugins>
     </build>
+
+
+    <dependencyManagement>
+
+
+        <dependencies>
+
+            <dependency>
+                <groupId>com.google.errorprone</groupId>
+                <artifactId>error_prone_annotations</artifactId>
+                <version>2.36.0</version>
+            </dependency>
+
+
+            <dependency>
+                <groupId>org.checkerframework</groupId>
+                <artifactId>checker-qual</artifactId>
+                <version>3.37.0</version>
+            </dependency>
+
+
+
+
+
+        </dependencies>
+
+    </dependencyManagement>
 </project>
diff --git a/...n/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsController.java b/...n/java/leonardo/labutilities/qualitylabpro/controllers/analytics/AnalyticsController.java
@@ -28,38 +28,38 @@
 @RestController()
 public abstract class AnalyticsController extends AnalyticsHelperController {
 
-    public AnalyticsController(AnalyticHelperService analyticHelperService) {
-        super(analyticHelperService);
-    }
+	protected AnalyticsController(AnalyticHelperService analyticHelperService) {
+		super(analyticHelperService);
+	}
 
-    @GetMapping()
-    public abstract ResponseEntity<CollectionModel<EntityModel<AnalyticsDTO>>> getAllAnalytics(
-            @PageableDefault(sort = "date",
-                    direction = Sort.Direction.DESC) @ParameterObject Pageable pageable);
+	@GetMapping()
+	public abstract ResponseEntity<CollectionModel<EntityModel<AnalyticsDTO>>> getAllAnalytics(
+			@PageableDefault(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",
-                    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",
+					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);
+	@GetMapping("/level-date-range")
+	public abstract ResponseEntity<Page<AnalyticsDTO>> getAllAnalyticsByLevelDateRange(
+			@RequestParam String level, @RequestParam("startDate") LocalDateTime startDate,
+			@RequestParam("endDate") LocalDateTime endDate, @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);
+	@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);
 
-    @GetMapping("/mean-standard-deviation")
-    public abstract ResponseEntity<MeanAndStdDeviationDTO> getMeanAndStandardDeviation(
-            @RequestParam String name, @RequestParam String level,
-            @RequestParam("startDate") LocalDateTime startDate,
-            @RequestParam("endDate") LocalDateTime endDate);
+	@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);
 }