added

Sensor series

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<Sensor> implements SensorDao {
 
-    public List<Sensor> findAllByAgentID(Agent agent) {
+    public List<Sensor> findAllByTargetId(Target target) {
-        Query query = getEntityManager().createNativeQuery("SELECT s.* FROM Sensor s WHERE s.TARGET_ID = :memberId", Sensor.class);
+        Query query = getEntityManager().createNativeQuery("SELECT s.* FROM Sensor s WHERE s.TARGET_ID = :targetId", Sensor.class);
-        query.setParameter("memberId", agent.getMember().getId());
+        query.setParameter("targetId", target.getId());
 
         List<Sensor> sensors = null;
         try {

src/main/java/com/loafle/overflow/sensor/dao/JPASensorItemDao.java

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public class JPASensorItemDao extends JPABaseDAO<SensorItem> implements SensorItemDao {
 
-    public List<SensorItem> findAllByCrawlerID(Crawler crawler) {
+    public List<SensorItem> findAllByCrawlerId(Crawler crawler) {
 
         Query query = getEntityManager().createNativeQuery("SELECT si.* FROM SensorItem si WHERE si.CRAWLER_ID = :crawlerId", SensorItem.class);
         query.setParameter("crawlerId", crawler.getId());

src/main/java/com/loafle/overflow/sensor/dao/JPASensorItemMappingDao.java

@@ -12,7 +12,7 @@ import java.util.List;
  */
 public class JPASensorItemMappingDao extends JPABaseDAO<SensorItemMapping> implements SensorItemMappingDao {
 
-    public List<SensorItemMapping> findAllBySensorID(Sensor sensor) {
+    public List<SensorItemMapping> findAllBySensorId(Sensor sensor) {
 
         Query query = getEntityManager().createNativeQuery("SELECT sim.* FROM SensorItemMapping sim WHERE sim.SENSOR_ID = :sensorId", SensorItemMapping.class);
         query.setParameter("sensorId", sensor.getId());

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<Sensor> {
 
-    List<Sensor> findAllByAgentID(Agent agent);
+    List<Sensor> findAllByTargetId(Target target);
 }

src/main/java/com/loafle/overflow/sensor/dao/SensorItemDao.java

@@ -12,5 +12,5 @@ import java.util.List;
  */
 public interface SensorItemDao extends BaseDAO<SensorItem>{
 
-    List<SensorItem> findAllByCrawlerID(Crawler crawler);
+    List<SensorItem> findAllByCrawlerId(Crawler crawler);
 }

src/main/java/com/loafle/overflow/sensor/dao/SensorItemMappingDao.java

@@ -11,6 +11,6 @@ import java.util.List;
  */
 public interface SensorItemMappingDao extends BaseDAO<SensorItemMapping> {
 
-    List<SensorItemMapping> findAllBySensorID(Sensor sensor);
+    List<SensorItemMapping> findAllBySensorId(Sensor sensor);
 
 }

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() {
 

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() {
 

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() {
 

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() {