Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/main/java/in/koreatech/payment/KoinPaymentApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,25 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;

@SpringBootApplication
@ConfigurationPropertiesScan
@SpringBootApplication(
scanBasePackages = {
"in.koreatech.payment",
"in.koreatech.koin"
}
)
@EnableJpaRepositories(basePackages = {
"in.koreatech.payment",
"in.koreatech.koin"
})
@EntityScan(basePackages = {
"in.koreatech.payment",
"in.koreatech.koin"
})
public class KoinPaymentApplication {

public static void main(String[] args) {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
package in.koreatech.payment.dto.request;

import static com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.NOT_REQUIRED;
import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;

import com.fasterxml.jackson.databind.annotation.JsonNaming;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

@JsonNaming(value = SnakeCaseStrategy.class)
public record TemporaryTakeoutPaymentSaveRequest(
@Schema(description = "연락처", example = "01012345678", requiredMode = REQUIRED)
@NotBlank(message = "연락처는 필수 입력사항입니다.")
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/in/koreatech/payment/service/TossService.java
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public String createTemporaryTakeoutPayment(String accessToken, TemporaryTakeout
return orderId;
}

@Transactional(transactionManager = "koinTransactionManager")
@Transactional
public PaymentConfirmResponse confirmPayment(String accessToken, String paymentKey, String orderId, Integer amount) {
Integer userId = jwtTokenResolver.getUserId(accessToken);
User user = userRepository.getById(userId);
Expand Down Expand Up @@ -170,7 +170,7 @@ public PaymentConfirmResponse confirmPayment(String accessToken, String paymentK
return response;
}

@Transactional(transactionManager = "koinTransactionManager")
@Transactional
public List<PaymentCancel> cancelPayment(String accessToken, String paymentKey, String cancelReason) {
Integer userId = jwtTokenResolver.getUserId(accessToken);
User user = userRepository.getById(userId);
Expand Down
Loading