YEL-152 [deploy] 1.1.91v

src/main/java/com/yello/server/domain/friend/service/FriendService.java

@@ -96,11 +96,12 @@ public List<FriendShuffleResponse> findShuffledFriend(Long userId) {
     public RecommendFriendResponse findAllRecommendSchoolFriends(Pageable pageable, Long userId) {
         final User user = userRepository.getById(userId);
 
-        List<User> recommendFriends = userRepository.findAllByGroupId(user.getGroup().getId())
-            .stream()
-            .filter(target -> !userId.equals(target.getId()))
-            .filter(target -> !friendRepository.existsByUserAndTarget(userId, target.getId()))
-            .toList();
+        List<User> recommendFriends =
+            userRepository.findAllByGroupId(user.getGroup().getSchoolName())
+                .stream()
+                .filter(target -> !userId.equals(target.getId()))
+                .filter(target -> !friendRepository.existsByUserAndTarget(userId, target.getId()))
+                .toList();
 
         List<FriendResponse> pageList = PaginationFactory.getPage(recommendFriends, pageable)
             .stream()

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())

src/main/java/com/yello/server/domain/user/repository/UserJpaRepository.java

@@ -39,9 +39,9 @@ public interface UserJpaRepository extends JpaRepository<User, Long> {
     Optional<User> 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<User> findAllByGroupId(@Param("groupId") Long groupId);
+    List<User> findAllByGroupId(@Param("schoolName") String schoolName);
 
 
     @Query("select u from User u "

src/main/java/com/yello/server/domain/user/repository/UserRepository.java

@@ -32,7 +32,7 @@ public interface UserRepository {
 
     Optional<User> findByDeviceTokenNotFiltered(String deviceToken);
 
-    List<User> findAllByGroupId(Long groupId);
+    List<User> findAllByGroupId(String schoolName);
 
     List<User> findAllByGroupContainingName(String groupName, String keyword,
         List<String> uuidList);

src/main/java/com/yello/server/domain/user/repository/UserRepositoryImpl.java

@@ -85,8 +85,8 @@ public Optional<User> findByDeviceTokenNotFiltered(String deviceToken) {
     }
 
     @Override
-    public List<User> findAllByGroupId(Long groupId) {
-        return userJpaRepository.findAllByGroupId(groupId);
+    public List<User> findAllByGroupId(String schoolName) {
+        return userJpaRepository.findAllByGroupId(schoolName);
     }
 
     @Override

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<User> 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<User> findByDeviceTokenNotFiltered(String deviceToken) {
     }
 
     @Override
-    public List<User> findAllByGroupId(Long groupId) {
+    public List<User> findAllByGroupId(String schoolName) {
         return data.stream()
-            .filter(user -> user.getGroup().getId().equals(groupId))
+            .filter(user -> user.getGroup().getSchoolName().equals(schoolName))
             .toList();
     }