Fix cache configs.

LabGraphTeam · Jan 17, 2025 · 3cedbfa · 3cedbfa
1 parent 3b668d7
commit 3cedbfa
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 37 deletions.
diff --git a/...n/java/leonardo/labutilities/qualitylabpro/services/analytics/AnalyticsHelperService.java b/...n/java/leonardo/labutilities/qualitylabpro/services/analytics/AnalyticsHelperService.java
@@ -103,7 +103,6 @@ private MeanAndStdDeviationRecord computeStatistics(List<Double> values) {
 	}
 
 	@Override
-	@Cacheable(cacheNames = "analytics-cache", key = "#records.hashCode()")
 	public List<GroupedValuesByLevel> findFilteredGroupedAnalytics(
 			List<GroupedValuesByLevel> records) {
 		return records.stream().filter(this::isGroupedRecordValid)
@@ -115,8 +114,6 @@ public List<GroupedValuesByLevel> findFilteredGroupedAnalytics(
 
 
 	@Override
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#name + '-' + #startDate.toString() + '-' + #endDate.toString() + '-' + #pageable.pageNumber + '-' + #pageable.pageSize")
 	public List<GroupedValuesByLevel> findGroupedAnalyticsByLevel(String name,
 			LocalDateTime startDate, LocalDateTime endDate) {
 		List<AnalyticsRecord> records = analyticsRepository
@@ -129,8 +126,6 @@ public List<GroupedValuesByLevel> findGroupedAnalyticsByLevel(String name,
 				.map(entry -> new GroupedValuesByLevel(entry.getKey(), entry.getValue())).toList();
 	}
 
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#name + '-' + #startDate.toString() + '-' + #endDate.toString()")
 	public List<GroupedResultsByLevel> findAnalyticsWithGroupedResults(String name,
 			LocalDateTime startDate, LocalDateTime endDate) {
 		List<GroupedValuesByLevel> analytics =
@@ -147,7 +142,6 @@ public List<GroupedResultsByLevel> findAnalyticsWithGroupedResults(String name,
 	}
 
 	@Override
-	@Cacheable(cacheNames = "analytics-cache", key = "#records.hashCode()")
 	public List<GroupedMeanAndStdRecordByLevel> returnMeanAndStandardDeviationForGroups(
 			List<GroupedValuesByLevel> records) {
 		return records.stream()
@@ -166,8 +160,7 @@ public MeanAndStdDeviationRecord calculateMeanAndStandardDeviation(String name,
 		return result;
 	}
 
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#name + '-' + #startDate.toString() + '-' + #endDate.toString()")
+
 	public List<GroupedMeanAndStdRecordByLevel> calculateGroupedMeanAndStandardDeviation(
 			String name, LocalDateTime startDate, LocalDateTime endDate) {
 		List<AnalyticsRecord> records = analyticsRepository
@@ -181,23 +174,17 @@ public List<GroupedMeanAndStdRecordByLevel> calculateGroupedMeanAndStandardDevia
 	}
 
 	@Override
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#names.hashCode() + '-' + #dateStart.toString() + '-' + #dateEnd.toString()")
 	public List<AnalyticsRecord> findAnalyticsByNameInAndDateBetween(List<String> names,
 																	 LocalDateTime dateStart, LocalDateTime dateEnd) {
 		return analyticsRepository.findByNameInAndDateBetween(names, dateStart, dateEnd)
 				.stream().map((AnalyticsMapper::toRecord)).toList();
 	}
 
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#names.hashCode() + '-' + #pageable.pageNumber + '-' + #pageable.pageSize")
 	public List<AnalyticsRecord> findAnalyticsByNameIn(List<String> names, Pageable pageable) {
 		return analyticsRepository
 				.findByNameIn(names, pageable).stream().map((AnalyticsMapper::toRecord)).toList();
 	}
 
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#names.hashCode() + '-' + #pageable.pageNumber + '-' + #pageable.pageSize")
 	public Page<AnalyticsRecord> findAnalyticsPagedByNameIn(List<String> names, Pageable pageable) {
 		return analyticsRepository
 				.findByNameInPaged(names, pageable);
@@ -222,15 +209,12 @@ public void saveNewAnalyticsRecords(List<AnalyticsRecord> valuesOfLevelsList) {
 	}
 
 	@Override
-	@Cacheable(value = "name")
 	public Page<AnalyticsRecord> findAnalytics(Pageable pageable) {
 		return analyticsRepository.findPaged(pageable);
 	}
 
 
 	@Override
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#name + '-' + #pageable.pageNumber + '-' + #pageable.pageSize")
 	public List<AnalyticsRecord> findAnalyticsByNameWithPagination(Pageable pageable,
 																   String name) {
 		List<AnalyticsRecord> analyticsList =
@@ -248,8 +232,6 @@ public AnalyticsRecord findOneById(Long id) {
 						"AnalyticsRecord by id not found")));
 	}
 
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#name + '-' + #level + '-' + #pageable.pageNumber + '-' + #pageable.pageSize")
 	public List<AnalyticsRecord> findAnalyticsByNameAndLevelWithPagination(Pageable pageable, String name, String level) {
 		List<AnalyticsRecord> analyticsList = analyticsRepository
 				.findByNameAndLevel(pageable, name.toUpperCase(), level)
@@ -258,10 +240,9 @@ public List<AnalyticsRecord> findAnalyticsByNameAndLevelWithPagination(Pageable
 		return analyticsList;
 	}
 
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#name + '-' + #level + '-' + #dateStart.toString() + '-' + #dateEnd.toString()")
 	public List<AnalyticsRecord> findAnalyticsByNameLevelAndDate(String name, String level,
 														  LocalDateTime dateStart, LocalDateTime dateEnd) {
+		ensureNameExists(name);
 		List<AnalyticsRecord> results = analyticsRepository
 				.findByNameAndLevelAndDateBetween(name, level, dateStart, dateEnd, pageable)
 				.stream().map(AnalyticsMapper::toRecord).toList();
@@ -270,8 +251,6 @@ public List<AnalyticsRecord> findAnalyticsByNameLevelAndDate(String name, String
 	}
 
 	@Override
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#dateStart.toString() + '-' + #dateEnd.toString()")
 	public List<AnalyticsRecord> findAnalyticsByDate(LocalDateTime dateStart, LocalDateTime dateEnd) {
 		List<AnalyticsRecord> results =
 				analyticsRepository.findByDateBetween(dateStart, dateEnd)

diff --git a/.../leonardo/labutilities/qualitylabpro/services/analytics/BiochemistryAnalyticsService.java b/.../leonardo/labutilities/qualitylabpro/services/analytics/BiochemistryAnalyticsService.java
@@ -37,9 +37,7 @@ public List<AnalyticsRecord> findAnalyticsByNameAndLevel(Pageable pageable, Stri
 	@Override
 	@Cacheable(cacheNames = "analytics-cache",
 			key = "#name + '-' + #level + '-' + #dateStart.toString() + '-' + #dateEnd.toString()")
-	public List<AnalyticsRecord> findAnalyticsByNameAndLevelAndDate(String name,
-																	String level, LocalDateTime dateStart, LocalDateTime dateEnd) {
-		ensureNameExists(name);
+	public List<AnalyticsRecord> findAnalyticsByNameAndLevelAndDate(String name, String level, LocalDateTime dateStart, LocalDateTime dateEnd) {
 		return findAnalyticsByNameLevelAndDate(name, convertLevel(level), dateStart, dateEnd);
 	}
 

diff --git a/...a/leonardo/labutilities/qualitylabpro/services/analytics/CoagulationAnalyticsService.java b/...a/leonardo/labutilities/qualitylabpro/services/analytics/CoagulationAnalyticsService.java
@@ -24,8 +24,6 @@ public List<AnalyticsRecord> findAnalyticsByNameInByLevel(List<String> names, St
 				startDate, endDate, pageable);
 	}
 	@Override
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#name + '-' + #level + '-' + #pageable.pageNumber + '-' + #pageable.pageSize")
 	public List<AnalyticsRecord> findAnalyticsByNameAndLevel(Pageable pageable, String name,
 															 String level) {
 		this.ensureNameExists(name);
@@ -34,11 +32,8 @@ public List<AnalyticsRecord> findAnalyticsByNameAndLevel(Pageable pageable, Stri
 	}
 
 	@Override
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#name + '-' + #level + '-' + #dateStart.toString() + '-' + #dateEnd.toString()")
 	public List<AnalyticsRecord> findAnalyticsByNameAndLevelAndDate(String name,
 																	String level, LocalDateTime dateStart, LocalDateTime dateEnd) {
-		this.ensureNameExists(name);
 		return this.findAnalyticsByNameLevelAndDate(name.toUpperCase(), this.convertLevel(level),
 				dateStart, dateEnd);
 	}

diff --git a/...va/leonardo/labutilities/qualitylabpro/services/analytics/HematologyAnalyticsService.java b/...va/leonardo/labutilities/qualitylabpro/services/analytics/HematologyAnalyticsService.java
@@ -24,17 +24,13 @@ public List<AnalyticsRecord> findAnalyticsByNameInByLevel(List<String> names, St
 				startDate, endDate, pageable);
 	}
 	@Override
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#name + '-' + #level + '-' + #pageable.pageNumber + '-' + #pageable.pageSize")
 	public List<AnalyticsRecord> findAnalyticsByNameAndLevel(Pageable pageable, String name,
 															 String level) {
 		ensureNameExists(name);
 		return findAnalyticsByNameAndLevelWithPagination(pageable, name, convertLevel(level));
 	}
 
 	@Override
-	@Cacheable(cacheNames = "analytics-cache",
-			key = "#name + '-' + #level + '-' + #dateStart.toString() + '-' + #dateEnd.toString()")
 	public List<AnalyticsRecord> findAnalyticsByNameAndLevelAndDate(String name,
 																	String level, LocalDateTime dateStart, LocalDateTime dateEnd) {
 		ensureNameExists(name);

diff --git a/.../java/leonardo/labutilities/qualitylabpro/services/analytics/IAnalyticsHelperService.java b/.../java/leonardo/labutilities/qualitylabpro/services/analytics/IAnalyticsHelperService.java
@@ -36,8 +36,7 @@ void updateAnalyticsMeanByNameAndLevelAndLevelLot(String name, String level, Str
 
 	List<AnalyticsRecord> findAnalyticsByNameInByLevelBaseMethod(List<String> names, String level, LocalDateTime startDate, LocalDateTime endDate, Pageable pageable);
 
-	List<AnalyticsRecord> findAnalyticsByDate(LocalDateTime dateStart,
-											  LocalDateTime dateEnd);
+	List<AnalyticsRecord> findAnalyticsByDate(LocalDateTime dateStart, LocalDateTime dateEnd);
 
 	List<AnalyticsRecord> findAnalyticsByNameInAndDateBetween(List<String> names,
 															  LocalDateTime startDate, LocalDateTime endDate);