diff --git a/src/main/java/com/loafle/overflow/sensor/dao/JPASensorDao.java b/src/main/java/com/loafle/overflow/sensor/dao/JPASensorDao.java index 4cc1324..269212a 100644 --- a/src/main/java/com/loafle/overflow/sensor/dao/JPASensorDao.java +++ b/src/main/java/com/loafle/overflow/sensor/dao/JPASensorDao.java @@ -1,8 +1,9 @@ package com.loafle.overflow.sensor.dao; -import com.loafle.overflow.agent.model.Agent; + import com.loafle.overflow.commons.dao.JPABaseDAO; import com.loafle.overflow.sensor.model.Sensor; +import com.loafle.overflow.target.model.Target; import javax.persistence.Query; import java.util.List; @@ -12,9 +13,9 @@ import java.util.List; */ public class JPASensorDao extends JPABaseDAO implements SensorDao { - public List findAllByAgentID(Agent agent) { - Query query = getEntityManager().createNativeQuery("SELECT s.* FROM Sensor s WHERE s.TARGET_ID = :memberId", Sensor.class); - query.setParameter("memberId", agent.getMember().getId()); + public List findAllByTargetId(Target target) { + Query query = getEntityManager().createNativeQuery("SELECT s.* FROM Sensor s WHERE s.TARGET_ID = :targetId", Sensor.class); + query.setParameter("targetId", target.getId()); List sensors = null; try { diff --git a/src/main/java/com/loafle/overflow/sensor/dao/JPASensorItemDao.java b/src/main/java/com/loafle/overflow/sensor/dao/JPASensorItemDao.java index d71d4df..881fda1 100644 --- a/src/main/java/com/loafle/overflow/sensor/dao/JPASensorItemDao.java +++ b/src/main/java/com/loafle/overflow/sensor/dao/JPASensorItemDao.java @@ -13,7 +13,7 @@ import java.util.List; */ public class JPASensorItemDao extends JPABaseDAO implements SensorItemDao { - public List findAllByCrawlerID(Crawler crawler) { + public List findAllByCrawlerId(Crawler crawler) { Query query = getEntityManager().createNativeQuery("SELECT si.* FROM SensorItem si WHERE si.CRAWLER_ID = :crawlerId", SensorItem.class); query.setParameter("crawlerId", crawler.getId()); diff --git a/src/main/java/com/loafle/overflow/sensor/dao/JPASensorItemMappingDao.java b/src/main/java/com/loafle/overflow/sensor/dao/JPASensorItemMappingDao.java index cc92bbf..b1be7d1 100644 --- a/src/main/java/com/loafle/overflow/sensor/dao/JPASensorItemMappingDao.java +++ b/src/main/java/com/loafle/overflow/sensor/dao/JPASensorItemMappingDao.java @@ -12,7 +12,7 @@ import java.util.List; */ public class JPASensorItemMappingDao extends JPABaseDAO implements SensorItemMappingDao { - public List findAllBySensorID(Sensor sensor) { + public List findAllBySensorId(Sensor sensor) { Query query = getEntityManager().createNativeQuery("SELECT sim.* FROM SensorItemMapping sim WHERE sim.SENSOR_ID = :sensorId", SensorItemMapping.class); query.setParameter("sensorId", sensor.getId()); diff --git a/src/main/java/com/loafle/overflow/sensor/dao/SensorDao.java b/src/main/java/com/loafle/overflow/sensor/dao/SensorDao.java index 5f8d699..61e9ec0 100644 --- a/src/main/java/com/loafle/overflow/sensor/dao/SensorDao.java +++ b/src/main/java/com/loafle/overflow/sensor/dao/SensorDao.java @@ -1,8 +1,9 @@ package com.loafle.overflow.sensor.dao; -import com.loafle.overflow.agent.model.Agent; + import com.loafle.overflow.commons.dao.BaseDAO; import com.loafle.overflow.sensor.model.Sensor; +import com.loafle.overflow.target.model.Target; import java.util.List; @@ -11,5 +12,5 @@ import java.util.List; */ public interface SensorDao extends BaseDAO { - List findAllByAgentID(Agent agent); + List findAllByTargetId(Target target); } diff --git a/src/main/java/com/loafle/overflow/sensor/dao/SensorItemDao.java b/src/main/java/com/loafle/overflow/sensor/dao/SensorItemDao.java index 08c55fa..96c822c 100644 --- a/src/main/java/com/loafle/overflow/sensor/dao/SensorItemDao.java +++ b/src/main/java/com/loafle/overflow/sensor/dao/SensorItemDao.java @@ -12,5 +12,5 @@ import java.util.List; */ public interface SensorItemDao extends BaseDAO{ - List findAllByCrawlerID(Crawler crawler); + List findAllByCrawlerId(Crawler crawler); } diff --git a/src/main/java/com/loafle/overflow/sensor/dao/SensorItemMappingDao.java b/src/main/java/com/loafle/overflow/sensor/dao/SensorItemMappingDao.java index 3bb3712..c1a5b75 100644 --- a/src/main/java/com/loafle/overflow/sensor/dao/SensorItemMappingDao.java +++ b/src/main/java/com/loafle/overflow/sensor/dao/SensorItemMappingDao.java @@ -11,6 +11,6 @@ import java.util.List; */ public interface SensorItemMappingDao extends BaseDAO { - List findAllBySensorID(Sensor sensor); + List findAllBySensorId(Sensor sensor); } diff --git a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorDaoTest.java b/src/test/java/com/loafle/overflow/sensor/dao/JPASensorDaoTest.java index 993bb99..03e385c 100644 --- a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorDaoTest.java +++ b/src/test/java/com/loafle/overflow/sensor/dao/JPASensorDaoTest.java @@ -4,6 +4,7 @@ import com.loafle.overflow.crawler.model.Crawler; import com.loafle.overflow.sensor.model.Sensor; import com.loafle.overflow.target.model.Target; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.*; @@ -25,6 +26,7 @@ public class JPASensorDaoTest { } + @Ignore @Test public void create() { diff --git a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemCategoryDaoTest.java b/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemCategoryDaoTest.java index 4ad3f98..e0a52e2 100644 --- a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemCategoryDaoTest.java +++ b/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemCategoryDaoTest.java @@ -2,6 +2,7 @@ package com.loafle.overflow.sensor.dao; import com.loafle.overflow.sensor.model.SensorItemCategory; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.*; @@ -20,6 +21,7 @@ public class JPASensorItemCategoryDaoTest { } + @Ignore @Test public void create() { diff --git a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemDaoTest.java b/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemDaoTest.java index bd4da1e..906a1de 100644 --- a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemDaoTest.java +++ b/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemDaoTest.java @@ -4,6 +4,7 @@ import com.loafle.overflow.crawler.model.Crawler; import com.loafle.overflow.sensor.model.SensorItem; import com.loafle.overflow.sensor.model.SensorItemCategory; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import java.util.List; @@ -22,6 +23,7 @@ public class JPASensorItemDaoTest { this.sensorItemDao = new JPASensorItemDao(); } + @Ignore @Test public void create() { @@ -44,6 +46,7 @@ public class JPASensorItemDaoTest { } + @Ignore @Test public void list() { diff --git a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemMappingDaoTest.java b/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemMappingDaoTest.java index 7d52445..6e2f1cc 100644 --- a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemMappingDaoTest.java +++ b/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemMappingDaoTest.java @@ -4,6 +4,7 @@ import com.loafle.overflow.sensor.model.Sensor; import com.loafle.overflow.sensor.model.SensorItem; import com.loafle.overflow.sensor.model.SensorItemMapping; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import java.util.List; @@ -23,6 +24,7 @@ public class JPASensorItemMappingDaoTest { } + @Ignore @Test public void create() {