YEL-176 [feat] noti 종류별 purchase 접근 로직 픽스

team-yello · Oct 15, 2023 · bacd658 · bacd658
2 parents a5d8b92 + 71a22a7
commit bacd658
Showing 1 changed file with 7 additions and 3 deletions.
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
@@ -368,22 +368,23 @@ public void googleNotification(GooglePubSubNotificationRequest request) {
         );
 
         final DeveloperNotification developerNotification = gson.fromJson(data, DeveloperNotification.class);
+
         if (ObjectUtils.isEmpty(developerNotification.getProductType())) {
             log.info("BAD REQUEST by wrong pub-sub name");
             throw new GoogleBadRequestException(GOOGLE_NOTIFICATION_BAD_REQUEST_EXCEPTION);
         }
         log.info(String.format("notification product type is %s", developerNotification.getProductType().toString()));
 
-        final Optional<Purchase> purchase = purchaseRepository.findByPurchaseToken(
-            developerNotification.subscriptionNotification().purchaseToken());
-
         switch (developerNotification.getProductType()) {
 
             case TEST -> {
                 log.info("TEST notification is sent by Google Play Console");
                 return;
             }
             case YELLO_PLUS -> {
+                final Optional<Purchase> purchase = purchaseRepository.findByPurchaseToken(
+                    developerNotification.subscriptionNotification().purchaseToken());
+
                 if (purchase.isEmpty()) {
                     log.info("notification is rejected by INVALID PurchaseToken");
                     throw new PurchaseNotFoundException(PURCHASE_TOKEN_NOT_FOUND_PURCHASE_EXCEPTION);
@@ -423,6 +424,9 @@ public void googleNotification(GooglePubSubNotificationRequest request) {
                 }
             }
             case ONE_TICKET, TWO_TICKET, FIVE_TICKET -> {
+                final Optional<Purchase> purchase = purchaseRepository.findByPurchaseToken(
+                    developerNotification.oneTimeProductNotification().purchaseToken());
+
                 if (purchase.isEmpty()) {
                     log.info("notification is rejected by INVALID PurchaseToken");
                     throw new PurchaseNotFoundException(PURCHASE_TOKEN_NOT_FOUND_PURCHASE_EXCEPTION);