Skip to content

Commit 2f23ca1

Browse files
authored
Merge pull request #16 from Kimjipang/round08
Round08
2 parents 70ffb3f + 06ec711 commit 2f23ca1

8 files changed

Lines changed: 16 additions & 42 deletions

File tree

apps/commerce-api/src/main/java/com/loopers/application/event/payment/PaymentEventHandler.java

Lines changed: 0 additions & 9 deletions
This file was deleted.

apps/commerce-api/src/main/java/com/loopers/application/payment/PaymentFacade.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@ public PaymentV1Dto.TransactionResponse requestPayment(String userId, PaymentV1D
2424
PaymentV1Dto.PaymentRequest paymentRequest = new PaymentV1Dto.PaymentRequest(
2525
userId,
2626
pgPaymentRequest.orderId(),
27-
response.transactionKey(),
28-
PaymentStatus.PENDING
27+
response.transactionKey()
2928
);
3029

31-
Payment payment = Payment.create(paymentRequest);
30+
Payment payment = Payment.create(
31+
paymentRequest.userId(),
32+
paymentRequest.orderNo(),
33+
paymentRequest.transactionKey(),
34+
PaymentStatus.PENDING
35+
);
3236
paymentRepository.save(payment);
3337

3438
return response;

apps/commerce-api/src/main/java/com/loopers/application/product/ProductFacade.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import com.loopers.domain.outbox.OutboxRepository;
88
import com.loopers.domain.product.Product;
99
import com.loopers.domain.product.ProductRepository;
10-
import com.loopers.infrastructure.product.ProductViewKafkaProducer;
1110
import com.loopers.interfaces.api.product.ProductV1Dto;
1211
import com.loopers.support.error.CoreException;
1312
import com.loopers.support.error.ErrorType;
@@ -26,7 +25,6 @@ public class ProductFacade {
2625
private final ProductRepository productRepository;
2726
private final BrandRepository brandRepository;
2827
private final OutboxRepository outBoxRepository;
29-
private final ProductViewKafkaProducer kafkaProducer;
3028

3129
@Transactional
3230
public ProductInfo registerProduct(ProductV1Dto.ProductRequest request) {

apps/commerce-api/src/main/java/com/loopers/domain/payment/Payment.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.loopers.domain.payment;
22

33
import com.loopers.domain.BaseEntity;
4-
import com.loopers.interfaces.api.payment.PaymentV1Dto;
54
import jakarta.persistence.Column;
65
import jakarta.persistence.Entity;
76
import jakarta.persistence.EnumType;
@@ -37,11 +36,11 @@ public Payment(String userId, String orderNo, String transactionKey, PaymentStat
3736
this.status = status;
3837
}
3938

40-
public static Payment create(PaymentV1Dto.PaymentRequest request) {
39+
public static Payment create(String userId, String orderNo, String transactionKey, PaymentStatus status) {
4140
return new Payment(
42-
request.userId(),
43-
request.orderNo(),
44-
request.transactionKey(),
41+
userId,
42+
orderNo,
43+
transactionKey,
4544
PaymentStatus.PENDING
4645
);
4746
}

apps/commerce-api/src/main/java/com/loopers/infrastructure/product/ProductViewKafkaProducer.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

apps/commerce-api/src/main/java/com/loopers/interfaces/api/payment/PaymentV1Dto.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.loopers.interfaces.api.payment;
22

3-
4-
import com.loopers.domain.payment.PaymentStatus;
5-
63
public class PaymentV1Dto {
74
public record TransactionResponse(
85
String transactionKey,
@@ -30,6 +27,6 @@ public enum CardTypeDto {
3027
HYUNDAI
3128
}
3229

33-
public record PaymentRequest(String userId, String orderNo, String transactionKey, PaymentStatus status) {
30+
public record PaymentRequest(String userId, String orderNo, String transactionKey) {
3431
}
3532
}

apps/commerce-api/src/main/resources/application.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ resilience4j:
4343
circuitbreaker:
4444
instances:
4545
pgCircuit:
46-
sliding-window-size: 5
47-
failure-rate-threshold: 20 # 실패율이 50% 넘으면 Open
46+
sliding-window-size: 10
47+
failure-rate-threshold: 50 # 실패율이 50% 넘으면 Open
4848
wait-duration-in-open-state: 60s # Open 상태 유지 시간
4949
permitted-number-of-calls-in-half-open-state: 2
5050
slow-call-duration-threshold: 2s

apps/commerce-streamer/src/main/java/com/loopers/interfaces/consumer/KafkaOutboxConsumer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.springframework.kafka.annotation.KafkaListener;
1313
import org.springframework.kafka.support.Acknowledgment;
1414
import org.springframework.stereotype.Component;
15+
import org.springframework.transaction.annotation.Transactional;
1516

1617
import java.util.List;
1718

@@ -25,6 +26,7 @@ public class KafkaOutboxConsumer {
2526
topics = {"product-viewed"},
2627
containerFactory = KafkaConfig.BATCH_LISTENER
2728
)
29+
@Transactional
2830
public void demoListener(
2931
List<ConsumerRecord<String, String>> messages,
3032
Acknowledgment acknowledgment

0 commit comments

Comments
 (0)