diff --git a/src/main/java/com/loafle/overflow/module/sensor/dao/SensorDAO.java b/src/main/java/com/loafle/overflow/module/sensor/dao/SensorDAO.java index 08a06d2..faa2d1f 100644 --- a/src/main/java/com/loafle/overflow/module/sensor/dao/SensorDAO.java +++ b/src/main/java/com/loafle/overflow/module/sensor/dao/SensorDAO.java @@ -15,10 +15,12 @@ import java.util.List; */ @Repository public interface SensorDAO extends JpaRepository { + + List findAllByTarget(Target target); @Query("SELECT s from Sensor s WHERE s.target in (:targetList)") - List findAllByTarget(@Param("targetList") List targetList); + List findAllByTargetList(@Param("targetList") List targetList); // List findAllByTargetList(List targets); } diff --git a/src/main/java/com/loafle/overflow/module/sensor/service/SensorService.java b/src/main/java/com/loafle/overflow/module/sensor/service/SensorService.java index 9d85c15..126c584 100644 --- a/src/main/java/com/loafle/overflow/module/sensor/service/SensorService.java +++ b/src/main/java/com/loafle/overflow/module/sensor/service/SensorService.java @@ -9,11 +9,9 @@ import com.loafle.overflow.module.probe.service.ProbeService; import com.loafle.overflow.module.sensor.dao.SensorDAO; import com.loafle.overflow.module.sensor.model.Sensor; import com.loafle.overflow.module.target.model.Target; -import com.loafle.overflow.module.target.service.TargetService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; /** @@ -45,8 +43,18 @@ public class SensorService { List targetList = this.infraService.readAllTargetByProbeList(probeList); - return this.sensorDAO.findAllByTarget(targetList); + return this.sensorDAO.findAllByTargetList(targetList); } + + public List readAllByInfra(Infra infra) { + Infra dbInfra = this.infraService.read(infra.getId()); + + if(dbInfra == null || dbInfra.getTarget() == null) return null; + + return this.sensorDAO.findAllByTarget(dbInfra.getTarget()); + + } + public Sensor read(String id) { return this.sensorDAO.findOne(Long.valueOf(id)); } diff --git a/src/test/java/com/loafle/overflow/module/sensor/service/SensorServiceTest.java b/src/test/java/com/loafle/overflow/module/sensor/service/SensorServiceTest.java index be90c1a..dc02c22 100644 --- a/src/test/java/com/loafle/overflow/module/sensor/service/SensorServiceTest.java +++ b/src/test/java/com/loafle/overflow/module/sensor/service/SensorServiceTest.java @@ -1,11 +1,10 @@ package com.loafle.overflow.module.sensor.service; import com.loafle.overflow.module.domain.model.Domain; -import com.loafle.overflow.module.infra.service.InfraService; +import com.loafle.overflow.module.infra.model.Infra; +import com.loafle.overflow.module.infra.model.InfraMachine; import com.loafle.overflow.module.meta.model.MetaCrawler; import com.loafle.overflow.module.meta.model.MetaSensorStatus; -import com.loafle.overflow.module.probe.model.Probe; -import com.loafle.overflow.module.probe.service.ProbeService; import com.loafle.overflow.module.sensor.model.Sensor; import com.loafle.overflow.module.target.model.Target; import com.loafle.overflow.spring.AppConfigTest; @@ -87,4 +86,16 @@ public class SensorServiceTest { Assert.assertNotEquals(sl.size(), 0); } + + @Test + public void readAllByInfra() { + + Infra infra = new InfraMachine(); + infra.setId(1); + + List sl = this.sensorService.readAllByInfra(infra); + + Assert.assertNotEquals(sl.size(), 0); + + } }