refactor: update caching strategy and improve error handling in analy…

…tics and email services
LabGraphTeam · Feb 9, 2025 · 8ea69a7 · 8ea69a7
1 parent e56e446
commit 8ea69a7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/...leonardo/labutilities/qualitylabpro/services/analytics/AbstractAnalyticHelperService.java b/...leonardo/labutilities/qualitylabpro/services/analytics/AbstractAnalyticHelperService.java
@@ -112,7 +112,7 @@ public List<GroupedMeanAndStdByLevelDTO> returnMeanAndStandardDeviationForGroups
 				.toList();
 	}
 
-	@Cacheable(value = "meanAndStdDeviationCache",
+	@Cacheable(value = "meanAndStdDeviation",
 			key = "{#name, #level, #dateStart, #dateEnd, #pageable.pageNumber, #pageable.pageSize}")
 	public MeanAndStdDeviationDTO calculateMeanAndStandardDeviation(String name, String level,
 			LocalDateTime dateStart, LocalDateTime dateEnd, Pageable pageable) {
@@ -213,7 +213,10 @@ public AnalyticsDTO findOneById(Long id) {
 	}
 
 	@Override
-	@CacheEvict(value = "analyticsByNameAndDateRange", allEntries = true)
+	@CacheEvict(
+			value = {"analyticsByNameAndDateRange", "meanAndStdDeviation",
+					"calculateGroupedMeanAndStandardDeviation", "AnalyticsByNameWithPagination"},
+			allEntries = true)
 	public void saveNewAnalyticsRecords(List<AnalyticsDTO> valuesOfLevelsList) {
 
 		var newRecords = valuesOfLevelsList.stream().filter(this::isAnalyticsNonExistent)

diff --git a/...a/leonardo/labutilities/qualitylabpro/services/analytics/BiochemistryAnalyticService.java b/...a/leonardo/labutilities/qualitylabpro/services/analytics/BiochemistryAnalyticService.java
@@ -2,7 +2,6 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -34,8 +33,7 @@ public List<AnalyticsDTO> findAnalyticsByNameAndLevel(Pageable pageable, String
 				this.convertLevel(level));
 	}
 
-	@Cacheable(value = "analyticsByNameLevelAndDate",
-			key = "{#name, #level, #dateStart, #dateEnd, #pageable.pageNumber, #pageable.pageSize}")
+
 	@Override
 	public List<AnalyticsDTO> findAnalyticsByNameAndLevelAndDate(String name, String level,
 			LocalDateTime dateStart, LocalDateTime dateEnd, Pageable pageable) {

diff --git a/...va/leonardo/labutilities/qualitylabpro/services/analytics/CoagulationAnalyticService.java b/...va/leonardo/labutilities/qualitylabpro/services/analytics/CoagulationAnalyticService.java
@@ -2,7 +2,6 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -34,8 +33,7 @@ public List<AnalyticsDTO> findAnalyticsByNameAndLevel(Pageable pageable, String
 				this.convertLevel(level));
 	}
 
-	@Cacheable(value = "analyticsByNameLevelAndDate",
-			key = "{#name, #level, #dateStart, #dateEnd, #pageable.pageNumber, #pageable.pageSize}")
+
 	@Override
 	public List<AnalyticsDTO> findAnalyticsByNameAndLevelAndDate(String name, String level,
 			LocalDateTime dateStart, LocalDateTime dateEnd, Pageable pageable) {

diff --git a/...ava/leonardo/labutilities/qualitylabpro/services/analytics/HematologyAnalyticService.java b/...ava/leonardo/labutilities/qualitylabpro/services/analytics/HematologyAnalyticService.java
@@ -2,7 +2,6 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
@@ -34,8 +33,7 @@ public List<AnalyticsDTO> findAnalyticsByNameAndLevel(Pageable pageable, String
 				this.convertLevel(level));
 	}
 
-	@Cacheable(value = "analyticsByNameLevelAndDate",
-			key = "{#name, #level, #dateStart, #dateEnd, #pageable.pageNumber, #pageable.pageSize}")
+
 	@Override
 	public List<AnalyticsDTO> findAnalyticsByNameAndLevelAndDate(String name, String level,
 			LocalDateTime dateStart, LocalDateTime dateEnd, Pageable pageable) {

diff --git a/src/main/java/leonardo/labutilities/qualitylabpro/services/email/EmailService.java b/src/main/java/leonardo/labutilities/qualitylabpro/services/email/EmailService.java
@@ -24,6 +24,7 @@
 import jakarta.mail.internet.MimeMessage;
 import leonardo.labutilities.qualitylabpro.dtos.analytics.AnalyticsDTO;
 import leonardo.labutilities.qualitylabpro.dtos.email.EmailDTO;
+import leonardo.labutilities.qualitylabpro.utils.exception.CustomGlobalErrorHandling.EmailSendingException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -78,7 +79,7 @@ public void sendHtmlEmailWithoutBcc(EmailDTO emailDTO) {
 
 		} catch (MessagingException e) {
 			log.error("Failed to send HTML identifier: {}", e.getMessage(), e);
-			throw new RuntimeException("Email sending failed", e);
+			throw new EmailSendingException("Email sending failed", e);
 		}
 	}
 
@@ -115,7 +116,7 @@ public void sendHtmlEmail(EmailDTO emailDTO) {
 
 		} catch (MessagingException e) {
 			log.error("Failed to send HTML identifier: {}", e.getMessage(), e);
-			throw new RuntimeException("Email sending failed", e);
+			throw new EmailSendingException("Email sending failed", e);
 		}
 	}
 
@@ -151,7 +152,7 @@ public void sendFailedAnalyticsNotification(List<AnalyticsDTO> failedRecords,
 			log.info("Failed analytics notification sent for {} records", failedRecords.size());
 		} catch (MessagingException e) {
 			log.error("Failed to send analytics notification identifier", e);
-			throw new RuntimeException("Failed to send analytics notification", e);
+			throw new EmailSendingException("Failed to send analytics notification", e);
 		}
 	}