From 67e5cba1a749e57e04a3d515a1c72e96ffb4b6c5 Mon Sep 17 00:00:00 2001 From: Suhyeon <70002218+onpyeong@users.noreply.github.com> Date: Wed, 6 Mar 2024 21:24:17 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[Fix]:=20=ED=8A=B9=EC=A0=95=EB=82=A0?= =?UTF-8?q?=EC=A7=9C=20=EC=95=BD=20=EC=9D=BC=EC=A0=95=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=20=EC=97=90=EB=9F=AC=20=EC=B2=98=EB=A6=AC=20(#112)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pillSchedule이 자신의 약이 맞는지 체크하도록 수정 특정날짜 약 일정 조회 에러 처리 Related to: #111 --- .../pill/infrastructure/PillScheduleQueryRepository.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/io/sobok/SobokSobok/pill/infrastructure/PillScheduleQueryRepository.java b/src/main/java/io/sobok/SobokSobok/pill/infrastructure/PillScheduleQueryRepository.java index a6f86ce..a8a3b6e 100644 --- a/src/main/java/io/sobok/SobokSobok/pill/infrastructure/PillScheduleQueryRepository.java +++ b/src/main/java/io/sobok/SobokSobok/pill/infrastructure/PillScheduleQueryRepository.java @@ -102,6 +102,7 @@ public List getDateSchedule(Long userId, LocalDate date) { List pillScheduleIds = queryFactory .select(pillSchedule.id) .from(pillSchedule) + .join(pill).on(pill.id.eq(pillSchedule.pillId), pill.userId.eq(userId)) .where(pillSchedule.scheduleDate.eq(date), pillSchedule.scheduleTime.eq(time)) .fetch(); From 943fa3a0ff89d8ba0f93b9fc30311e3486e2ab2a Mon Sep 17 00:00:00 2001 From: Suhyeon <70002218+onpyeong@users.noreply.github.com> Date: Wed, 20 Mar 2024 13:01:18 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[Fix]:=20=EC=B9=9C=EA=B5=AC=20=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=20=ED=99=95=EC=9D=B8=20=EB=B3=80=EC=88=98=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#121)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit friendId를 memberId로 수정 Related to: #120 --- .../sobok/SobokSobok/friend/application/FriendService.java | 6 +++--- .../io/sobok/SobokSobok/friend/ui/FriendController.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/sobok/SobokSobok/friend/application/FriendService.java b/src/main/java/io/sobok/SobokSobok/friend/application/FriendService.java index f01267b..4c5ff7c 100644 --- a/src/main/java/io/sobok/SobokSobok/friend/application/FriendService.java +++ b/src/main/java/io/sobok/SobokSobok/friend/application/FriendService.java @@ -188,14 +188,14 @@ public UpdateFriendNameResponse updateFriendName(Long userId, Long friendId, Upd } @Transactional - public Boolean checkFriendRequest(Long userId, Long friendId) { + public Boolean checkFriendRequest(Long userId, Long memberId) { boolean AlreadyFriendRequest = false; UserServiceUtil.existsUserById(userRepository, userId); - UserServiceUtil.existsUserById(userRepository, friendId); + UserServiceUtil.existsUserById(userRepository, memberId); - if (friendQueryRepository.isAlreadyFriend(userId, friendId) || noticeRepository.existsBySenderIdAndReceiverIdAndIsOkay(userId, friendId, NoticeStatus.WAITING)) { + if (friendQueryRepository.isAlreadyFriend(userId, memberId) || noticeRepository.existsBySenderIdAndReceiverIdAndIsOkay(userId, memberId, NoticeStatus.WAITING)) { AlreadyFriendRequest = true; } diff --git a/src/main/java/io/sobok/SobokSobok/friend/ui/FriendController.java b/src/main/java/io/sobok/SobokSobok/friend/ui/FriendController.java index ebf8a20..a090f2e 100644 --- a/src/main/java/io/sobok/SobokSobok/friend/ui/FriendController.java +++ b/src/main/java/io/sobok/SobokSobok/friend/ui/FriendController.java @@ -104,21 +104,21 @@ public ResponseEntity> updateFriendName( )); } - @GetMapping("/request/{friendId}") + @GetMapping("/request/{memberId}") @Operation( summary = "친구 신청 여부 확인 API 메서드", description = "친구 신청을 했는지 확인하는 메서드입니다." ) public ResponseEntity> checkFriendRequest( @AuthenticationPrincipal User user, - @PathVariable Long friendId + @PathVariable Long memberId ) { return ResponseEntity .status(HttpStatus.OK) .body(ApiResponse.success( SuccessCode.GET_REQUEST_FRIEND_SUCCESS, - friendService.checkFriendRequest(user.getId(), friendId) + friendService.checkFriendRequest(user.getId(), memberId) )); } } From 2c20033c06dcc14525f6d2c2c3e7efe90f838fa1 Mon Sep 17 00:00:00 2001 From: Suhyeon <70002218+onpyeong@users.noreply.github.com> Date: Tue, 2 Apr 2024 23:50:51 +0900 Subject: [PATCH 3/3] Release (#125) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Fix]: 친구 신청 확인 변수명 수정 (#121) friendId를 memberId로 수정 Related to: #120 * [Fix]: 소셜 로그인 isNew값이 null로 반환되는 문제 해결 (#124) isNew 값 세팅 Related to: #123 --- .../auth/application/SocialService.java | 51 +++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/src/main/java/io/sobok/SobokSobok/auth/application/SocialService.java b/src/main/java/io/sobok/SobokSobok/auth/application/SocialService.java index 86249f3..168f70c 100644 --- a/src/main/java/io/sobok/SobokSobok/auth/application/SocialService.java +++ b/src/main/java/io/sobok/SobokSobok/auth/application/SocialService.java @@ -10,9 +10,9 @@ import io.sobok.SobokSobok.auth.ui.dto.SocialSignupResponse; import io.sobok.SobokSobok.exception.ErrorCode; import io.sobok.SobokSobok.exception.model.ConflictException; -import io.sobok.SobokSobok.exception.model.NotFoundException; import io.sobok.SobokSobok.security.jwt.Jwt; import io.sobok.SobokSobok.security.jwt.JwtProvider; +import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,39 +36,48 @@ public SocialSignupResponse signup(SocialSignupRequest request) { } User signupUser = userRepository.save(User.builder() - .username(request.username()) - .socialInfo(SocialInfo.builder() - .socialId(request.socialId()) - .build()) - .deviceToken(request.deviceToken()) - .roles(Role.USER.name()) - .build()); + .username(request.username()) + .socialInfo(SocialInfo.builder() + .socialId(request.socialId()) + .build()) + .deviceToken(request.deviceToken()) + .roles(Role.USER.name()) + .build()); Jwt jwt = jwtProvider.getUserJwt(signupUser.getSocialInfo().getSocialId()); return SocialSignupResponse.builder() - .id(signupUser.getId()) - .username(signupUser.getUsername()) - .socialId(signupUser.getSocialInfo().getSocialId()) - .accessToken(jwt.accessToken()) - .refreshToken(jwt.refreshToken()) - .build(); + .id(signupUser.getId()) + .username(signupUser.getUsername()) + .socialId(signupUser.getSocialInfo().getSocialId()) + .accessToken(jwt.accessToken()) + .refreshToken(jwt.refreshToken()) + .build(); } @Transactional public SocialLoginResponse login(SocialLoginRequest request) { - User loginUser = userRepository.findBySocialInfoSocialId(request.socialId()) - .orElseThrow(() -> new NotFoundException(ErrorCode.UNREGISTERED_USER)); + Optional optionalLoginUser = userRepository.findBySocialInfoSocialId( + request.socialId()); - if (!request.deviceToken().equals(loginUser.getDeviceToken())) { - loginUser.updateDeviceToken(request.deviceToken()); - } + if (optionalLoginUser.isPresent()) { + User loginUser = optionalLoginUser.get(); - Jwt jwt = jwtProvider.getUserJwt(loginUser.getSocialInfo().getSocialId()); + if (!request.deviceToken().equals(loginUser.getDeviceToken())) { + loginUser.updateDeviceToken(request.deviceToken()); + } - return SocialLoginResponse.builder() + Jwt jwt = jwtProvider.getUserJwt(loginUser.getSocialInfo().getSocialId()); + + return SocialLoginResponse.builder() .accessToken(jwt.accessToken()) .refreshToken(jwt.refreshToken()) + .isNew(false) + .build(); + } else { + return SocialLoginResponse.builder() + .isNew(true) .build(); + } } }