From 7f4da9cf1ab6dd12f85eab8673277fb03abae401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=B5=E1=84=8B=E1=85=B4=E1=84=8C=E1=85=A6?= Date: Tue, 5 Sep 2023 19:56:45 +0900 Subject: [PATCH 1/2] =?UTF-8?q?YEL-152=20[fix]=20=EA=B5=AC=EA=B8=80=20?= =?UTF-8?q?=EA=B5=AC=EB=8F=85=EC=8B=9C=20=EC=97=B4=EB=9E=8C=EA=B6=8C=203?= =?UTF-8?q?=EA=B0=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yello/server/domain/purchase/service/PurchaseService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/yello/server/domain/purchase/service/PurchaseService.java b/src/main/java/com/yello/server/domain/purchase/service/PurchaseService.java index ea9fbb1c..96c79c64 100644 --- a/src/main/java/com/yello/server/domain/purchase/service/PurchaseService.java +++ b/src/main/java/com/yello/server/domain/purchase/service/PurchaseService.java @@ -198,6 +198,7 @@ public GoogleSubscriptionGetResponse verifyGoogleSubscriptionTransaction(Long us case ConstantUtil.GOOGLE_PURCHASE_SUBSCRIPTION_ACTIVE -> { final Purchase subscribe = purchaseManager.createSubscribe(user, Gateway.GOOGLE, request.orderId()); + user.addTicketCount(3); subscribe.setTransactionId(request.orderId()); } } @@ -239,7 +240,6 @@ public GoogleTicketGetResponse verifyGoogleTicketTransaction(Long userId, if (!inAppResponse.getStatusCode().is2xxSuccessful()) { throw new GoogleTokenServerErrorException(GOOGLE_TOKEN_SERVER_EXCEPTION); } - System.out.println("inAppResponse = " + inAppResponse); if (inAppResponse.getBody().purchaseState() == 0) { purchaseRepository.findByTransactionId(inAppResponse.getBody().orderId()) From 4b1077717de1f5470ae796d117b81983928ec36e Mon Sep 17 00:00:00 2001 From: hyeonjeongs Date: Tue, 5 Sep 2023 22:24:05 +0900 Subject: [PATCH 2/2] =?UTF-8?q?YEL-153=20[fix]=20=ED=95=99=EA=B5=90=20?= =?UTF-8?q?=EA=B7=B8=EB=A3=B9=EC=9C=BC=EB=A1=9C=20=EC=B9=9C=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/domain/friend/service/FriendService.java | 11 ++++++----- .../domain/user/repository/UserJpaRepository.java | 4 ++-- .../server/domain/user/repository/UserRepository.java | 2 +- .../domain/user/repository/UserRepositoryImpl.java | 4 ++-- .../yello/server/domain/user/FakeUserRepository.java | 10 +++++----- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/yello/server/domain/friend/service/FriendService.java b/src/main/java/com/yello/server/domain/friend/service/FriendService.java index 657e2831..9bcf881a 100644 --- a/src/main/java/com/yello/server/domain/friend/service/FriendService.java +++ b/src/main/java/com/yello/server/domain/friend/service/FriendService.java @@ -96,11 +96,12 @@ public List findShuffledFriend(Long userId) { public RecommendFriendResponse findAllRecommendSchoolFriends(Pageable pageable, Long userId) { final User user = userRepository.getById(userId); - List recommendFriends = userRepository.findAllByGroupId(user.getGroup().getId()) - .stream() - .filter(target -> !userId.equals(target.getId())) - .filter(target -> !friendRepository.existsByUserAndTarget(userId, target.getId())) - .toList(); + List recommendFriends = + userRepository.findAllByGroupId(user.getGroup().getSchoolName()) + .stream() + .filter(target -> !userId.equals(target.getId())) + .filter(target -> !friendRepository.existsByUserAndTarget(userId, target.getId())) + .toList(); List pageList = PaginationFactory.getPage(recommendFriends, pageable) .stream() diff --git a/src/main/java/com/yello/server/domain/user/repository/UserJpaRepository.java b/src/main/java/com/yello/server/domain/user/repository/UserJpaRepository.java index f19ba506..a32e25cd 100644 --- a/src/main/java/com/yello/server/domain/user/repository/UserJpaRepository.java +++ b/src/main/java/com/yello/server/domain/user/repository/UserJpaRepository.java @@ -39,9 +39,9 @@ public interface UserJpaRepository extends JpaRepository { Optional findByYelloIdNotFiltered(@Param("yelloId") String yelloId); @Query("select u from User u " + - "where u.group.id = :groupId " + + "where u.group.schoolName = :schoolName " + "and u.deletedAt is null") - List findAllByGroupId(@Param("groupId") Long groupId); + List findAllByGroupId(@Param("schoolName") String schoolName); @Query("select u from User u " diff --git a/src/main/java/com/yello/server/domain/user/repository/UserRepository.java b/src/main/java/com/yello/server/domain/user/repository/UserRepository.java index aaaf0449..6bd5b19c 100644 --- a/src/main/java/com/yello/server/domain/user/repository/UserRepository.java +++ b/src/main/java/com/yello/server/domain/user/repository/UserRepository.java @@ -32,7 +32,7 @@ public interface UserRepository { Optional findByDeviceTokenNotFiltered(String deviceToken); - List findAllByGroupId(Long groupId); + List findAllByGroupId(String schoolName); List findAllByGroupContainingName(String groupName, String keyword, List uuidList); diff --git a/src/main/java/com/yello/server/domain/user/repository/UserRepositoryImpl.java b/src/main/java/com/yello/server/domain/user/repository/UserRepositoryImpl.java index 2ad08112..23aa64a5 100644 --- a/src/main/java/com/yello/server/domain/user/repository/UserRepositoryImpl.java +++ b/src/main/java/com/yello/server/domain/user/repository/UserRepositoryImpl.java @@ -85,8 +85,8 @@ public Optional findByDeviceTokenNotFiltered(String deviceToken) { } @Override - public List findAllByGroupId(Long groupId) { - return userJpaRepository.findAllByGroupId(groupId); + public List findAllByGroupId(String schoolName) { + return userJpaRepository.findAllByGroupId(schoolName); } @Override diff --git a/src/test/java/com/yello/server/domain/user/FakeUserRepository.java b/src/test/java/com/yello/server/domain/user/FakeUserRepository.java index a4b69688..d47e9ca4 100644 --- a/src/test/java/com/yello/server/domain/user/FakeUserRepository.java +++ b/src/test/java/com/yello/server/domain/user/FakeUserRepository.java @@ -21,12 +21,12 @@ public class FakeUserRepository implements UserRepository { @Override public User save(User user) { - if (user.getId() != null && user.getId() > id) { + if (user.getId()!=null && user.getId() > id) { id = user.getId(); } User newUser = User.builder() - .id(user.getId() == null ? ++id : user.getId()) + .id(user.getId()==null ? ++id : user.getId()) .recommendCount(0L) .name(user.getName()) .yelloId(user.getYelloId()) @@ -93,7 +93,7 @@ public boolean existsByUuid(String uuid) { @Override public Optional findByYelloId(String yelloId) { return data.stream() - .filter(user -> user.getDeletedAt() == null) + .filter(user -> user.getDeletedAt()==null) .filter(user -> user.getYelloId().equals(yelloId)) .findFirst(); } @@ -128,9 +128,9 @@ public Optional findByDeviceTokenNotFiltered(String deviceToken) { } @Override - public List findAllByGroupId(Long groupId) { + public List findAllByGroupId(String schoolName) { return data.stream() - .filter(user -> user.getGroup().getId().equals(groupId)) + .filter(user -> user.getGroup().getSchoolName().equals(schoolName)) .toList(); }