feat(alert): enhance UtmAlertResponseRule merging logic and update relationship management

Author: mjabascal10

backend/src/main/java/com/park/utmstack/domain/alert_response_rule/UtmAlertResponseRule.java

@@ -65,8 +65,7 @@ public class UtmAlertResponseRule implements Serializable {
     @OneToMany(mappedBy = "rule", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
     List<UtmAlertResponseRuleExecution> utmAlertResponseRuleExecutions;
 
-
-    @ManyToMany
+    @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
     @JoinTable(
             name = "utm_alert_response_rule_template",
             joinColumns = @JoinColumn(name = "rule_id"),
@@ -109,30 +108,4 @@ public UtmAlertResponseRule(UtmAlertResponseRuleDTO dto) {
         }
     }
 
-    public void mergeInto(UtmAlertResponseRule target) {
-        target.setRuleName(this.getRuleName());
-        target.setRuleDescription(this.getRuleDescription());
-        target.setRuleCmd(this.getRuleCmd());
-        target.setRuleActive(this.getRuleActive());
-        target.setAgentPlatform(this.getAgentPlatform());
-        target.setDefaultAgent(this.getDefaultAgent());
-        target.setExcludedAgents(this.getExcludedAgents());
-        target.setRuleConditions(this.getRuleConditions());
-
-        if (!this.getUtmAlertResponseActionTemplates().isEmpty()) {
-            List<UtmAlertResponseActionTemplate> targetActions = target.getUtmAlertResponseActionTemplates();
-            targetActions.clear();
-            targetActions.addAll(this.getUtmAlertResponseActionTemplates().stream().map(templateDto -> {
-                UtmAlertResponseActionTemplate template = new UtmAlertResponseActionTemplate();
-                template.setId(templateDto.getId());
-                template.setTitle(templateDto.getTitle());
-                template.setDescription(templateDto.getDescription());
-                template.setCommand(templateDto.getCommand());
-                return template;
-            }).collect(Collectors.toList()));
-        }
-
-    }
-
-
 }

backend/src/main/java/com/park/utmstack/service/alert_response_rule/UtmAlertResponseRuleService.java

@@ -32,6 +32,7 @@
 import com.park.utmstack.util.UtilJson;
 import com.park.utmstack.util.exceptions.UtmNotImplementedException;
 import io.grpc.stub.StreamObserver;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Async;
@@ -49,6 +50,7 @@
 import java.util.stream.Collectors;
 
 @Service
+@RequiredArgsConstructor
 @Transactional
 public class UtmAlertResponseRuleService {
 
@@ -64,30 +66,9 @@ public class UtmAlertResponseRuleService {
     private final UtmAlertResponseRuleExecutionRepository alertResponseRuleExecutionRepository;
     private final UtmIncidentVariableService utmIncidentVariableService;
     private final UtmAlertResponseActionTemplateRepository utmAlertResponseActionTemplateRepository;
-
     private final UtmAlertResponseActionTemplateService utmAlertResponseActionTemplateService;
 
-    public UtmAlertResponseRuleService(UtmAlertResponseRuleRepository alertResponseRuleRepository,
-                                       UtmAlertResponseRuleHistoryRepository alertResponseRuleHistoryRepository,
-                                       UtmNetworkScanRepository networkScanRepository,
-                                       ApplicationEventService eventService,
-                                       AgentService agentService,
-                                       IncidentResponseCommandService incidentResponseCommandService,
-                                       UtmAlertResponseRuleExecutionRepository alertResponseRuleExecutionRepository,
-                                       UtmIncidentVariableService utmIncidentVariableService,
-                                       UtmAlertResponseActionTemplateRepository utmAlertResponseActionTemplateRepository,
-                                       UtmAlertResponseActionTemplateService utmAlertResponseActionTemplateService) {
-        this.alertResponseRuleRepository = alertResponseRuleRepository;
-        this.alertResponseRuleHistoryRepository = alertResponseRuleHistoryRepository;
-        this.networkScanRepository = networkScanRepository;
-        this.eventService = eventService;
-        this.agentService = agentService;
-        this.incidentResponseCommandService = incidentResponseCommandService;
-        this.alertResponseRuleExecutionRepository = alertResponseRuleExecutionRepository;
-        this.utmIncidentVariableService = utmIncidentVariableService;
-        this.utmAlertResponseActionTemplateRepository = utmAlertResponseActionTemplateRepository;
-        this.utmAlertResponseActionTemplateService = utmAlertResponseActionTemplateService;
-    }
+
 
     public UtmAlertResponseRule save(UtmAlertResponseRule alertResponseRule) {
         final String ctx = CLASSNAME + ".save";
@@ -96,19 +77,11 @@ public UtmAlertResponseRule save(UtmAlertResponseRule alertResponseRule) {
                 String alertRuleId = String.valueOf(alertResponseRule.getId());
                 UtmAlertResponseRule current = alertResponseRuleRepository.findById(alertResponseRule.getId())
                         .orElseThrow(() -> new RuntimeException(String.format("Incident response rule with ID: %1$s not found", alertRuleId)));
-                alertResponseRule.mergeInto(current);
+                this.mergeInto(current, alertResponseRule);
                 alertResponseRuleHistoryRepository.save(new UtmAlertResponseRuleHistory(new UtmAlertResponseRuleDTO(alertResponseRule)));
                 alertResponseRule = current;
             }
 
-            if (alertResponseRule.getUtmAlertResponseActionTemplates() != null) {
-                for (UtmAlertResponseActionTemplate action : alertResponseRule.getUtmAlertResponseActionTemplates()) {
-                    if (action.getId() == null || !utmAlertResponseActionTemplateRepository.existsById(action.getId())) {
-                        utmAlertResponseActionTemplateService.save(action);
-                    }
-                }
-            }
-
             return alertResponseRuleRepository.save(alertResponseRule);
         } catch (Exception e) {
             throw new RuntimeException(ctx + ": " + e.getLocalizedMessage());
@@ -347,4 +320,41 @@ public void onCompleted() {
             log.error(msg);
         }
     }
+
+    public void mergeInto(UtmAlertResponseRule target, UtmAlertResponseRule source) {
+        target.setRuleName(source.getRuleName());
+        target.setRuleDescription(source.getRuleDescription());
+        target.setRuleCmd(source.getRuleCmd());
+        target.setRuleActive(source.getRuleActive());
+        target.setAgentPlatform(source.getAgentPlatform());
+        target.setDefaultAgent(source.getDefaultAgent());
+        target.setExcludedAgents(source.getExcludedAgents());
+        target.setRuleConditions(source.getRuleConditions());
+
+        target.getUtmAlertResponseActionTemplates().clear();
+
+        if (!source.getUtmAlertResponseActionTemplates().isEmpty()) {
+            List<UtmAlertResponseActionTemplate> managedTemplates = source.getUtmAlertResponseActionTemplates()
+                    .stream()
+                    .map(t -> {
+                        if (t.getId() != null) {
+                            UtmAlertResponseActionTemplate existing = utmAlertResponseActionTemplateRepository.findById(t.getId())
+                                    .orElseThrow(() -> new RuntimeException("Template not found: " + t.getId()));
+                            existing.setTitle(t.getTitle());
+                            existing.setDescription(t.getDescription());
+                            existing.setCommand(t.getCommand());
+                            return existing;
+                        } else {
+                            UtmAlertResponseActionTemplate newT = new UtmAlertResponseActionTemplate();
+                            newT.setTitle(t.getTitle());
+                            newT.setDescription(t.getDescription());
+                            newT.setCommand(t.getCommand());
+                            return utmAlertResponseActionTemplateService.save(newT);
+                        }
+                    })
+                    .collect(Collectors.toList());
+
+            target.getUtmAlertResponseActionTemplates().addAll(managedTemplates);
+        }
+    }
 }