feat(alert): refactor UtmAlertResponseActionTemplate and UtmAlertResponseRule for improved relationship management and add merge functionality

Author: mjabascal10

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

@@ -41,14 +41,7 @@ public class UtmAlertResponseActionTemplate implements Serializable {
     @Column(name = "system_owner", nullable = false)
     private Boolean systemOwner;
 
-    @ManyToMany
-    @JoinTable(
-            name = "utm_alert_response_rule_template",
-            joinColumns = @JoinColumn(name = "rule_id"),
-            inverseJoinColumns = @JoinColumn(name = "template_id")
-    )
-    private List<UtmAlertResponseActionTemplate> utmAlertResponseActionTemplates = new ArrayList<>();
-
-
+    @ManyToMany(mappedBy = "utmAlertResponseActionTemplates")
+    private List<UtmAlertResponseRule> utmAlertResponseRules = new ArrayList<>();
 }
 

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

@@ -109,4 +109,30 @@ 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

@@ -93,9 +93,12 @@ public UtmAlertResponseRule save(UtmAlertResponseRule alertResponseRule) {
         final String ctx = CLASSNAME + ".save";
         try {
             if (alertResponseRule.getId() != null) {
+                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", alertResponseRule.getId())));
-                alertResponseRuleHistoryRepository.save(new UtmAlertResponseRuleHistory(new UtmAlertResponseRuleDTO(current)));
+                        .orElseThrow(() -> new RuntimeException(String.format("Incident response rule with ID: %1$s not found", alertRuleId)));
+                alertResponseRule.mergeInto(current);
+                alertResponseRuleHistoryRepository.save(new UtmAlertResponseRuleHistory(new UtmAlertResponseRuleDTO(alertResponseRule)));
+                alertResponseRule = current;
             }
 
             if (alertResponseRule.getUtmAlertResponseActionTemplates() != null) {

backend/src/main/java/com/park/utmstack/service/dto/UtmAlertResponseRuleDTO.java

@@ -3,10 +3,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import com.park.utmstack.domain.alert_response_rule.UtmAlertResponseActionTemplate;
 import com.park.utmstack.domain.alert_response_rule.UtmAlertResponseRule;
 import com.park.utmstack.domain.chart_builder.types.query.FilterType;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import javax.validation.constraints.*;
@@ -95,4 +97,5 @@ public UtmAlertResponseRuleDTO(UtmAlertResponseRule rule) {
         }
 
     }
+
 }