fix: 어드민 사장님 페이지네이션 수정 #654
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
duehee
requested changes
Jul 5, 2024
Comment on lines
+207
to
+213
| if (ownersCondition.searchType() == OwnersCondition.SearchType.EMAIL) { | ||
| result = adminOwnerRepository.findPageOwnersByEmail(ownersCondition.query(), pageRequest); | ||
| } else if (ownersCondition.searchType() == OwnersCondition.SearchType.NAME) { | ||
| result = adminOwnerRepository.findPageOwnersByName(ownersCondition.query(), pageRequest); | ||
| } else { | ||
| result = adminOwnerRepository.findPageOwners(pageRequest); | ||
| } |
Contributor
There was a problem hiding this comment.
A
위 JPQL에서 왜 나누어져서 작성했나 했더니, 여기 부분이 있었네요!
| public record StudentLoginRequest( | ||
| @Schema(description = "이메일", example = "koin123@koreatech.ac.kr", requiredMode = REQUIRED) | ||
| @NotBlank(message = "이메일을 입력해주세요.") | ||
| @Email(message = "이메일 형식을 지켜주세요. ${validatedValue}") |
Contributor
There was a problem hiding this comment.
R
이 친구가 어째서 여기에
지금보니 @NotEmozi PR이랑 섞인 거 같아요
Comment on lines
32
to
37
| @Query(""" | ||
| SELECT o FROM Owner o | ||
| JOIN o.user u | ||
| WHERE u.isAuthed = true | ||
| AND u.email LIKE CONCAT('%', :query, '%') | ||
| """) |
Contributor
There was a problem hiding this comment.
C
아래 있는 AdminUserRepository이랑 코드 블럭 형식이 안 맞춰져있어서, 어느 하나에 맞추면 좋겠어요!
개인적으로는 이 선이랑 맞추는 게 예쁜 듯 싶네요
Suggested change
| @Query(""" | |
| SELECT o FROM Owner o | |
| JOIN o.user u | |
| WHERE u.isAuthed = true | |
| AND u.email LIKE CONCAT('%', :query, '%') | |
| """) | |
| @Query(""" | |
| SELECT o FROM Owner o | |
| JOIN o.user u | |
| WHERE u.isAuthed = true | |
| AND u.email LIKE CONCAT('%', :query, '%') | |
| """) |
| }) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| return AdminNewOwnersResponse.of(ownerIncludingShops, result, criteria); |
Contributor
There was a problem hiding this comment.
A
궁금한 점인데, 기존의 사장님 조회에는 원래 상점이 안 나오나요?
ADMIN이 지금 오류가 있는 상태라 해서 들어가서 보는데 헷갈리네용😵
Contributor
Author
There was a problem hiding this comment.
네 맞아요. 레거시에선 기존의 사장님 조회는 상점이 반환을 안하더라요!
added 3 commits
July 6, 2024 02:36
… fix/653-get-new-owners # Conflicts: # src/main/java/in/koreatech/koin/global/validation/EmojiValidator.java
kwoo28
force-pushed
the
fix/653-get-new-owners
branch
from
7341d32 to
7977400
Compare
added 2 commits
July 6, 2024 03:01
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🔥 연관 이슈
현재 인증 요청 사장님 페이지에서 모든 사장님 페이지가 조회되고 있습니다.
또한 사장님 페이지네이션과 인증 요청 사장님 페이지네이션에서 DB에서 조회하는 로직이 잘못되어 두 API 로직 수정했습니다.
🚀 작업 내용
💬 리뷰 중점사항
기존로직
사장님, 인증요청 사장님 페이지 네이션 : Owner 테이블의 모든 행을 포함하고, Shop 테이블에서 일치하는 행이 있으면 그 데이터를 함께 가져오는 Left Join을 사용
개선로직
사장님 페이지 네이션 : Owner의 user_id와 User의 id가 같은 데이터를 조회하여 반환
인증 요청 사장님 페이지 네이션 : IsAuthed = false인 사장님 데이터를 가져온 후 Redis에서 상점을 조회하여 반환