[CHORE] resolve conflicts

.gitignore

@@ -167,6 +167,9 @@ fabric.properties
 *.tar.gz
 *.rar
 
+# Access/Refresh Tokens
+*.token
+
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 replay_pid*
@@ -232,4 +235,4 @@ $RECYCLE.BIN/
 
 !gradle/wrapper/gradle-wrapper.jar
 
-# End of https://www.toptal.com/developers/gitignore/api/windows,intellij,macos,java
+# End of https://www.toptal.com/developers/gitignore/api/windows,intellij,macos,java

src/main/java/com/nextroom/nextRoomServer/controller/PaymentController.java

@@ -15,7 +15,6 @@
 import com.google.api.services.androidpublisher.model.SubscriptionPurchase;
 import com.nextroom.nextRoomServer.dto.BaseResponse;
 import com.nextroom.nextRoomServer.dto.SubscriptionDto;
-import com.nextroom.nextRoomServer.service.PaymentService;
 import com.nextroom.nextRoomServer.util.AndroidPublisherClient;
 import com.nextroom.nextRoomServer.util.Base64Decoder;
 
@@ -27,8 +26,6 @@
 @RequestMapping("/api/v1/payment")
 @RequiredArgsConstructor
 public class PaymentController {
-    private final PaymentService paymentService;
-
     @PostMapping
     public ResponseEntity<BaseResponse> updatePayment(
         // @RequestBody Object message

src/main/java/com/nextroom/nextRoomServer/controller/SubscriptionController.java

@@ -6,15 +6,20 @@
 import java.util.regex.Pattern;
 
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nextroom.nextRoomServer.dto.BaseResponse;
+import com.nextroom.nextRoomServer.dto.DataResponse;
 import com.nextroom.nextRoomServer.dto.SubscriptionDto;
+import com.nextroom.nextRoomServer.service.SubscriptionService;
 import com.nextroom.nextRoomServer.util.Base64Decoder;
 
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 
@@ -23,5 +28,69 @@
 @RequestMapping("/api/v1/subscription")
 @RequiredArgsConstructor
 public class SubscriptionController {
+    private final SubscriptionService subscriptionService;
 
+    @PostMapping
+    public ResponseEntity<BaseResponse> updateSubscription(@RequestBody SubscriptionDto.UpdateSubscription messageDto) {
+        String decodedData = Base64Decoder.decode(messageDto.getMessage().getData());
+
+        System.out.println(decodedData);
+
+        Pattern pattern = Pattern.compile(".*\"testNotification\":\\{(.*?)\\}.*");
+        Matcher matcher = pattern.matcher(decodedData);
+
+        if (matcher.find()) {
+            String notificationContent = matcher.group(1);
+            System.out.println("Extracted Notification Content: " + notificationContent);
+        }
+
+        return ResponseEntity.ok(new BaseResponse(OK));
+    }
+
+    @PostMapping("/test")
+    public ResponseEntity<BaseResponse> addSubscription() {
+        subscriptionService.test();
+        return ResponseEntity.ok(new BaseResponse(OK));
+    }
+
+    @Operation(
+        summary = "구독 정보 조회(마이 페이지)",
+        responses = {
+            @ApiResponse(responseCode = "200", description = "OK"),
+            @ApiResponse(responseCode = "401", description = "TOKEN_UNAUTHORIZED"),
+            @ApiResponse(responseCode = "403", description = "NOT_PERMITTED"),
+            @ApiResponse(responseCode = "404", description = "TARGET_SHOP_NOT_FOUND")
+        }
+    )
+    @GetMapping("/mypage")
+    public ResponseEntity<BaseResponse> getSubscriptionInfo() {
+        return ResponseEntity.ok(new DataResponse<>(OK, subscriptionService.getSubscriptionInfo()));
+    }
+
+    @Operation(
+        summary = "유저 상태 조회",
+        responses = {
+            @ApiResponse(responseCode = "200", description = "OK"),
+            @ApiResponse(responseCode = "401", description = "TOKEN_UNAUTHORIZED"),
+            @ApiResponse(responseCode = "403", description = "NOT_PERMITTED"),
+            @ApiResponse(responseCode = "404", description = "TARGET_SHOP_NOT_FOUND")
+        }
+    )
+    @GetMapping("/status")
+    public ResponseEntity<BaseResponse> getUserStatus() {
+        return ResponseEntity.ok(new DataResponse<>(OK, subscriptionService.getUserStatus()));
+    }
+
+    @Operation(
+        summary = "구독 요금제 조회",
+        responses = {
+            @ApiResponse(responseCode = "200", description = "OK"),
+            @ApiResponse(responseCode = "401", description = "TOKEN_UNAUTHORIZED"),
+            @ApiResponse(responseCode = "403", description = "NOT_PERMITTED")
+        }
+    )
+    @GetMapping("/plan")
+    public ResponseEntity<BaseResponse> getSubscriptionPlan() {
+        return ResponseEntity.ok(new DataResponse<>(OK, subscriptionService.getSubscriptionPlan()));
+    }
 }

src/main/java/com/nextroom/nextRoomServer/domain/Shop.java

@@ -14,6 +14,7 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -45,4 +46,7 @@ public class Shop extends Timestamped {
     @OneToMany(mappedBy = "shop", cascade = CascadeType.ALL)
     @Builder.Default
     private List<Theme> themes = new ArrayList<>();
+
+    @OneToOne(mappedBy = "shop", cascade = CascadeType.DETACH)
+    private Subscription subscription;
 }

src/main/java/com/nextroom/nextRoomServer/domain/Subscription.java

@@ -1,20 +1,21 @@
 package com.nextroom.nextRoomServer.domain;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 import com.nextroom.nextRoomServer.enums.SubscriptionPlan;
-import com.nextroom.nextRoomServer.enums.SubscriptionStatus;
+import com.nextroom.nextRoomServer.enums.UserStatus;
 import com.nextroom.nextRoomServer.util.Timestamped;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -31,13 +32,15 @@ public class Subscription extends Timestamped {
     @Column(name = "subscription_id", nullable = false)
     private Long id;
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "shop_id", nullable = false)
     private Shop shop;
 
     private String googleId;
-    private SubscriptionStatus status;
+
+    @Enumerated(EnumType.STRING)
+    private UserStatus status;
+    @Enumerated(EnumType.STRING)
     private SubscriptionPlan plan;
-    private LocalDateTime subscribedAt;
     private LocalDate expiryDate;
 }

src/main/java/com/nextroom/nextRoomServer/dto/SubscriptionDto.java

@@ -1,5 +1,15 @@
 package com.nextroom.nextRoomServer.dto;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.google.gson.JsonIOException;
+import com.nextroom.nextRoomServer.domain.Subscription;
+import com.nextroom.nextRoomServer.enums.EnumModel;
+import com.nextroom.nextRoomServer.enums.SubscriptionPlan;
+import com.nextroom.nextRoomServer.enums.UserStatus;
+import com.nextroom.nextRoomServer.util.Timestamped;
+
 import lombok.Getter;
 
 public class SubscriptionDto {
@@ -32,4 +42,49 @@ public static class PublishedMessage {
         private String eventTimeMillis;
         private SubscriptionNotification subscriptionNotification;
     }
+
+    @Getter
+    public static class SubscriptionInfoResponse {
+        private final Long id;
+        private final SubscriptionPlan subStatus;
+        private final String expiryDate;
+        private final String createdAt;
+
+        public SubscriptionInfoResponse(Subscription subscription) {
+            this.id = subscription.getId();
+            this.subStatus = subscription.getPlan();
+            this.expiryDate = subscription.getExpiryDate().toString();
+            this.createdAt = Timestamped.dateTimeFormatter(subscription.getCreatedAt());
+        }
+    }
+
+    @Getter
+    public static class UserStatusResponse {
+        private final Long id;
+        private final UserStatus userStatus;
+        private final String expiryDate;
+        private final String createdAt;
+
+        public UserStatusResponse(Subscription subscription) {
+            this.id = subscription.getId();
+            this.userStatus = subscription.getStatus();
+            this.expiryDate = subscription.getExpiryDate().toString();
+            this.createdAt = Timestamped.dateTimeFormatter(subscription.getCreatedAt());
+        }
+    }
+
+    @Getter
+    public static class SubscriptionPlanResponse {
+        private final String plan;
+        private final String description;
+        private final Integer originPrice;
+        private final Integer sellPrice;
+
+        public SubscriptionPlanResponse(EnumModel enumModel) {
+            this.plan = enumModel.getKey();
+            this.description = enumModel.getDescription();
+            this.originPrice = enumModel.getOriginPrice();
+            this.sellPrice = enumModel.getSellPrice();
+        }
+    }
 }

src/main/java/com/nextroom/nextRoomServer/enums/EnumModel.java

@@ -0,0 +1,11 @@
+package com.nextroom.nextRoomServer.enums;
+
+public interface EnumModel {
+    String getKey();
+
+    String getDescription();
+
+    Integer getOriginPrice();
+
+    Integer getSellPrice();
+}

src/main/java/com/nextroom/nextRoomServer/enums/SubscriptionPlan.java

@@ -1,16 +1,38 @@
 package com.nextroom.nextRoomServer.enums;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum SubscriptionPlan {
-    STARTER("2개의 테마를 등록할 수 있어요", 19900, 9900),
-    PRO("5개의 테마를 등록할 수 있어요", 29900, 14900),
-    ENTERPRISE("8개의 테마를 등록할 수 있어요", 39900, 19900);
+public enum SubscriptionPlan implements EnumModel {
+    MINI("2개의 테마를 등록할 수 있어요", 19900, 9900),
+    MEDIUM("5개의 테마를 등록할 수 있어요", 29900, 14900),
+    LARGE("8개의 테마를 등록할 수 있어요", 39900, 19900);
 
     private final String description;
     private final Integer originPrice;
     private final Integer sellPrice;
+
+    SubscriptionPlan(String description, Integer originPrice, Integer sellPrice) {
+        this.description = description;
+        this.originPrice = originPrice;
+        this.sellPrice = sellPrice;
+    }
+
+    @Override
+    public String getKey() {
+        return name();
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    @Override
+    public Integer getOriginPrice() {
+        return originPrice;
+    }
+
+    @Override
+    public Integer getSellPrice() {
+        return sellPrice;
+    }
+
 }

src/main/java/com/nextroom/nextRoomServer/enums/SubscriptionStatus.java

@@ -1,17 +1,25 @@
 package com.nextroom.nextRoomServer.enums;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
 public enum SubscriptionStatus {
-    SUBSCRIPTION_RECOVERED, // 정기 결제가 계정 보류에서 복구되었습니다.
-    SUBSCRIPTION_RENEWED, // 활성 정기 결제가 갱신되었습니다.
-    SUBSCRIPTION_CANCELED, // 정기 결제가 자발적으로 또는 비자발적으로 취소되었습니다. 자발적 취소의 경우 사용자가 취소할 때 전송됩니다.
-    SUBSCRIPTION_PURCHASED, // 새로운 정기 결제가 구매되었습니다.
-    SUBSCRIPTION_ON_HOLD, // 정기 결제가 계정 보류 상태가 되었습니다(사용 설정된 경우).
-    SUBSCRIPTION_IN_GRACE_PERIOD, // 정기 결제가 유예 기간 상태로 전환되었습니다(사용 설정된 경우).
-    SUBSCRIPTION_RESTARTED, // 사용자가 Play > 계정 > 정기 결제에서 정기 결제를 복원했습니다. 정기 결제가 취소되었지만 사용자가 복원할 때 아직 만료되지 않았습니다. 자세한 내용은 복원을 참고하세요.
-    SUBSCRIPTION_PRICE_CHANGE_CONFIRMED, // 사용자가 정기 결제 가격 변경을 확인했습니다.
-    SUBSCRIPTION_DEFERRED, // 구독 갱신 기한이 연장되었습니다.
-    SUBSCRIPTION_PAUSED, // 구독이 일시중지되었습니다.
-    SUBSCRIPTION_PAUSE_SCHEDULE_CHANGED, // 정기 결제 일시중지 일정이 변경되었습니다.
-    SUBSCRIPTION_REVOKED, // 정기 결제가 만료 시간 전에 사용자에 의해 취소되었습니다.
-    SUBSCRIPTION_EXPIRED // 정기 결제가 만료되었습니다.
+    SUBSCRIPTION_RECOVERED(1), // 정기 결제가 계정 보류에서 복구되었습니다.
+    SUBSCRIPTION_RENEWED(2), // 활성 정기 결제가 갱신되었습니다.
+    SUBSCRIPTION_CANCELED(3), // 정기 결제가 자발적으로 또는 비자발적으로 취소되었습니다. 자발적 취소의 경우 사용자가 취소할 때 전송됩니다.
+    SUBSCRIPTION_PURCHASED(4), // 새로운 정기 결제가 구매되었습니다.
+    SUBSCRIPTION_ON_HOLD(5), // 정기 결제가 계정 보류 상태가 되었습니다(사용 설정된 경우).
+    SUBSCRIPTION_IN_GRACE_PERIOD(6), // 정기 결제가 유예 기간 상태로 전환되었습니다(사용 설정된 경우).
+    SUBSCRIPTION_RESTARTED(
+        7), // 사용자가 Play > 계정 > 정기 결제에서 정기 결제를 복원했습니다. 정기 결제가 취소되었지만 사용자가 복원할 때 아직 만료되지 않았습니다. 자세한 내용은 복원을 참고하세요.
+    SUBSCRIPTION_PRICE_CHANGE_CONFIRMED(8), // 사용자가 정기 결제 가격 변경을 확인했습니다.
+    SUBSCRIPTION_DEFERRED(9), // 구독 갱신 기한이 연장되었습니다.
+    SUBSCRIPTION_PAUSED(10), // 구독이 일시중지되었습니다.
+    SUBSCRIPTION_PAUSE_SCHEDULE_CHANGED(11), // 정기 결제 일시중지 일정이 변경되었습니다.
+    SUBSCRIPTION_REVOKED(12), // 정기 결제가 만료 시간 전에 사용자에 의해 취소되었습니다.
+    SUBSCRIPTION_EXPIRED(13); // 정기 결제가 만료되었습니다.
+
+    private final Integer status;
 }

src/main/java/com/nextroom/nextRoomServer/enums/UserStatus.java

@@ -0,0 +1,16 @@
+package com.nextroom.nextRoomServer.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum UserStatus {
+    FREE("무료 체험"),
+    HOLD("유예 기간"),
+    EXPIRATION("유예 기간 만료"),
+    SUBSCRIPTION("구독"),
+    SUBSCRIPTION_EXPIRATION("구독 만료");
+
+    private final String status;
+}

src/main/java/com/nextroom/nextRoomServer/repository/SubscriptionRepository.java

@@ -0,0 +1,11 @@
+package com.nextroom.nextRoomServer.repository;
+
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.nextroom.nextRoomServer.domain.Subscription;
+
+public interface SubscriptionRepository extends JpaRepository<Subscription, Long> {
+    Optional<Subscription> findByShopId(Long id);
+}