diff --git a/src/main/java/com/loafle/overflow/module/history/dao/HistoryDAO.java b/src/main/java/com/loafle/overflow/module/history/dao/HistoryDAO.java index 24d4842..79df861 100644 --- a/src/main/java/com/loafle/overflow/module/history/dao/HistoryDAO.java +++ b/src/main/java/com/loafle/overflow/module/history/dao/HistoryDAO.java @@ -23,5 +23,5 @@ public interface HistoryDAO extends JpaRepository { Page findAllByProbe(Probe probe, Pageable pageable); @Query("SELECT h FROM History h WHERE h.probe.id = :#{#probe.id} and h.type.id = :#{#type.id}") - List findAllByProbeAndType(@Param("probe") Probe probe, @Param("type") MetaHistoryType type); + Page findAllByProbeAndType(@Param("probe") Probe probe, @Param("type") MetaHistoryType type, Pageable pageable); } diff --git a/src/main/java/com/loafle/overflow/module/history/service/HistoryService.java b/src/main/java/com/loafle/overflow/module/history/service/HistoryService.java index 8200d55..75da08d 100644 --- a/src/main/java/com/loafle/overflow/module/history/service/HistoryService.java +++ b/src/main/java/com/loafle/overflow/module/history/service/HistoryService.java @@ -11,8 +11,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; -import java.util.List; - @Service("HistoryService") public class HistoryService { @@ -27,8 +25,10 @@ public class HistoryService { // return this.historyDAO.findAllByProbeOrderByIdDesc(probe); // } - public List readAllByProbeAndType(Probe probe, MetaHistoryType type) { - return this.historyDAO.findAllByProbeAndType(probe, type); + public Page readAllByProbeAndType(Probe probe, MetaHistoryType type, int pageNo, int countPerPage) { + Pageable pageRequest = + new PageRequest(pageNo, countPerPage, new Sort(Sort.Direction.DESC, "id")); + return this.historyDAO.findAllByProbeAndType(probe, type, pageRequest); } public Page readAllByProbe(Probe probe, int pageNo, int countPerPage) { diff --git a/src/test/java/com/loafle/overflow/module/history/service/HistoryServiceTest.java b/src/test/java/com/loafle/overflow/module/history/service/HistoryServiceTest.java index b62da4d..cc443ba 100644 --- a/src/test/java/com/loafle/overflow/module/history/service/HistoryServiceTest.java +++ b/src/test/java/com/loafle/overflow/module/history/service/HistoryServiceTest.java @@ -5,7 +5,6 @@ import com.loafle.overflow.module.member.model.Member; import com.loafle.overflow.module.meta.model.MetaHistoryType; import com.loafle.overflow.module.probe.model.Probe; import com.loafle.overflow.spring.AppConfigTest; -import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -13,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import java.util.List; import java.util.Random; /** @@ -42,12 +40,12 @@ public class HistoryServiceTest { } - @Test - @Ignore - public void readAllByProbeAndType() { - List result = this.historyService.readAllByProbeAndType(new Probe(1), new MetaHistoryType(1)); - Assert.assertNotNull(result); - } +// @Test +// @Ignore +// public void readAllByProbeAndType() { +// List result = this.historyService.readAllByProbeAndType(new Probe(1), new MetaHistoryType(1)); +// Assert.assertNotNull(result); +// } // @Test // public void readAllByProbeWithPaging() {