feat: refactor UtmLogstashPipeline class to use Lombok annotations and improve default value handling

Author: mjabascal10

backend/src/main/java/com/park/utmstack/domain/logstash_pipeline/UtmLogstashPipeline.java

@@ -1,17 +1,22 @@
 package com.park.utmstack.domain.logstash_pipeline;
 
+import com.park.utmstack.domain.application_modules.UtmModule;
 import com.park.utmstack.service.logstash_pipeline.enums.PipelineStatus;
+import lombok.*;
+
 import org.hibernate.annotations.GenericGenerator;
 
 import javax.persistence.*;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 
-/**
- * A UtmLogstashPipeline.
- */
 @Entity
 @Table(name = "utm_logstash_pipeline")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class UtmLogstashPipeline implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -48,103 +53,14 @@ public class UtmLogstashPipeline implements Serializable {
     @Column(name = "events_out")
     private Long eventsOut;
 
+    @OneToOne
+    @JoinColumn(name = "module_name", referencedColumnName = "module_name", insertable = false, updatable = false)
+    private UtmModule utmModule;
 
-    public UtmLogstashPipeline(){}
-    public UtmLogstashPipeline(Long id, String pipelineId,
-                               String pipelineName,
-                               String pipelineStatus,
-                               String moduleName,
-                               Boolean systemOwner,
-                               String pipelineDescription,
-                               Boolean pipelineInternal,
-                               Long eventsOut) {
-        this.id = id;
-        this.pipelineId = pipelineId;
-        this.pipelineName = pipelineName;
-        this.pipelineStatus = pipelineStatus;
-        this.moduleName = moduleName;
-        this.systemOwner = systemOwner;
-        this.pipelineDescription = pipelineDescription;
-        this.pipelineInternal = pipelineInternal==null?false:pipelineInternal;
-        this.eventsOut = eventsOut==null?0L:eventsOut;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getPipelineId() {
-        return pipelineId;
-    }
-
-    public void setPipelineId(String pipelineId) {
-        this.pipelineId = pipelineId;
-    }
-
-    public String getPipelineName() {
-        return pipelineName;
-    }
-
-    public void setPipelineName(String pipelineName) {
-        this.pipelineName = pipelineName;
-    }
-
-    public String getPipelineStatus() {
-        return pipelineStatus;
-    }
-
-    public void setPipelineStatus(String pipelineStatus) {
-        this.pipelineStatus = pipelineStatus;
-    }
-
-    public String getModuleName() {
-        return moduleName;
-    }
-
-    public void setModuleName(String moduleName) {
-        this.moduleName = moduleName;
-    }
-
-    public Boolean getSystemOwner() {
-        return systemOwner;
-    }
-
-    public void setSystemOwner(Boolean systemOwner) {
-        this.systemOwner = systemOwner;
-    }
-
-    public String getPipelineDescription() {
-        return pipelineDescription;
-    }
-
-    public void setPipelineDescription(String pipelineDescription) {
-        this.pipelineDescription = pipelineDescription;
-    }
-
-    public Boolean getPipelineInternal() {
-        return pipelineInternal;
-    }
-
-    public void setPipelineInternal(Boolean pipelineInternal) {
-        this.pipelineInternal = pipelineInternal;
-    }
-
-    public Long getEventsOut() {
-        return eventsOut;
-    }
-
-    public void setEventsOut(Long eventsOut) {
-        this.eventsOut = eventsOut;
-    }
-
-    public void setDefaults(){
+    public void setDefaults() {
         this.systemOwner = false;
-        this.pipelineInternal = this.pipelineInternal==null?false:this.pipelineInternal;
-        this.eventsOut = this.eventsOut==null?0L:this.eventsOut;
+        this.pipelineInternal = this.pipelineInternal == null ? false : this.pipelineInternal;
+        this.eventsOut = this.eventsOut == null ? 0L : this.eventsOut;
         this.pipelineStatus = PipelineStatus.PIPELINE_STATUS_DOWN.get();
     }
 }

backend/src/main/java/com/park/utmstack/service/dto/logstash_pipeline/UtmLogstashPipelineDTO.java

@@ -55,7 +55,10 @@ public UtmLogstashPipelineDTO(UtmLogstashPipeline pipeline) {
 
     @JsonIgnore
     public UtmLogstashPipeline getPipeline(UtmLogstashPipeline utmLogstashPipeline) {
-        if (utmLogstashPipeline==null) utmLogstashPipeline = new UtmLogstashPipeline();
+        if (utmLogstashPipeline==null){
+            utmLogstashPipeline = new UtmLogstashPipeline();
+            utmLogstashPipeline.setDefaults();
+        }
         utmLogstashPipeline.setId(this.getId());
         utmLogstashPipeline.setPipelineName(this.getPipelineName());
         utmLogstashPipeline.setModuleName(this.getModuleName());

backend/src/main/java/com/park/utmstack/service/logstash_pipeline/UtmLogstashPipelineService.java

@@ -43,6 +43,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
+import javax.sql.DataSource;
 import java.time.Duration;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
@@ -70,13 +71,15 @@ public class UtmLogstashPipelineService {
     private final ElasticsearchService elasticsearchService;
 
     private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    private final DataSource dataSource;
 
-    public UtmLogstashPipelineService(UtmLogstashPipelineRepository utmLogstashPipelineRepository, RestTemplateService restTemplateService, UtmGroupLogstashPipelineFiltersRepository utmGroupLogstashPipelineFiltersRepository, UtmLogstashFilterRepository utmLogstashFilterRepository, OpensearchClientBuilder client, ElasticsearchService elasticsearchService) {
+    public UtmLogstashPipelineService(UtmLogstashPipelineRepository utmLogstashPipelineRepository, RestTemplateService restTemplateService, UtmGroupLogstashPipelineFiltersRepository utmGroupLogstashPipelineFiltersRepository, UtmLogstashFilterRepository utmLogstashFilterRepository, OpensearchClientBuilder client, ElasticsearchService elasticsearchService, DataSource dataSource) {
         this.utmLogstashPipelineRepository = utmLogstashPipelineRepository;
         this.restTemplateService = restTemplateService;
         this.utmGroupLogstashPipelineFiltersRepository = utmGroupLogstashPipelineFiltersRepository;
         this.utmLogstashFilterRepository = utmLogstashFilterRepository;
         this.elasticsearchService = elasticsearchService;
+        this.dataSource = dataSource;
     }
 
     /**
@@ -326,7 +329,13 @@ public void pipelineStatus() {
 
         try {
             activeByServer.forEach((p) -> {
-                StatisticDocument pipeLine = this.getStatisticsDataType(Constants.STATISTICS_INDEX_PATTERN, p.getPipelineName());
+                String dataType = p.getPipelineName();
+                Set<UtmLogstashFilter> filters = p.getUtmModule() != null ? p.getUtmModule().getFilters() : null;
+                dataType = Optional.ofNullable(filters)
+                        .flatMap(fs -> fs.stream().findFirst())
+                        .map(f -> f.getDatatype().getDataType())
+                        .orElse(dataType);
+                StatisticDocument pipeLine = this.getStatisticsDataType(Constants.STATISTICS_INDEX_PATTERN, dataType);
 
                 if (!Objects.isNull(pipeLine)) {
                     p.setEventsOut(pipeLine.getCount());

backend/src/main/java/com/park/utmstack/web/rest/logstash_pipeline/UtmLogstashPipelineResource.java

@@ -12,6 +12,7 @@
 import com.park.utmstack.web.rest.errors.BadRequestAlertException;
 import com.park.utmstack.web.rest.util.HeaderUtil;
 import com.park.utmstack.web.rest.vm.UtmLogstashPipelineVM;
+import io.swagger.v3.oas.annotations.Hidden;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springdoc.api.annotations.ParameterObject;
@@ -33,6 +34,7 @@
  * REST controller for managing {@link UtmLogstashPipeline}.
  */
 @RestController
+@Hidden
 @RequestMapping("/api")
 public class UtmLogstashPipelineResource {