diff --git a/src/main/java/com/dangsim/common/config/SecurityConfig.java b/src/main/java/com/dangsim/common/config/SecurityConfig.java index 643a563..65b8419 100644 --- a/src/main/java/com/dangsim/common/config/SecurityConfig.java +++ b/src/main/java/com/dangsim/common/config/SecurityConfig.java @@ -63,7 +63,8 @@ public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration configuration = new CorsConfiguration(); configuration.setAllowedOrigins(List.of( "http://localhost:3000", - "https://dangsim-fe.pages.dev", "/ws/**" + "https://dangsim-fe.pages.dev", + "/ws/**" )); configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH")); configuration.setAllowedHeaders(List.of("*")); diff --git a/src/main/java/com/dangsim/pg/controller/PaymentGatewayController.java b/src/main/java/com/dangsim/pg/controller/PaymentGatewayController.java index 162cfd4..768bbba 100644 --- a/src/main/java/com/dangsim/pg/controller/PaymentGatewayController.java +++ b/src/main/java/com/dangsim/pg/controller/PaymentGatewayController.java @@ -1,6 +1,7 @@ package com.dangsim.pg.controller; 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.RestController; diff --git a/src/main/java/com/dangsim/pg/service/PaymentGatewayService.java b/src/main/java/com/dangsim/pg/service/PaymentGatewayService.java index 521e875..42ea11a 100644 --- a/src/main/java/com/dangsim/pg/service/PaymentGatewayService.java +++ b/src/main/java/com/dangsim/pg/service/PaymentGatewayService.java @@ -6,6 +6,8 @@ import java.util.HashMap; import java.util.Map; +import com.dangsim.payment.entity.PaymentStatus; +import com.dangsim.task.entity.TaskStatus; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -36,6 +38,7 @@ @RequiredArgsConstructor public class PaymentGatewayService { + @Value("${portone.imp_key}") private String apiKey; diff --git a/src/test/java/com/dangsim/task/service/TaskServiceTest.java b/src/test/java/com/dangsim/task/service/TaskServiceTest.java index 78da338..be5fb75 100644 --- a/src/test/java/com/dangsim/task/service/TaskServiceTest.java +++ b/src/test/java/com/dangsim/task/service/TaskServiceTest.java @@ -13,6 +13,9 @@ import java.util.List; import java.util.Optional; +import com.dangsim.payment.entity.PaymentStatus; +import com.dangsim.pg.repository.PaymentGatewayRepository; +import com.dangsim.pg.service.PaymentGatewayService; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -325,6 +328,7 @@ void updatePaymentAndTaskStatus_successfullyUpdatesStatuses() { User requester = UserFixture.user(Role.USER, BigDecimal.ZERO); ReflectionTestUtils.setField(requester, "id", 1L); + User performer = UserFixture.user(Role.USER, BigDecimal.ZERO); ReflectionTestUtils.setField(requester, "id", 2L); @@ -334,11 +338,12 @@ void updatePaymentAndTaskStatus_successfullyUpdatesStatuses() { Payment payment = PaymentFixture.payment(task, requester, performer); given(paymentRepository.findByMerchantUid(merchantUid)).willReturn(Optional.of(payment)); - + // when paymentGatewayService.updatePaymentAndTaskStatus(merchantUid); // then + assertThat(payment.getStatus()).isEqualTo(PAYMENT_SUCCESSES); }