refactor(UtmDataInputStatus, UtmNetworkScan): remove unused relationships and update queries to use source field

Author: mjabascal10

backend/src/main/java/com/park/utmstack/domain/UtmDataInputStatus.java

@@ -35,16 +35,6 @@ public class UtmDataInputStatus implements Serializable {
     @Column(name = "source", length = 256, nullable = false)
     private String source;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "source", referencedColumnName = "asset_name", insertable = false, updatable = false, nullable = false)
-    @JsonIgnore
-    private UtmNetworkScan assetName;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "source", referencedColumnName = "asset_ip", insertable = false, updatable = false, nullable = false)
-    @JsonIgnore
-    private UtmNetworkScan assetIp;
-
     @NotNull
     @Size(max = 50)
     @Column(name = "data_type", length = 50, nullable = false)

backend/src/main/java/com/park/utmstack/domain/network_scan/UtmNetworkScan.java

@@ -140,12 +140,6 @@ public class UtmNetworkScan implements Serializable {
     @OneToMany(mappedBy = "asset", fetch = FetchType.LAZY)
     private List<UtmAssetMetrics> metrics;
 
-    /*@OneToMany(mappedBy = "assetName", fetch = FetchType.LAZY)
-    private List<UtmDataInputStatus> dataInputSourceList;
-
-    @OneToMany(mappedBy = "assetIp", fetch = FetchType.LAZY)
-    private List<UtmDataInputStatus> dataInputIpList;*/
-
     @OneToOne
     @JoinColumn(name = "group_id", referencedColumnName = "id", insertable = false, updatable = false)
     private UtmAssetGroup assetGroup;

backend/src/main/java/com/park/utmstack/repository/network_scan/UtmNetworkScanRepository.java

@@ -56,11 +56,11 @@ public interface UtmNetworkScanRepository extends JpaRepository<UtmNetworkScan,
         "AND ((cast(:initDate as timestamp) is null) or (cast(:endDate as timestamp) is null) or (ns.discoveredAt BETWEEN :initDate AND :endDate)) " +
         "AND (:dataTypes IS NULL OR EXISTS (\n" +
         "       SELECT 1 FROM UtmDataInputStatus ip\n" +
-        "       WHERE ip.assetIp = ns.assetIp AND ip.dataType IN :dataTypes\n" +
+        "       WHERE ip.source = ns.assetIp AND ip.dataType IN :dataTypes\n" +
         "     ) \n" +
         "     OR EXISTS (\n" +
         "       SELECT 1 FROM UtmDataInputStatus src\n" +
-        "       WHERE src.assetName = ns.assetName AND src.dataType IN :dataTypes\n" +
+        "       WHERE src.source = ns.assetName AND src.dataType IN :dataTypes\n" +
         "     ))" +
         "AND (:ports IS NULL OR ns.id IN (" +
         "   SELECT p.scanId FROM UtmPorts p WHERE p.port IN :ports))")