refactor: Subscription 엔티티 수정 및 Mypage의 구독 정보 조회 기능 리팩토링

Author: InJunKangW

src/main/java/com/example/log4u/domain/subscription/PaymentProvider.java

@@ -0,0 +1,7 @@
+package com.example.log4u.domain.subscription;
+
+public enum PaymentProvider {
+	TOSS,
+	KAKAO,
+	NAVER
+}

src/main/java/com/example/log4u/domain/subscription/PaymentStatus.java

@@ -0,0 +1,7 @@
+package com.example.log4u.domain.subscription;
+
+public enum PaymentStatus {
+	SUCCESS,   // 결제 완료
+	FAILED,    // 결제 실패
+	REFUNDED   // 환불 완료
+}

src/main/java/com/example/log4u/domain/subscription/dto/SubscriptionResponseDto.java

@@ -2,6 +2,8 @@
 
 import java.time.LocalDateTime;
 
+import com.example.log4u.domain.subscription.PaymentProvider;
+
 import jakarta.annotation.Nullable;
 import lombok.Builder;
 
@@ -10,9 +12,9 @@ public record SubscriptionResponseDto(
 	boolean isSubscriptionActive,
 
 	@Nullable
-	LocalDateTime startDate,
+	PaymentProvider paymentProvider,
 
 	@Nullable
-	LocalDateTime endDate
+	LocalDateTime startDate
 ) {
 }

src/main/java/com/example/log4u/domain/subscription/entity/Subscription.java

@@ -1,12 +1,13 @@
 package com.example.log4u.domain.subscription.entity;
 
-import java.time.LocalDateTime;
-
 import com.example.log4u.common.entity.BaseEntity;
+import com.example.log4u.domain.subscription.PaymentProvider;
+import com.example.log4u.domain.subscription.PaymentStatus;
 
-import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -22,15 +23,25 @@
 @AllArgsConstructor(access = AccessLevel.PACKAGE)
 
 @Entity
-@AttributeOverride(name = "createdAt", column = @Column(name = "START_TIME"))
 public class Subscription extends BaseEntity {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 
+	@Column(nullable = false)
 	private Long userId;
 
-	private Long price;
+	@Column(nullable = false)
+	@Enumerated(EnumType.STRING)
+	private PaymentProvider paymentProvider;
+
+	@Column(nullable = false)
+	private Long amount;
+
+	@Column(nullable = false, unique = true)
+	private String paymentKey;
 
-	private LocalDateTime endTime;
+	@Column(nullable = false)
+	@Enumerated(EnumType.STRING)
+	private PaymentStatus paymentStatus;
 }

src/main/java/com/example/log4u/domain/subscription/repository/SubscriptionRepository.java

@@ -1,13 +1,16 @@
 package com.example.log4u.domain.subscription.repository;
 
 import java.time.LocalDateTime;
-import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import com.example.log4u.domain.subscription.PaymentStatus;
 import com.example.log4u.domain.subscription.entity.Subscription;
 
 public interface SubscriptionRepository extends JpaRepository<Subscription, Long> {
-	List<Subscription> findByUserIdAndEndTimeAfter(Long userId, LocalDateTime now);
+	Optional<Subscription> findByUserIdAndCreatedAtBeforeAndPaymentStatusOrderByCreatedAtDesc(Long userId,
+		LocalDateTime now,
+		PaymentStatus paymentStatus);
 }
 

src/main/java/com/example/log4u/domain/user/mypage/service/MyPageService.java

@@ -1,7 +1,7 @@
 package com.example.log4u.domain.user.mypage.service;
 
 import java.time.LocalDateTime;
-import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Slice;
@@ -12,6 +12,7 @@
 import com.example.log4u.domain.diary.dto.DiaryResponseDto;
 import com.example.log4u.domain.diary.service.DiaryService;
 import com.example.log4u.domain.follow.repository.FollowQuerydsl;
+import com.example.log4u.domain.subscription.PaymentStatus;
 import com.example.log4u.domain.subscription.dto.SubscriptionResponseDto;
 import com.example.log4u.domain.subscription.entity.Subscription;
 import com.example.log4u.domain.subscription.repository.SubscriptionRepository;
@@ -66,18 +67,20 @@ public PageResponse<UserThumbnailResponseDto> getMyFollowings(Long userId, Long
 
 	@Transactional(readOnly = true)
 	public SubscriptionResponseDto getMySubscription(Long userId) {
-		List<Subscription> subscriptions = subscriptionRepository.findByUserIdAndEndTimeAfter(userId,
-			LocalDateTime.now());
-		if (subscriptions.isEmpty()) {
+		Optional<Subscription> optionalSubscription = subscriptionRepository
+			.findByUserIdAndCreatedAtBeforeAndPaymentStatusOrderByCreatedAtDesc(
+				userId,
+				LocalDateTime.now(), PaymentStatus.SUCCESS);
+		if (optionalSubscription.isEmpty()) {
 			return SubscriptionResponseDto.builder()
 				.isSubscriptionActive(false)
 				.build();
 		} else {
-			Subscription subscription = subscriptions.getFirst();
+			Subscription subscription = optionalSubscription.get();
 			return SubscriptionResponseDto.builder()
 				.isSubscriptionActive(true)
+				.paymentProvider(subscription.getPaymentProvider())
 				.startDate(subscription.getCreatedAt())
-				.endDate(subscription.getEndTime())
 				.build();
 		}
 	}