diff --git a/.github/workflows/apiTest.yml b/.github/workflows/apiTest.yml deleted file mode 100644 index d9cc9ad..0000000 --- a/.github/workflows/apiTest.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: auto API test - -on: - push: - branches: [ "master" ] - -jobs: - real-world-api-test: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Cache node modules - uses: actions/cache@v2 - env: - cache-name: cache-node-modules - with: - # npm cache files are stored in `~/.npm` on Linux/macOS - path: ~/.npm - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - - name: chmod test file - run: chmod +x ./doc/run-api-tests.sh - - - name: run api test - run: ./doc/run-api-tests.sh \ No newline at end of file diff --git a/src/main/java/com/io/realworld/domain/aggregate/article/service/ArticleServiceImpl.java b/src/main/java/com/io/realworld/domain/aggregate/article/service/ArticleServiceImpl.java index 479dd3d..6be58b4 100644 --- a/src/main/java/com/io/realworld/domain/aggregate/article/service/ArticleServiceImpl.java +++ b/src/main/java/com/io/realworld/domain/aggregate/article/service/ArticleServiceImpl.java @@ -24,7 +24,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -45,12 +44,12 @@ public class ArticleServiceImpl implements ArticleService { @Override public List getArticles(UserAuth userAuth, ArticleParam articleParam) { - Pageable pageable = null; - List
articles = new ArrayList<>(); - if (articleParam.getOffset() != null) { - pageable = PageRequest.of(articleParam.getOffset(), articleParam.getLimit()); - } + List
articles = new ArrayList<>(); + Integer offset = articleParam.getOffset() == null ? 0 : articleParam.getOffset(); + Integer limit = articleParam.getLimit() == null ? 20 : articleParam.getLimit(); + + Pageable pageable = PageRequest.of(offset,limit); if (articleParam.getTag() != null) { articles = articleRepository.findByTag(articleParam.getTag(), pageable);