feat(MailService): update alert email methods to use Event type for related logs

Author: mjabascal10

backend/src/main/java/com/park/utmstack/service/MailService.java

@@ -5,6 +5,7 @@
 import com.park.utmstack.domain.application_events.enums.ApplicationEventType;
 import com.park.utmstack.domain.incident.UtmIncident;
 import com.park.utmstack.domain.mail_sender.MailConfig;
+import com.park.utmstack.domain.shared_types.alert.Event;
 import com.park.utmstack.domain.shared_types.alert.UtmAlert;
 import com.park.utmstack.domain.shared_types.LogType;
 import com.park.utmstack.service.application_events.ApplicationEventService;
@@ -250,7 +251,7 @@ public void sendPasswordResetMail(User user) {
     }
 
     @Async
-    public void sendAlertEmail(List<String> emailsTo, UtmAlert alert, List<LogType> relatedLogs) {
+    public void sendAlertEmail(List<String> emailsTo, UtmAlert alert, List<Event> relatedLogs) {
         final String ctx = CLASS_NAME + ".sendAlertEmail";
         try {
             JavaMailSender javaMailSender = getJavaMailSender();
@@ -333,7 +334,7 @@ public void sendIncidentEmail(List<String> emailsTo, List<UtmAlert> alerts, UtmI
      * @throws Exception In case of any error
      */
     private ByteArrayResource buildAlertEmailAttachment(Context context, UtmAlert alert,
-                                                        List<LogType> relatedLogs) throws Exception {
+                                                        List<Event> relatedLogs) throws Exception {
         final String ctx = CLASS_NAME + ".buildAlertEmailAttachment";
         try {
             ByteArrayOutputStream bout = new ByteArrayOutputStream();
@@ -351,9 +352,9 @@ private ByteArrayResource buildAlertEmailAttachment(Context context, UtmAlert al
         }
     }
 
-    private void buildRelatedEventCsvAttachment(List<LogType> relatedLogs, ZipOutputStream zipOut) {
+    private void buildRelatedEventCsvAttachment(List<Event> relatedLogs, ZipOutputStream zipOut) {
         final String ctx = CLASS_NAME + ".buildRelatedEventCsvAttachment";
-        Map<String, List<LogType>> evtTypes = new HashMap<>();
+        Map<String, List<Event>> evtTypes = new HashMap<>();
 
         // Separating event types
         relatedLogs.forEach(doc -> {

backend/src/main/java/com/park/utmstack/service/impl/UtmAlertServiceImpl.java

@@ -79,9 +79,12 @@ public void checkForNewAlerts() {
             UtmAlertLast initialDate = lastAlertRepository.findById(1L)
                     .orElse(new UtmAlertLast(Instant.now().atZone(ZoneOffset.UTC).toInstant().minus(1, ChronoUnit.HOURS)));
 
+            Instant ts = initialDate.getLastAlertTimestamp();
+            String formatted = ts.truncatedTo(ChronoUnit.MILLIS).toString();
+
             List<FilterType> filters = new ArrayList<>();
             filters.add(new FilterType(Constants.alertStatus, OperatorType.IS, AlertStatus.OPEN.getCode()));
-            filters.add(new FilterType(Constants.timestamp, OperatorType.IS_GREATER_THAN, initialDate.getLastAlertTimestamp().toString()));
+            filters.add(new FilterType(Constants.timestamp, OperatorType.IS_GREATER_THAN, formatted));
 
             SearchRequest.Builder srb = new SearchRequest.Builder();
             srb.query(SearchUtil.toQuery(filters))
@@ -105,14 +108,6 @@ public void checkForNewAlerts() {
             lastAlertRepository.save(initialDate);
 
             for (UtmAlert alert : alerts) {
-                List<LogType> relatedLogs;
-                try {
-                    relatedLogs = getRelatedAlerts(alert.getLogs());
-                } catch (Exception e) {
-                    log.error(ctx + ": " + e.getMessage());
-                    continue;
-                }
-
                 String emails = Constants.CFG.get(Constants.PROP_ALERT_ADDRESS_TO_NOTIFY_ALERTS);
 
                 if (!StringUtils.hasText(emails)) {
@@ -123,7 +118,7 @@ public void checkForNewAlerts() {
                 }
 
                 String[] addressToNotify = emails.replace(" ", "").split(",");
-                mailService.sendAlertEmail(Arrays.asList(addressToNotify), alert, relatedLogs);
+                mailService.sendAlertEmail(Arrays.asList(addressToNotify), alert, alert.getEvents());
             }
 
             alertResponseRuleService.evaluateRules(alerts);