Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2023 11 04 release 3 #279

Merged
merged 2 commits into from
Nov 4, 2023
Merged

2023 11 04 release 3 #279

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7848f2
:recycle: Feature/277 page 범위 넘어가면 체크
Hanvp Nov 4, 2023
78b7b06
Merge pull request #278 from zipdabang/feature/277
Hanvp Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/zipdabang/server/service/serviceImpl/RecipeServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,8 @@ public Page<Recipe> searchRecipe(Long categoryId, String keyword, String order,

Long count = recipeRepositoryCustom.recipeTotalCount(member, categoryCondition, keywordCondition);

if (count < pageIndex*pageSize)
throw new RecipeException(CommonStatus.OVER_PAGE_INDEX_ERROR);
if (content.size() > count - pageIndex*pageSize)
content = content.subList(0, count.intValue()-pageIndex*pageSize);

Expand Down Expand Up @@ -462,6 +464,8 @@ public Page<Recipe> getWrittenByRecipe(Integer pageIndex, String writtenby, Stri

Long count = recipeRepositoryCustom.recipeTotalCount(member, writtenByCondition);

if (count < pageIndex*pageSize)
throw new RecipeException(CommonStatus.OVER_PAGE_INDEX_ERROR);
if (content.size() != 0 & content.size() > count - pageIndex*pageSize)
content = content.subList(0, count.intValue()-pageIndex*pageSize);

Expand Down Expand Up @@ -564,6 +568,8 @@ public Page<Recipe> recipeListByCategory(Long categoryId, Integer pageIndex, Mem
log.info("서비스단의 상황 : {}", content.size());
Long count = recipeRepositoryCustom.recipeTotalCount(member, whereCondition);

if (count < pageIndex*pageSize)
throw new RecipeException(CommonStatus.OVER_PAGE_INDEX_ERROR);
if (content.size() > count - pageIndex*pageSize)
content = content.subList(0, count.intValue()-pageIndex*pageSize);

Expand Down
Loading