diff --git a/.gradle/8.4/checksums/checksums.lock b/.gradle/8.4/checksums/checksums.lock index 4aaf664..4b1cc6c 100644 Binary files a/.gradle/8.4/checksums/checksums.lock and b/.gradle/8.4/checksums/checksums.lock differ diff --git a/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock b/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock index 53f1883..5a46d6d 100644 Binary files a/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock and b/.gradle/8.4/dependencies-accessors/dependencies-accessors.lock differ diff --git a/.gradle/8.4/executionHistory/executionHistory.bin b/.gradle/8.4/executionHistory/executionHistory.bin index ef25cfa..958cbba 100644 Binary files a/.gradle/8.4/executionHistory/executionHistory.bin and b/.gradle/8.4/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.4/executionHistory/executionHistory.lock b/.gradle/8.4/executionHistory/executionHistory.lock index f0bed89..10677fd 100644 Binary files a/.gradle/8.4/executionHistory/executionHistory.lock and b/.gradle/8.4/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.4/fileHashes/fileHashes.bin b/.gradle/8.4/fileHashes/fileHashes.bin index f23353c..cbcdb5f 100644 Binary files a/.gradle/8.4/fileHashes/fileHashes.bin and b/.gradle/8.4/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.4/fileHashes/fileHashes.lock b/.gradle/8.4/fileHashes/fileHashes.lock index e6ad2d4..7f47bcf 100644 Binary files a/.gradle/8.4/fileHashes/fileHashes.lock and b/.gradle/8.4/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.4/fileHashes/resourceHashesCache.bin b/.gradle/8.4/fileHashes/resourceHashesCache.bin index 21c1601..4396a36 100644 Binary files a/.gradle/8.4/fileHashes/resourceHashesCache.bin and b/.gradle/8.4/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 7ef4ede..921420d 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/member/build/classes/java/main/com/unicorn/lifesub/member/config/InitialDataLoader.class b/member/build/classes/java/main/com/unicorn/lifesub/member/config/DataLoader.class similarity index 72% rename from member/build/classes/java/main/com/unicorn/lifesub/member/config/InitialDataLoader.class rename to member/build/classes/java/main/com/unicorn/lifesub/member/config/DataLoader.class index 231b63a..d5967c9 100644 Binary files a/member/build/classes/java/main/com/unicorn/lifesub/member/config/InitialDataLoader.class and b/member/build/classes/java/main/com/unicorn/lifesub/member/config/DataLoader.class differ diff --git a/member/build/resources/main/application.yml b/member/build/resources/main/application.yml index ac97018..0964d2b 100644 --- a/member/build/resources/main/application.yml +++ b/member/build/resources/main/application.yml @@ -25,7 +25,7 @@ jwt: access-token-validity: ${JWT_ACCESS_TOKEN_VALIDITY:3600000} refresh-token-validity: ${JWT_REFRESH_TOKEN_VALIDITY:86400000} -allowed-origins: ${ALLOWED_ORIGINS:*} +allowed-origins: ${ALLOWED_ORIGINS:http://localhost:3000} springdoc: swagger-ui: diff --git a/member/build/tmp/compileJava/previous-compilation-data.bin b/member/build/tmp/compileJava/previous-compilation-data.bin index 780e0a6..89a38b4 100644 Binary files a/member/build/tmp/compileJava/previous-compilation-data.bin and b/member/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/member/src/main/resources/application.yml b/member/src/main/resources/application.yml index ac97018..0964d2b 100644 --- a/member/src/main/resources/application.yml +++ b/member/src/main/resources/application.yml @@ -25,7 +25,7 @@ jwt: access-token-validity: ${JWT_ACCESS_TOKEN_VALIDITY:3600000} refresh-token-validity: ${JWT_REFRESH_TOKEN_VALIDITY:86400000} -allowed-origins: ${ALLOWED_ORIGINS:*} +allowed-origins: ${ALLOWED_ORIGINS:http://localhost:3000} springdoc: swagger-ui: diff --git a/mysub-biz/build/classes/java/main/com/unicorn/lifesub/mysub/biz/dto/MySubResponse$MySubResponseBuilder.class b/mysub-biz/build/classes/java/main/com/unicorn/lifesub/mysub/biz/dto/MySubResponse$MySubResponseBuilder.class index e0d70b9..cadc158 100644 Binary files a/mysub-biz/build/classes/java/main/com/unicorn/lifesub/mysub/biz/dto/MySubResponse$MySubResponseBuilder.class and b/mysub-biz/build/classes/java/main/com/unicorn/lifesub/mysub/biz/dto/MySubResponse$MySubResponseBuilder.class differ diff --git a/mysub-biz/build/classes/java/main/com/unicorn/lifesub/mysub/biz/dto/MySubResponse.class b/mysub-biz/build/classes/java/main/com/unicorn/lifesub/mysub/biz/dto/MySubResponse.class index e511c24..147a8d1 100644 Binary files a/mysub-biz/build/classes/java/main/com/unicorn/lifesub/mysub/biz/dto/MySubResponse.class and b/mysub-biz/build/classes/java/main/com/unicorn/lifesub/mysub/biz/dto/MySubResponse.class differ diff --git a/mysub-biz/build/classes/java/main/com/unicorn/lifesub/mysub/biz/service/MySubscriptionService.class b/mysub-biz/build/classes/java/main/com/unicorn/lifesub/mysub/biz/service/MySubscriptionService.class index 6123599..0014d6e 100644 Binary files a/mysub-biz/build/classes/java/main/com/unicorn/lifesub/mysub/biz/service/MySubscriptionService.class and b/mysub-biz/build/classes/java/main/com/unicorn/lifesub/mysub/biz/service/MySubscriptionService.class differ diff --git a/mysub-biz/build/libs/mysub-biz-1.0.0-plain.jar b/mysub-biz/build/libs/mysub-biz-1.0.0-plain.jar index ed646de..9d86243 100644 Binary files a/mysub-biz/build/libs/mysub-biz-1.0.0-plain.jar and b/mysub-biz/build/libs/mysub-biz-1.0.0-plain.jar differ diff --git a/mysub-biz/build/tmp/compileJava/compileTransaction/stash-dir/MySubscriptionService.class.uniqueId0 b/mysub-biz/build/tmp/compileJava/compileTransaction/stash-dir/MySubscriptionService.class.uniqueId0 index 399fd64..672ea76 100644 Binary files a/mysub-biz/build/tmp/compileJava/compileTransaction/stash-dir/MySubscriptionService.class.uniqueId0 and b/mysub-biz/build/tmp/compileJava/compileTransaction/stash-dir/MySubscriptionService.class.uniqueId0 differ diff --git a/mysub-biz/build/tmp/compileJava/previous-compilation-data.bin b/mysub-biz/build/tmp/compileJava/previous-compilation-data.bin index 2de2a91..eea369b 100644 Binary files a/mysub-biz/build/tmp/compileJava/previous-compilation-data.bin and b/mysub-biz/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/mysub-biz/src/main/java/com/unicorn/lifesub/mysub/biz/dto/MySubResponse.java b/mysub-biz/src/main/java/com/unicorn/lifesub/mysub/biz/dto/MySubResponse.java index 45cce88..043ca65 100644 --- a/mysub-biz/src/main/java/com/unicorn/lifesub/mysub/biz/dto/MySubResponse.java +++ b/mysub-biz/src/main/java/com/unicorn/lifesub/mysub/biz/dto/MySubResponse.java @@ -6,6 +6,7 @@ import lombok.Getter; @Getter @Builder public class MySubResponse { + private final Long id; private final String serviceName; private final String logoUrl; } diff --git a/mysub-biz/src/main/java/com/unicorn/lifesub/mysub/biz/service/MySubscriptionService.java b/mysub-biz/src/main/java/com/unicorn/lifesub/mysub/biz/service/MySubscriptionService.java index 4b5ef2e..737d43a 100644 --- a/mysub-biz/src/main/java/com/unicorn/lifesub/mysub/biz/service/MySubscriptionService.java +++ b/mysub-biz/src/main/java/com/unicorn/lifesub/mysub/biz/service/MySubscriptionService.java @@ -9,6 +9,7 @@ import com.unicorn.lifesub.mysub.biz.usecase.out.*; import com.unicorn.lifesub.common.exception.BusinessException; import com.unicorn.lifesub.common.exception.ErrorCode; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -48,6 +49,7 @@ public class MySubscriptionService implements public List getMySubscriptions(String userId) { return mySubscriptionReader.findByUserId(userId).stream() .map(subscription -> MySubResponse.builder() + .id(subscription.getSubscription().getId()) .serviceName(subscription.getSubscription().getName()) .logoUrl(subscription.getSubscription().getLogoUrl()) .build()) @@ -111,9 +113,13 @@ public class MySubscriptionService implements .collect(Collectors.toList()); } + @Value("${fee.level.collector}") + private long collectorThreshold; + @Value("${fee.level.addict}") + private long addictThreshold; private String calculateFeeLevel(long totalFee) { - if (totalFee < 100000) return FeeLevel.LIKFER.getFeeLevel(); - if (totalFee < 200000) return FeeLevel.COLLECTOR.getFeeLevel(); + if (totalFee < collectorThreshold) return FeeLevel.LIKFER.getFeeLevel(); + if (totalFee < addictThreshold) return FeeLevel.COLLECTOR.getFeeLevel(); return FeeLevel.ADDICT.getFeeLevel(); } } \ No newline at end of file diff --git a/mysub-infra/build/classes/java/main/com/unicorn/lifesub/mysub/infra/gateway/MySubscriptionGateway.class b/mysub-infra/build/classes/java/main/com/unicorn/lifesub/mysub/infra/gateway/MySubscriptionGateway.class index be8c4c6..70d4bc8 100644 Binary files a/mysub-infra/build/classes/java/main/com/unicorn/lifesub/mysub/infra/gateway/MySubscriptionGateway.class and b/mysub-infra/build/classes/java/main/com/unicorn/lifesub/mysub/infra/gateway/MySubscriptionGateway.class differ diff --git a/mysub-infra/build/classes/java/main/com/unicorn/lifesub/mysub/infra/gateway/repository/MySubscriptionJpaRepository.class b/mysub-infra/build/classes/java/main/com/unicorn/lifesub/mysub/infra/gateway/repository/MySubscriptionJpaRepository.class index 3b8713d..f0b28ed 100644 Binary files a/mysub-infra/build/classes/java/main/com/unicorn/lifesub/mysub/infra/gateway/repository/MySubscriptionJpaRepository.class and b/mysub-infra/build/classes/java/main/com/unicorn/lifesub/mysub/infra/gateway/repository/MySubscriptionJpaRepository.class differ diff --git a/mysub-infra/build/resources/main/application.yml b/mysub-infra/build/resources/main/application.yml index 7f58364..efcb751 100644 --- a/mysub-infra/build/resources/main/application.yml +++ b/mysub-infra/build/resources/main/application.yml @@ -22,7 +22,13 @@ spring: jwt: secret-key: ${JWT_SECRET_KEY:8O2HQ13etL2BWZvYOiWsJ5uWFoLi6NBUG8divYVoCgtHVvlk3dqRksMl16toztDUeBTSIuOOPvHIrYq11G2BwQ} -allowed-origins: ${ALLOWED_ORIGINS:*} +allowed-origins: ${ALLOWED_ORIGINS:http://localhost:3000} + +# 총구독료에 따른 구독서비스 사용 레벨 기준 금액 +fee: + level: + collector: ${FEE_LEVEL_COLLECTOR:50000} + addict: ${FEE_LEVEL_ADDICT:100000} springdoc: swagger-ui: diff --git a/mysub-infra/build/tmp/compileJava/previous-compilation-data.bin b/mysub-infra/build/tmp/compileJava/previous-compilation-data.bin index 248e39d..5dd08ba 100644 Binary files a/mysub-infra/build/tmp/compileJava/previous-compilation-data.bin and b/mysub-infra/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/mysub-infra/src/main/java/com/unicorn/lifesub/mysub/infra/gateway/MySubscriptionGateway.java b/mysub-infra/src/main/java/com/unicorn/lifesub/mysub/infra/gateway/MySubscriptionGateway.java index 76db980..df54676 100644 --- a/mysub-infra/src/main/java/com/unicorn/lifesub/mysub/infra/gateway/MySubscriptionGateway.java +++ b/mysub-infra/src/main/java/com/unicorn/lifesub/mysub/infra/gateway/MySubscriptionGateway.java @@ -11,6 +11,7 @@ import com.unicorn.lifesub.mysub.infra.gateway.repository.MySubscriptionJpaRepos import com.unicorn.lifesub.mysub.infra.gateway.repository.SubscriptionJpaRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Optional; @@ -49,7 +50,10 @@ public class MySubscriptionGateway implements MySubscriptionReader, MySubscripti } @Override - public void delete(Long id) { - mySubscriptionRepository.deleteById(id); + @Transactional + public void delete(Long subscriptionId) { + MySubscriptionEntity entity = mySubscriptionRepository.findBySubscription_Id(subscriptionId) + .orElseThrow(() -> new BusinessException(ErrorCode.SUBSCRIPTION_NOT_FOUND)); + mySubscriptionRepository.delete(entity); } } diff --git a/mysub-infra/src/main/java/com/unicorn/lifesub/mysub/infra/gateway/repository/MySubscriptionJpaRepository.java b/mysub-infra/src/main/java/com/unicorn/lifesub/mysub/infra/gateway/repository/MySubscriptionJpaRepository.java index 2df4c65..511a68b 100644 --- a/mysub-infra/src/main/java/com/unicorn/lifesub/mysub/infra/gateway/repository/MySubscriptionJpaRepository.java +++ b/mysub-infra/src/main/java/com/unicorn/lifesub/mysub/infra/gateway/repository/MySubscriptionJpaRepository.java @@ -3,7 +3,9 @@ package com.unicorn.lifesub.mysub.infra.gateway.repository; import com.unicorn.lifesub.mysub.infra.gateway.entity.MySubscriptionEntity; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; +import java.util.Optional; public interface MySubscriptionJpaRepository extends JpaRepository { List findByUserId(String userId); + Optional findBySubscription_Id(Long subscriptionId); } diff --git a/mysub-infra/src/main/resources/application.yml b/mysub-infra/src/main/resources/application.yml index 7f58364..efcb751 100644 --- a/mysub-infra/src/main/resources/application.yml +++ b/mysub-infra/src/main/resources/application.yml @@ -22,7 +22,13 @@ spring: jwt: secret-key: ${JWT_SECRET_KEY:8O2HQ13etL2BWZvYOiWsJ5uWFoLi6NBUG8divYVoCgtHVvlk3dqRksMl16toztDUeBTSIuOOPvHIrYq11G2BwQ} -allowed-origins: ${ALLOWED_ORIGINS:*} +allowed-origins: ${ALLOWED_ORIGINS:http://localhost:3000} + +# 총구독료에 따른 구독서비스 사용 레벨 기준 금액 +fee: + level: + collector: ${FEE_LEVEL_COLLECTOR:50000} + addict: ${FEE_LEVEL_ADDICT:100000} springdoc: swagger-ui: diff --git a/recommend/build/resources/main/application.yml b/recommend/build/resources/main/application.yml index c93371f..72a46ea 100644 --- a/recommend/build/resources/main/application.yml +++ b/recommend/build/resources/main/application.yml @@ -22,7 +22,7 @@ spring: jwt: secret-key: ${JWT_SECRET_KEY:8O2HQ13etL2BWZvYOiWsJ5uWFoLi6NBUG8divYVoCgtHVvlk3dqRksMl16toztDUeBTSIuOOPvHIrYq11G2BwQ} -allowed-origins: ${ALLOWED_ORIGINS:*} +allowed-origins: ${ALLOWED_ORIGINS:http://localhost:3000} springdoc: swagger-ui: diff --git a/recommend/src/main/resources/application.yml b/recommend/src/main/resources/application.yml index c93371f..72a46ea 100644 --- a/recommend/src/main/resources/application.yml +++ b/recommend/src/main/resources/application.yml @@ -22,7 +22,7 @@ spring: jwt: secret-key: ${JWT_SECRET_KEY:8O2HQ13etL2BWZvYOiWsJ5uWFoLi6NBUG8divYVoCgtHVvlk3dqRksMl16toztDUeBTSIuOOPvHIrYq11G2BwQ} -allowed-origins: ${ALLOWED_ORIGINS:*} +allowed-origins: ${ALLOWED_ORIGINS:http://localhost:3000} springdoc: swagger-ui: