YEL-154 [develop] 개발 서버 배포

team-yello · Sep 10, 2023 · 80464c1 · 80464c1
2 parents 5954940 + 465ce72
commit 80464c1
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 14 deletions.
diff --git a/src/main/java/com/yello/server/domain/purchase/dto/apple/AppleNotificationPayloadVO.java b/src/main/java/com/yello/server/domain/purchase/dto/apple/AppleNotificationPayloadVO.java
@@ -11,4 +11,14 @@ public record AppleNotificationPayloadVO(
 
 ) {
 
+    public static AppleNotificationPayloadVO of(String notificationType, String subType,
+        ApplePayloadDataVO data, String notificationUUID) {
+        return AppleNotificationPayloadVO.builder()
+            .notificationType(notificationType)
+            .subType(subType)
+            .data(data)
+            .notificationUUID(notificationUUID)
+            .build();
+    }
+
 }
diff --git a/src/main/java/com/yello/server/domain/purchase/dto/apple/ApplePayloadDataVO.java b/src/main/java/com/yello/server/domain/purchase/dto/apple/ApplePayloadDataVO.java
@@ -1,8 +1,12 @@
 package com.yello.server.domain.purchase.dto.apple;
 
+import lombok.Builder;
+
+@Builder
 public record ApplePayloadDataVO(
     String appAppleId,
     String bundleId,
+    String bundleVersion,
     String environment,
     String signedTransactionInfo,
     String signedRenewalInfo,

diff --git a/src/main/java/com/yello/server/domain/purchase/service/PurchaseManagerImpl.java b/src/main/java/com/yello/server/domain/purchase/service/PurchaseManagerImpl.java
@@ -4,9 +4,9 @@
 import static com.yello.server.global.common.ErrorCode.GOOGLE_SUBSCRIPTIONS_SUBSCRIPTION_EXCEPTION;
 import static com.yello.server.global.common.ErrorCode.NOT_FOUND_TRANSACTION_EXCEPTION;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yello.server.domain.purchase.dto.apple.AppleNotificationPayloadVO;
+import com.yello.server.domain.purchase.dto.apple.ApplePayloadDataVO;
 import com.yello.server.domain.purchase.dto.apple.TransactionInfoResponse;
 import com.yello.server.domain.purchase.entity.Gateway;
 import com.yello.server.domain.purchase.entity.ProductType;
@@ -67,17 +67,18 @@ public void handleAppleTransactionError(ResponseEntity<TransactionInfoResponse>
 
     @Override
     public AppleNotificationPayloadVO decodeApplePayload(String signedPayload) {
-        String jsonPayload = DecodeTokenFactory.decodePayload(signedPayload);
-
+        Map<String, Object> jsonPayload = DecodeTokenFactory.decodePayload(signedPayload);
         ObjectMapper objectMapper = new ObjectMapper();
-        try {
-            AppleNotificationPayloadVO payloadVO =
-                objectMapper.readValue(jsonPayload, AppleNotificationPayloadVO.class);
-            System.out.println(payloadVO + " 입니다아아아아아");
-            return payloadVO;
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
+
+        String notificationType = jsonPayload.get("notificationType").toString();
+        String subType = jsonPayload.get("subType").toString();
+        Map<String, Object> data = (Map<String, Object>) jsonPayload.get("data");
+        String notificationUUID = jsonPayload.get("notificationUUID").toString();
+
+        ApplePayloadDataVO payloadVO = objectMapper.convertValue(data, ApplePayloadDataVO.class);
+
+        return AppleNotificationPayloadVO.of(notificationType, subType, payloadVO,
+            notificationUUID);
     }
 
     @Override

diff --git a/src/main/java/com/yello/server/global/common/factory/DecodeTokenFactory.java b/src/main/java/com/yello/server/global/common/factory/DecodeTokenFactory.java
@@ -15,10 +15,13 @@ public static Map<String, Object> decodeToken(String jwtToken) {
         return jsonArray;
     }
 
-    public static String decodePayload(String payload) {
+    public static Map<String, Object> decodePayload(String payload) {
         final String decodePayload = new String(java.util.Base64.getUrlDecoder().decode(payload));
 
-        return decodePayload;
+        BasicJsonParser jsonParser = new BasicJsonParser();
+        Map<String, Object> jsonArray = jsonParser.parseMap(decodePayload);
+
+        return jsonArray;
     }
 
 }
diff --git a/src/main/java/com/yello/server/global/common/factory/TokenFactoryImpl.java b/src/main/java/com/yello/server/global/common/factory/TokenFactoryImpl.java
@@ -35,7 +35,7 @@ public class TokenFactoryImpl implements TokenFactory {
     @Override
     public String generateAppleToken() {
         setKey();
-        return Jwts.builder()
+        String compact = Jwts.builder()
             .setHeaderParam("kid", kid)
             .setIssuer(iss)
             .setIssuedAt(new Date(System.currentTimeMillis()))
@@ -48,6 +48,8 @@ public String generateAppleToken() {
                     .generatePrivate(new PKCS8EncodedKeySpec(Base64.decodeBase64(sig)))
             )
             .compact();
+        System.out.println(compact + " sdsdfsdsdfss");
+        return compact;
     }
 
     @SneakyThrows