overflow_backup_2018_0455/overflow_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

History paging

Browse Source
This commit is contained in:
insanity 2017-08-24 14:02:31 +09:00
parent f1725b6f46
commit 27bb2798f0
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/loafle/overflow/module/history/dao/HistoryDAO.java
View File

@ -23,5 +23,5 @@ public interface HistoryDAO extends JpaRepository<History, Long> {
Page<History> findAllByProbe(Probe probe, Pageable pageable);
@Query("SELECT h FROM History h WHERE h.probe.id = :#{#probe.id} and h.type.id = :#{#type.id}")
List<History> findAllByProbeAndType(@Param("probe") Probe probe, @Param("type") MetaHistoryType type);
Page<History> findAllByProbeAndType(@Param("probe") Probe probe, @Param("type") MetaHistoryType type, Pageable pageable);
}

8
src/main/java/com/loafle/overflow/module/history/service/HistoryService.java
View File

@ -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<History> readAllByProbeAndType(Probe probe, MetaHistoryType type) {
return this.historyDAO.findAllByProbeAndType(probe, type);
public Page<History> 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<History> readAllByProbe(Probe probe, int pageNo, int countPerPage) {

14
src/test/java/com/loafle/overflow/module/history/service/HistoryServiceTest.java
View File

@ -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<History> result = this.historyService.readAllByProbeAndType(new Probe(1), new MetaHistoryType(1));
Assert.assertNotNull(result);
}
// @Test
// @Ignore
// public void readAllByProbeAndType() {
// List<History> result = this.historyService.readAllByProbeAndType(new Probe(1), new MetaHistoryType(1));
// Assert.assertNotNull(result);
// }
// @Test
// public void readAllByProbeWithPaging() {