feat(alert): refactor AlertType and related classes for improved structure and clarity

Author: mjabascal10

backend/src/main/java/com/park/utmstack/aop/logging/AlertLoggingAspect.java

@@ -5,7 +5,7 @@
 import com.park.utmstack.domain.chart_builder.types.query.FilterType;
 import com.park.utmstack.domain.chart_builder.types.query.OperatorType;
 import com.park.utmstack.domain.index_pattern.enums.SystemIndexPattern;
-import com.park.utmstack.domain.shared_types.AlertType;
+import com.park.utmstack.domain.shared_types.alert.AlertType;
 import com.park.utmstack.security.SecurityUtils;
 import com.park.utmstack.service.UtmAlertLogService;
 import com.park.utmstack.service.elasticsearch.ElasticsearchService;

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

@@ -62,6 +62,10 @@ public class UtmAlertResponseRule implements Serializable {
     @Column(name = "last_modified_date")
     private Instant lastModifiedDate;
 
+    @OneToMany(mappedBy = "rule", fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
+    List<UtmAlertResponseRuleExecution> utmAlertResponseRuleExecutions;
+
+
     @ManyToMany
     @JoinTable(
             name = "utm_alert_response_rule_template",

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

@@ -3,6 +3,7 @@
 
 import com.park.utmstack.domain.alert_response_rule.enums.RuleExecutionStatus;
 import com.park.utmstack.domain.alert_response_rule.enums.RuleNonExecutionCause;
+import lombok.Data;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
@@ -14,6 +15,7 @@
 
 @Entity
 @Table(name = "utm_alert_response_rule_execution")
+@Data
 @EntityListeners(AuditingEntityListener.class)
 public class UtmAlertResponseRuleExecution implements Serializable {
 
@@ -61,84 +63,8 @@ public class UtmAlertResponseRuleExecution implements Serializable {
     @Column(name = "execution_retries")
     private Integer executionRetries = 0;
 
+    @ManyToOne
+    @JoinColumn(name = "rule_id", referencedColumnName = "id", insertable = false, updatable = false)
+    UtmAlertResponseRule rule;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getRuleId() {
-        return ruleId;
-    }
-
-    public void setRuleId(Long ruleId) {
-        this.ruleId = ruleId;
-    }
-
-    public String getAlertId() {
-        return alertId;
-    }
-
-    public void setAlertId(String alertId) {
-        this.alertId = alertId;
-    }
-
-    public String getCommand() {
-        return command;
-    }
-
-    public void setCommand(String command) {
-        this.command = command;
-    }
-
-    public String getCommandResult() {
-        return commandResult;
-    }
-
-    public void setCommandResult(String commandResult) {
-        this.commandResult = commandResult;
-    }
-
-    public String getAgent() {
-        return agent;
-    }
-
-    public void setAgent(String agent) {
-        this.agent = agent;
-    }
-
-    public Instant getExecutionDate() {
-        return executionDate;
-    }
-
-    public void setExecutionDate(Instant executionDate) {
-        this.executionDate = executionDate;
-    }
-
-    public RuleExecutionStatus getExecutionStatus() {
-        return executionStatus;
-    }
-
-    public void setExecutionStatus(RuleExecutionStatus executionStatus) {
-        this.executionStatus = executionStatus;
-    }
-
-    public RuleNonExecutionCause getNonExecutionCause() {
-        return nonExecutionCause;
-    }
-
-    public void setNonExecutionCause(RuleNonExecutionCause nonExecutionCause) {
-        this.nonExecutionCause = nonExecutionCause;
-    }
-
-    public Integer getExecutionRetries() {
-        return executionRetries;
-    }
-
-    public void setExecutionRetries(Integer executionRetries) {
-        this.executionRetries = executionRetries;
-    }
 }

backend/src/main/java/com/park/utmstack/domain/reports/types/IncidentType.java

@@ -1,7 +1,7 @@
 package com.park.utmstack.domain.reports.types;
 
 import com.park.utmstack.domain.incident_response.UtmIncidentJob;
-import com.park.utmstack.domain.shared_types.AlertType;
+import com.park.utmstack.domain.shared_types.alert.AlertType;
 
 import java.util.List;