refactor: 코드 정렬

server/src/main/java/com/ticketing/server/global/exception/ErrorCode.java

@@ -24,8 +24,6 @@ public enum ErrorCode {
 	BAD_REQUEST_PAYMENT_COMPLETE(BAD_REQUEST, "처리할 결제 정보가 존재하지 않습니다."),
 	BAD_REQUEST_PAYMENT_READY(BAD_REQUEST, "이미 진행 중인 결제가 존재합니다."),
 	BAD_REQUEST_PAYMENT_CANCEL(BAD_REQUEST, "취소할 티켓이 존재하지 않습니다."),
-	NOT_REFUNDABLE_TIME(BAD_REQUEST, "환불이 가능한 시간이 지났습니다."),
-	NOT_REFUNDABLE_SEAT(BAD_REQUEST, "환불할 수 있는 좌석이 아닙니다."),
 
 	/* 403 FORBIDDEN : 접근 권한 제한 */
 	VALID_USER_ID(FORBIDDEN, "해당 정보에 접근 권한이 존재하지 않습니다."),
@@ -87,14 +85,6 @@ public enum ErrorCode {
 		throw new TicketingException(BAD_REQUEST_PAYMENT_CANCEL);
 	}
 
-	public static TicketingException throwNotRefundableTime() {
-		throw new TicketingException(NOT_REFUNDABLE_TIME);
-	}
-
-	public static TicketingException throwNotRefundableSeat() {
-		throw new TicketingException(NOT_REFUNDABLE_SEAT);
-	}
-
 	/* 403 FORBIDDEN : 접근 권한 제한 */
 	public static TicketingException throwValidUserId() {
 		throw new TicketingException(VALID_USER_ID);

server/src/main/java/com/ticketing/server/global/redis/PaymentCache.java

@@ -33,15 +33,12 @@ public class PaymentCache {
 
 	private Long paymentNumber;
 
-	private Integer totalAmount;
-
-	public PaymentCache(String email, String movieTitle, String tid, List<Long> ticketIds, Long userAlternateId, Long paymentNumber, Integer totalAmount) {
+	public PaymentCache(String email, String movieTitle, String tid, List<Long> ticketIds, Long userAlternateId, Long paymentNumber) {
 		this.email = email;
 		this.movieTitle = movieTitle;
 		this.tid = tid;
 		this.ticketIds = ticketIds;
 		this.userAlternateId = userAlternateId;
 		this.paymentNumber = paymentNumber;
-		this.totalAmount = totalAmount;
 	}
 }

server/src/main/java/com/ticketing/server/movie/application/TicketController.java

@@ -40,7 +40,7 @@ public class TicketController {
 			);
 	}
 
-	@GetMapping("/payments/{paymentId}")
+	@GetMapping("payments/{paymentId}")
 	@Secured(USER)
 	public ResponseEntity<TicketDetailsResponse> findTicketsByPaymentId(
 		@PathVariable("paymentId") @NotNull Long paymentId) {

server/src/main/java/com/ticketing/server/movie/domain/Ticket.java

@@ -3,7 +3,6 @@ package com.ticketing.server.movie.domain;
 import com.ticketing.server.global.dto.repository.AbstractEntity;
 import com.ticketing.server.global.exception.ErrorCode;
 import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
@@ -79,26 +78,6 @@ public class Ticket extends AbstractEntity {
 		}
 
 		status = TicketStatus.SALE;
-		paymentId = null;
-		return this;
-	}
-
-	public Ticket refund(LocalDateTime dateTime) {
-		long seconds = ChronoUnit.SECONDS.between(dateTime, getStartAt());
-		if (600L > seconds) {
-			throw ErrorCode.throwNotRefundableTime();
-		}
-
-		return refund();
-	}
-
-	public Ticket refund() {
-		if (!TicketStatus.SOLD.equals(status)) {
-			throw ErrorCode.throwNotRefundableSeat();
-		}
-
-		status = TicketStatus.SALE;
-		paymentId = null;
 		return this;
 	}
 

server/src/main/java/com/ticketing/server/movie/service/TicketServiceImpl.java

@@ -9,19 +9,14 @@ import com.ticketing.server.movie.domain.repository.TicketRepository;
 import com.ticketing.server.movie.service.dto.TicketDTO;
 import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
 import com.ticketing.server.movie.service.dto.TicketListDTO;
-import com.ticketing.server.movie.service.dto.TicketRefundDTO;
 import com.ticketing.server.movie.service.dto.TicketReservationDTO;
 import com.ticketing.server.movie.service.dto.TicketSoldDTO;
 import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
-import com.ticketing.server.movie.service.dto.TicketsRefundDTO;
 import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
 import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
 import com.ticketing.server.movie.service.interfaces.TicketService;
 import com.ticketing.server.payment.service.dto.TicketDetailDTO;
-import java.time.LocalDateTime;
 import java.util.List;
-import java.util.function.Function;
-import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 import javax.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
@@ -109,19 +104,6 @@ public class TicketServiceImpl implements TicketService {
 		return new TicketsCancelDTO(ticketIds);
 	}
 
-	@Override
-	@Transactional
-	public TicketsRefundDTO ticketsRefund(@NotNull Long paymentId, UnaryOperator<Ticket> refund) {
-		List<Ticket> tickets = ticketRepository.findTicketFetchJoinByPaymentId(paymentId);
-
-		List<TicketRefundDTO> refundDtoList = tickets.stream()
-			.map(refund)
-			.map(TicketRefundDTO::new)
-			.collect(Collectors.toList());
-
-		return new TicketsRefundDTO(refundDtoList);
-	}
-
 	private List<Ticket> getTicketsByInTicketIds(List<Long> ticketIds) {
 		List<Ticket> tickets = ticketRepository.findTicketFetchJoinByTicketIds(ticketIds);
 

server/src/main/java/com/ticketing/server/movie/service/dto/TicketRefundDTO.java

@@ -1,20 +0,0 @@
-package com.ticketing.server.movie.service.dto;
-
-import com.ticketing.server.movie.domain.Ticket;
-import com.ticketing.server.movie.domain.TicketStatus;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class TicketRefundDTO {
-
-	private Long ticketId;
-	private TicketStatus ticketStatus;
-
-	public TicketRefundDTO(Ticket ticket) {
-		this(ticket.getId(), ticket.getStatus());
-	}
-
-}

server/src/main/java/com/ticketing/server/movie/service/dto/TicketsRefundDTO.java

@@ -1,16 +0,0 @@
-package com.ticketing.server.movie.service.dto;
-
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class TicketsRefundDTO {
-
-	private List<TicketRefundDTO> tickets;
-
-	public TicketsRefundResponse toResponse() {
-		return new TicketsRefundResponse(tickets);
-	}
-}

server/src/main/java/com/ticketing/server/movie/service/dto/TicketsRefundResponse.java

@@ -1,21 +0,0 @@
-package com.ticketing.server.movie.service.dto;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class TicketsRefundResponse {
-
-	private final List<TicketRefundDTO> tickets;
-
-	public List<Long> getTicketIds() {
-		return tickets.stream()
-			.mapToLong(TicketRefundDTO::getTicketId)
-			.boxed()
-			.collect(Collectors.toList());
-	}
-
-}

server/src/main/java/com/ticketing/server/movie/service/interfaces/TicketService.java

@@ -1,15 +1,12 @@
 package com.ticketing.server.movie.service.interfaces;
 
 import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
-import com.ticketing.server.movie.domain.Ticket;
 import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
 import com.ticketing.server.movie.service.dto.TicketListDTO;
 import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
-import com.ticketing.server.movie.service.dto.TicketsRefundDTO;
 import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
 import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
 import java.util.List;
-import java.util.function.UnaryOperator;
 import javax.validation.constraints.NotNull;
 
 public interface TicketService {
@@ -24,6 +21,4 @@ public interface TicketService {
 
 	TicketsCancelDTO ticketCancel(@NotEmptyCollection List<Long> ticketIds);
 
-	TicketsRefundDTO ticketsRefund(@NotNull Long paymentId, UnaryOperator<Ticket> refund);
-
 }

server/src/main/java/com/ticketing/server/movie/setup/MovieSetupService.java

@@ -46,7 +46,7 @@ MovieSetupService {
 		initTheater();
 		initMovieTime();
 		initTicket();
-//		initPayment();
+		initPayment();
 	}
 
 	private void initMovie() {
@@ -125,8 +125,7 @@ MovieSetupService {
 			"T2d03c9130bf237a9700",
 			List.of(1L, 2L),
 			user.getAlternateId(),
-			124124231513245L,
-			30_000
+			124124231513245L
 		);
 
 		Payment payment = new Payment(paymentCache, PaymentType.KAKAO_PAY, PaymentStatus.SOLD, 30_000);

server/src/main/java/com/ticketing/server/payment/api/KakaoPayClient.java

@@ -3,10 +3,8 @@ package com.ticketing.server.payment.api;
 import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE;
 
 import com.ticketing.server.payment.api.dto.requset.KakaoPayApproveRequest;
-import com.ticketing.server.payment.api.dto.requset.KakaoPayCancelRequest;
 import com.ticketing.server.payment.api.dto.requset.KakaoPayReadyRequest;
 import com.ticketing.server.payment.api.dto.response.KakaoPayApproveResponse;
-import com.ticketing.server.payment.api.dto.response.KakaoPayCancelResponse;
 import com.ticketing.server.payment.api.dto.response.KakaoPayReadyResponse;
 import feign.Headers;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -25,8 +23,4 @@ public interface KakaoPayClient {
 	@Headers("Content-Type: application/x-www-form-urlencoded;charset=utf-8")
 	KakaoPayApproveResponse approve(@RequestHeader(value = "Authorization") String authorization, KakaoPayApproveRequest request);
 
-	@PostMapping(value = "/cancel", consumes = APPLICATION_FORM_URLENCODED_VALUE)
-	@Headers("Content-Type: application/x-www-form-urlencoded;charset=utf-8")
-	KakaoPayCancelResponse cancel(@RequestHeader(value = "Authorization") String authorization, KakaoPayCancelRequest request);
-
 }

server/src/main/java/com/ticketing/server/payment/api/MovieClient.java

@@ -2,14 +2,11 @@ package com.ticketing.server.payment.api;
 
 import com.ticketing.server.movie.application.request.TicketCancelRequest;
 import com.ticketing.server.movie.application.request.TicketReservationRequest;
-import com.ticketing.server.movie.application.request.TicketSoldRequest;
 import com.ticketing.server.movie.application.response.TicketCancelResponse;
 import com.ticketing.server.movie.application.response.TicketDetailsResponse;
 import com.ticketing.server.movie.application.response.TicketReservationResponse;
+import com.ticketing.server.movie.application.request.TicketSoldRequest;
 import com.ticketing.server.movie.application.response.TicketSoldResponse;
-import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
-import com.ticketing.server.payment.api.impl.TicketsRefundRequest;
-import java.time.LocalDateTime;
 import javax.validation.constraints.NotNull;
 
 public interface MovieClient {
@@ -21,8 +18,4 @@ public interface MovieClient {
 	TicketSoldResponse ticketSold(@NotNull TicketSoldRequest request);
 
 	TicketCancelResponse ticketCancel(@NotNull TicketCancelRequest request);
-
-	TicketsRefundResponse ticketRefundByDateTime(TicketsRefundRequest request, LocalDateTime dateTime);
-
-	TicketsRefundResponse ticketRefund(TicketsRefundRequest request);
 }

server/src/main/java/com/ticketing/server/payment/api/dto/requset/KakaoPayCancelRequest.java

@@ -1,47 +0,0 @@
-package com.ticketing.server.payment.api.dto.requset;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import javax.validation.constraints.NotEmpty;
-import lombok.Getter;
-
-@Getter
-@JsonInclude(Include.NON_NULL)
-public class KakaoPayCancelRequest {
-
-	@NotEmpty
-	private String cid = "TC0ONETIME";
-
-	@feign.form.FormProperty("cid_secret")
-	private String cidSecret;
-
-	@NotEmpty
-	private String tid;
-
-	@NotEmpty
-	@feign.form.FormProperty("cancel_amount")
-	private Integer cancelAmount;
-
-	@NotEmpty
-	@feign.form.FormProperty("cancel_tax_free_amount")
-	private Integer cancelTaxFreeAmount;
-
-	@feign.form.FormProperty("cancel_vat_amount")
-	private Integer cancelVatAmount;
-
-	@feign.form.FormProperty("cancel_available_amount")
-	private Integer cancelAvailableAmount;
-
-	private String payload;
-
-	public KakaoPayCancelRequest(String tid, Integer cancelAmount) {
-		this(tid, cancelAmount, 0);
-	}
-
-	public KakaoPayCancelRequest(String tid, Integer cancelAmount, int cancelTaxFreeAmount) {
-		this.tid = tid;
-		this.cancelAmount = cancelAmount;
-		this.cancelTaxFreeAmount = cancelTaxFreeAmount;
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/api/dto/response/ApprovedCancelAmount.java

@@ -1,16 +0,0 @@
-package com.ticketing.server.payment.api.dto.response;
-
-import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
-import lombok.Getter;
-
-@Getter
-public class ApprovedCancelAmount extends SnakeCaseStrategy {
-
-	private Integer total;
-	private Integer taxFree;
-	private Integer vat;
-	private Integer point;
-	private Integer discount;
-	private Integer greenDeposit;
-
-}

server/src/main/java/com/ticketing/server/payment/api/dto/response/CancelAvailableAmount.java

@@ -1,16 +0,0 @@
-package com.ticketing.server.payment.api.dto.response;
-
-import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
-import lombok.Getter;
-
-@Getter
-public class CancelAvailableAmount extends SnakeCaseStrategy {
-
-	private Integer total;
-	private Integer taxFree;
-	private Integer vat;
-	private Integer point;
-	private Integer discount;
-	private Integer greenDeposit;
-
-}

server/src/main/java/com/ticketing/server/payment/api/dto/response/CanceledAmount.java

@@ -1,16 +0,0 @@
-package com.ticketing.server.payment.api.dto.response;
-
-import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
-import lombok.Getter;
-
-@Getter
-public class CanceledAmount extends SnakeCaseStrategy {
-
-	private Integer total;
-	private Integer taxFree;
-	private Integer vat;
-	private Integer point;
-	private Integer discount;
-	private Integer greenDeposit;
-
-}

server/src/main/java/com/ticketing/server/payment/api/dto/response/KakaoPayCancelResponse.java

@@ -1,50 +0,0 @@
-package com.ticketing.server.payment.api.dto.response;
-
-import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
-import java.time.LocalDateTime;
-import lombok.Getter;
-
-@Getter
-public class KakaoPayCancelResponse extends SnakeCaseStrategy {
-
-	private String aid;
-
-	private String tid;
-
-	private String cid;
-
-	private String status;
-
-	private String partnerOrderId;
-
-	private String partnerUserId;
-
-	private String paymentMethodType;
-
-	private Amount amount;
-
-	private ApprovedCancelAmount approvedCancelAmount;
-
-	private CanceledAmount canceledAmount;
-
-	private CancelAvailableAmount cancelAvailableAmount;
-
-	private String itemName;
-
-	private String itemCode;
-
-	private Integer quantity;
-
-	private LocalDateTime createdAt;
-
-	private LocalDateTime approvedAt;
-
-	private LocalDateTime canceledAt;
-
-	private String payload;
-
-	public Integer getTotalAmount() {
-		return amount.getTotal();
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/api/impl/MovieClientImpl.java

@@ -7,16 +7,12 @@ import com.ticketing.server.movie.application.response.TicketCancelResponse;
 import com.ticketing.server.movie.application.response.TicketDetailsResponse;
 import com.ticketing.server.movie.application.response.TicketReservationResponse;
 import com.ticketing.server.movie.application.response.TicketSoldResponse;
-import com.ticketing.server.movie.domain.Ticket;
 import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
 import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
-import com.ticketing.server.movie.service.dto.TicketsRefundDTO;
-import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
 import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
 import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
 import com.ticketing.server.movie.service.interfaces.TicketService;
 import com.ticketing.server.payment.api.MovieClient;
-import java.time.LocalDateTime;
 import javax.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -53,16 +49,4 @@ public class MovieClientImpl implements MovieClient {
 		return ticketsCancelDto.toResponse();
 	}
 
-	@Override
-	public TicketsRefundResponse ticketRefundByDateTime(TicketsRefundRequest request, LocalDateTime dateTime) {
-		TicketsRefundDTO ticketsRefundDto = ticketService.ticketsRefund(request.getPaymentId(), ticket -> ticket.refund(dateTime));
-		return ticketsRefundDto.toResponse();
-	}
-
-	@Override
-	public TicketsRefundResponse ticketRefund(TicketsRefundRequest request) {
-		TicketsRefundDTO ticketsRefundDto = ticketService.ticketsRefund(request.getPaymentId(), Ticket::refund);
-		return ticketsRefundDto.toResponse();
-	}
-
 }

server/src/main/java/com/ticketing/server/payment/api/impl/TicketsRefundRequest.java

@@ -1,12 +0,0 @@
-package com.ticketing.server.payment.api.impl;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class TicketsRefundRequest {
-
-	private final Long paymentId;
-
-}

server/src/main/java/com/ticketing/server/payment/application/PaymentController.java

@@ -1,25 +1,18 @@
 package com.ticketing.server.payment.application;
 
-import static com.ticketing.server.user.domain.UserGrade.ROLES.STAFF;
-import static com.ticketing.server.user.domain.UserGrade.ROLES.USER;
-
 import com.ticketing.server.payment.application.request.PaymentReadyRequest;
-import com.ticketing.server.payment.application.request.PaymentRefundRequest;
-import com.ticketing.server.payment.application.response.PaymentCancelResponse;
-import com.ticketing.server.payment.application.response.PaymentCompleteResponse;
 import com.ticketing.server.payment.application.response.PaymentDetailResponse;
-import com.ticketing.server.payment.application.response.PaymentRefundResponse;
 import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
-import com.ticketing.server.payment.service.AdminKakaoPayRefundService;
-import com.ticketing.server.payment.service.MyKakaoPayRefundService;
 import com.ticketing.server.payment.service.dto.PaymentCancelDTO;
+import com.ticketing.server.payment.application.response.PaymentCancelResponse;
 import com.ticketing.server.payment.service.dto.PaymentCompleteDTO;
+import com.ticketing.server.payment.application.response.PaymentCompleteResponse;
 import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
 import com.ticketing.server.payment.service.dto.PaymentReadyDTO;
-import com.ticketing.server.payment.service.dto.PaymentRefundDTO;
 import com.ticketing.server.payment.service.dto.SimplePaymentsDTO;
 import com.ticketing.server.payment.service.interfaces.PaymentApisService;
 import com.ticketing.server.payment.service.interfaces.PaymentService;
+import com.ticketing.server.user.domain.UserGrade;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
@@ -44,11 +37,9 @@ public class PaymentController {
 
 	private final PaymentApisService paymentApisService;
 	private final PaymentService paymentService;
-	private final AdminKakaoPayRefundService adminKakaoPayRefundService;
-	private final MyKakaoPayRefundService myKakaoPayRefundService;
 
 	@GetMapping
-	@Secured(USER)
+	@Secured(UserGrade.ROLES.USER)
 	public ResponseEntity<SimplePaymentsResponse> simplePayments(@NotNull Long userAlternateId) {
 		SimplePaymentsDTO simplePayments = paymentService.findSimplePayments(userAlternateId);
 
@@ -57,7 +48,7 @@ public class PaymentController {
 	}
 
 	@GetMapping("/detail")
-	@Secured(USER)
+	@Secured(UserGrade.ROLES.USER)
 	public ResponseEntity<PaymentDetailResponse> detail(@NotNull Long paymentId) {
 		PaymentDetailDTO paymentDetail = paymentApisService.findPaymentDetail(paymentId);
 
@@ -66,7 +57,7 @@ public class PaymentController {
 	}
 
 	@PostMapping("/ready")
-	@Secured(USER)
+	@Secured(UserGrade.ROLES.USER)
 	public ResponseEntity<PaymentReadyDTO> ready(@RequestBody @Valid PaymentReadyRequest request) {
 		PaymentReadyDTO paymentReadyDto = paymentApisService.ready(request.getTicketIds());
 
@@ -75,7 +66,7 @@ public class PaymentController {
 	}
 
 	@GetMapping("/complete")
-	@Secured(USER)
+	@Secured(UserGrade.ROLES.USER)
 	public ResponseEntity<PaymentCompleteResponse> complete(
 		@AuthenticationPrincipal UserDetails userRequest,
 		@RequestParam("pg_token") String pgToken) {
@@ -86,7 +77,7 @@ public class PaymentController {
 	}
 
 	@GetMapping("/cancel")
-	@Secured(USER)
+	@Secured(UserGrade.ROLES.USER)
 	public ResponseEntity<PaymentCancelResponse> cancel(@AuthenticationPrincipal UserDetails userRequest) {
 		PaymentCancelDTO paymentCancelDto = paymentApisService.cancel(userRequest.getUsername());
 
@@ -94,22 +85,4 @@ public class PaymentController {
 			.body(paymentCancelDto.toResponse());
 	}
 
-	@PostMapping("/refund")
-	@Secured(USER)
-	public ResponseEntity<PaymentRefundResponse> refund(@RequestBody @Valid PaymentRefundRequest request) {
-		PaymentRefundDTO paymentRefundDto = myKakaoPayRefundService.refund(request.getPaymentId());
-
-		return ResponseEntity.status(HttpStatus.OK)
-			.body(paymentRefundDto.toResponse());
-	}
-
-	@PostMapping("/staff/refund")
-	@Secured(STAFF)
-	public ResponseEntity<PaymentRefundResponse> adminRefund(@RequestBody @Valid PaymentRefundRequest request) {
-		PaymentRefundDTO paymentRefundDto = adminKakaoPayRefundService.refund(request.getPaymentId());
-
-		return ResponseEntity.status(HttpStatus.OK)
-			.body(paymentRefundDto.toResponse());
-	}
-
 }

server/src/main/java/com/ticketing/server/payment/application/request/PaymentRefundRequest.java

@@ -1,12 +0,0 @@
-package com.ticketing.server.payment.application.request;
-
-import javax.validation.constraints.NotNull;
-import lombok.Getter;
-
-@Getter
-public class PaymentRefundRequest {
-
-	@NotNull
-	private Long paymentId;
-
-}

server/src/main/java/com/ticketing/server/payment/application/response/PaymentRefundResponse.java

@@ -1,18 +0,0 @@
-package com.ticketing.server.payment.application.response;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class PaymentRefundResponse {
-
-	private Long paymentId;
-	private List<Long> ticketIds;
-	private String movieTitle;
-	private Integer cancelAmount;
-	private LocalDateTime canceledAt;
-
-}

server/src/main/java/com/ticketing/server/payment/domain/Payment.java

@@ -82,7 +82,4 @@ public class Payment extends AbstractEntity {
 		this.totalPrice = totalPrice;
 	}
 
-	public void refund() {
-		status = PaymentStatus.REFUNDED;
-	}
 }

server/src/main/java/com/ticketing/server/payment/service/AdminKakaoPayRefundService.java

@@ -1,40 +0,0 @@
-package com.ticketing.server.payment.service;
-
-import com.ticketing.server.global.exception.ErrorCode;
-import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
-import com.ticketing.server.payment.api.KakaoPayClient;
-import com.ticketing.server.payment.api.KakaoPayProperties;
-import com.ticketing.server.payment.api.MovieClient;
-import com.ticketing.server.payment.api.impl.TicketsRefundRequest;
-import com.ticketing.server.payment.domain.Payment;
-import com.ticketing.server.payment.domain.repository.PaymentRepository;
-import com.ticketing.server.payment.service.interfaces.AbstractKakaoPayRefund;
-import org.springframework.stereotype.Service;
-
-@Service
-public class AdminKakaoPayRefundService extends AbstractKakaoPayRefund {
-
-	private final PaymentRepository paymentRepository;
-	private final MovieClient movieClient;
-
-	public AdminKakaoPayRefundService(KakaoPayClient kakaoPayClient, KakaoPayProperties kakaoPayProperties, PaymentRepository paymentRepository, MovieClient movieClient) {
-		super(kakaoPayClient, kakaoPayProperties);
-		this.paymentRepository = paymentRepository;
-		this.movieClient = movieClient;
-	}
-
-	@Override
-	protected Payment getPayment(Long paymentId) {
-		return paymentRepository.findById(paymentId)
-			.orElseThrow(ErrorCode::throwPaymentIdNotFound);
-	}
-
-	@Override
-	protected TicketsRefundResponse movieAndPaymentRefund(Payment payment) {
-		TicketsRefundResponse refundResponse = movieClient.ticketRefund(new TicketsRefundRequest(payment.getId()));
-		payment.refund();
-
-		return refundResponse;
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/service/MyKakaoPayRefundService.java

@@ -1,54 +0,0 @@
-package com.ticketing.server.payment.service;
-
-import com.ticketing.server.global.exception.ErrorCode;
-import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
-import com.ticketing.server.payment.api.KakaoPayClient;
-import com.ticketing.server.payment.api.KakaoPayProperties;
-import com.ticketing.server.payment.api.MovieClient;
-import com.ticketing.server.payment.api.UserClient;
-import com.ticketing.server.payment.api.dto.response.UserDetailResponse;
-import com.ticketing.server.payment.api.impl.TicketsRefundRequest;
-import com.ticketing.server.payment.domain.Payment;
-import com.ticketing.server.payment.domain.repository.PaymentRepository;
-import com.ticketing.server.payment.service.interfaces.AbstractKakaoPayRefund;
-import java.time.LocalDateTime;
-import org.springframework.stereotype.Service;
-
-@Service
-public class MyKakaoPayRefundService extends AbstractKakaoPayRefund {
-
-	private final PaymentRepository paymentRepository;
-	private final MovieClient movieClient;
-	private final UserClient userClient;
-
-	public MyKakaoPayRefundService(KakaoPayClient kakaoPayClient, KakaoPayProperties kakaoPayProperties, PaymentRepository paymentRepository,
-		MovieClient movieClient, UserClient userClient) {
-		super(kakaoPayClient, kakaoPayProperties);
-		this.paymentRepository = paymentRepository;
-		this.movieClient = movieClient;
-		this.userClient = userClient;
-	}
-
-	@Override
-	protected Payment getPayment(Long paymentId) {
-		UserDetailResponse userDetail = userClient.detail();
-		Payment payment = paymentRepository.findById(paymentId)
-			.orElseThrow(ErrorCode::throwPaymentIdNotFound);
-
-		if (userDetail.hasUserAlternateId(payment)) {
-			throw ErrorCode.throwValidUserId();
-		}
-
-		return payment;
-	}
-
-	@Override
-	protected TicketsRefundResponse movieAndPaymentRefund(Payment payment) {
-		LocalDateTime now = LocalDateTime.now();
-		TicketsRefundResponse refundResponse = movieClient.ticketRefundByDateTime(new TicketsRefundRequest(payment.getId()), now);
-		payment.refund();
-
-		return refundResponse;
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/service/PaymentApisServiceImpl.java

@@ -76,10 +76,6 @@ public class PaymentApisServiceImpl implements PaymentApisService {
 		UserDetailResponse userResponse = userClient.detail();
 		Long userAlternateId = userResponse.getUserAlternateId();
 
-		// 다른 결제중인 데이터가 있다면, 예외처리
-		paymentCacheRepository.findByEmail(userResponse.getEmail())
-			.ifPresent(paymentCache -> ErrorCode.throwBadRequestPaymentReady());
-
 		// Ticket 정보 조회 - 영화제목, 티켓가격이 필요함.
 		TicketReservationResponse ticketResponse = movieClient.ticketReservation(new TicketReservationRequest(ticketIds));
 		String movieTitle = ticketResponse.getMovieTitle();
@@ -99,18 +95,21 @@ public class PaymentApisServiceImpl implements PaymentApisService {
 		);
 		KakaoPayReadyResponse response = kakaoPayClient.ready(kakaoPayProperties.getAuthorization(), request);
 
-		paymentCacheRepository.save(
-			new PaymentCache(
-				userResponse.getEmail(),
-				movieTitle,
-				response.getTid(),
-				ticketIds,
-				userAlternateId,
-				paymentNumber,
-				request.getTotalAmount()
-			)
+		PaymentCache paymentReady = new PaymentCache(
+			userResponse.getEmail(),
+			movieTitle,
+			response.getTid(),
+			ticketIds,
+			userAlternateId,
+			paymentNumber
 		);
 
+		paymentCacheRepository.findByEmail(userResponse.getEmail())
+			.ifPresentOrElse(
+				paymentCache -> ErrorCode.throwBadRequestPaymentReady()
+				, () -> paymentCacheRepository.save(paymentReady)
+			);
+
 		return new PaymentReadyDTO(response);
 	}
 
@@ -120,13 +119,6 @@ public class PaymentApisServiceImpl implements PaymentApisService {
 		PaymentCache paymentCache = paymentCacheRepository.findByEmail(email)
 			.orElseThrow(ErrorCode::throwBadRequestPaymentComplete);
 
-		Payment payment = new Payment(paymentCache, PaymentType.KAKAO_PAY, PaymentStatus.SOLD, paymentCache.getTotalAmount());
-		payment = paymentRepository.save(payment);
-
-		movieClient.ticketSold(new TicketSoldRequest(payment.getId(), paymentCache.getTicketIds()));
-		paymentCacheRepository.delete(paymentCache);
-
-		// 카카오페이 결제완료
 		String paymentNumberToString = paymentCache.getPaymentNumber().toString();
 		String userAlternateIdToString = paymentCache.getUserAlternateId().toString();
 		KakaoPayApproveRequest kakaoPayApproveRequest = new KakaoPayApproveRequest(
@@ -140,6 +132,12 @@ public class PaymentApisServiceImpl implements PaymentApisService {
 			kakaoPayApproveRequest
 		);
 
+		Payment payment = new Payment(paymentCache, PaymentType.KAKAO_PAY, PaymentStatus.SOLD, kakaoPayApproveResponse.getTotalAmount());
+		payment = paymentRepository.save(payment);
+
+		movieClient.ticketSold(new TicketSoldRequest(payment.getId(), paymentCache.getTicketIds()));
+		paymentCacheRepository.delete(paymentCache);
+
 		return new PaymentCompleteDTO(email, kakaoPayApproveResponse);
 	}
 

server/src/main/java/com/ticketing/server/payment/service/dto/PaymentRefundDTO.java

@@ -1,41 +0,0 @@
-package com.ticketing.server.payment.service.dto;
-
-import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
-import com.ticketing.server.payment.api.dto.response.KakaoPayCancelResponse;
-import com.ticketing.server.payment.application.response.PaymentRefundResponse;
-import com.ticketing.server.payment.domain.Payment;
-import java.time.LocalDateTime;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class PaymentRefundDTO {
-
-	private Long paymentId;
-	private List<Long> ticketIds;
-	private String movieTitle;
-	private Integer cancelAmount;
-	private LocalDateTime canceledAt;
-
-	public PaymentRefundDTO(Payment payment, KakaoPayCancelResponse kakaoPayCancelResponse, TicketsRefundResponse refundResponse) {
-		this(
-			payment.getId(),
-			refundResponse.getTicketIds(),
-			kakaoPayCancelResponse.getItemName(),
-			kakaoPayCancelResponse.getTotalAmount(),
-			kakaoPayCancelResponse.getCanceledAt()
-		);
-	}
-
-	public PaymentRefundResponse toResponse() {
-		return new PaymentRefundResponse(
-			paymentId,
-			ticketIds,
-			movieTitle,
-			cancelAmount,
-			canceledAt
-		);
-	}
-}

server/src/main/java/com/ticketing/server/payment/service/interfaces/AbstractKakaoPayRefund.java

@@ -1,42 +0,0 @@
-package com.ticketing.server.payment.service.interfaces;
-
-import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
-import com.ticketing.server.payment.api.KakaoPayClient;
-import com.ticketing.server.payment.api.KakaoPayProperties;
-import com.ticketing.server.payment.api.dto.requset.KakaoPayCancelRequest;
-import com.ticketing.server.payment.api.dto.response.KakaoPayCancelResponse;
-import com.ticketing.server.payment.domain.Payment;
-import com.ticketing.server.payment.service.dto.PaymentRefundDTO;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-@RequiredArgsConstructor
-@Validated
-public abstract class AbstractKakaoPayRefund {
-
-	private final KakaoPayClient kakaoPayClient;
-	private final KakaoPayProperties kakaoPayProperties;
-
-	@Transactional
-	public PaymentRefundDTO refund(@NotNull Long paymentId) {
-		Payment payment = getPayment(paymentId);
-
-		// 내부 환불
-		TicketsRefundResponse refundResponse = movieAndPaymentRefund(payment);
-
-		// 카카오페이 환불
-		KakaoPayCancelResponse kakaoPayCancelResponse = kakaoPayClient.cancel(
-			kakaoPayProperties.getAuthorization(),
-			new KakaoPayCancelRequest(payment.getTid(), payment.getTotalPrice())
-		);
-
-		return new PaymentRefundDTO(payment, kakaoPayCancelResponse, refundResponse);
-	}
-
-	protected abstract Payment getPayment(Long paymentId);
-
-	protected abstract TicketsRefundResponse movieAndPaymentRefund(Payment payment);
-
-}

server/src/test/java/com/ticketing/server/movie/domain/TicketTest.java

@@ -8,7 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertAll;
 
 import com.ticketing.server.global.exception.ErrorCode;
 import com.ticketing.server.global.exception.TicketingException;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
@@ -166,94 +165,10 @@ public class TicketTest {
 		ticket.makeSold(123L);
 
 		// then
-		assertThatThrownBy(ticket::cancel)
+		assertThatThrownBy(() -> ticket.cancel())
 			.isInstanceOf(TicketingException.class)
 			.extracting("errorCode")
 			.isEqualTo(ErrorCode.BAD_REQUEST_PAYMENT_CANCEL);
 	}
 
-	@Test
-	@DisplayName("시간 비교 환불 성공")
-	void refundByDateTimeSuccess() {
-		// given
-		LocalDateTime now = LocalDateTime.now();
-		LocalDateTime dateTime = LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 7, 50);
-		Ticket ticket = tickets.get(0);
-
-		// when
-		ticket.makeSold(123L);
-		ticket.refund(dateTime);
-
-		// then
-		assertAll(
-			() -> assertThat(ticket.getStatus()).isEqualTo(TicketStatus.SALE),
-			() -> assertThat(ticket.getPaymentId()).isNull()
-		);
-	}
-
-	@Test
-	@DisplayName("시간 비교 환불 실패 - 상영시작 시간 10분보다 작을경우")
-	void refundByDateTimeFail() {
-		// given
-		LocalDateTime now = LocalDateTime.now();
-		LocalDateTime dateTime = LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 7, 51);
-		Ticket ticket = tickets.get(0);
-
-		// when
-		ticket.makeSold(123L);
-
-		// then
-		assertThatThrownBy(() -> ticket.refund(dateTime))
-			.isInstanceOf(TicketingException.class)
-			.extracting("errorCode")
-			.isEqualTo(ErrorCode.NOT_REFUNDABLE_TIME);
-	}
-
-	@Test
-	@DisplayName("관리자 환불 성공")
-	void refundSuccess() {
-		// given
-		Ticket ticket = tickets.get(0);
-
-		// when
-		ticket.makeSold(123L);
-		ticket.refund();
-
-		// then
-		assertAll(
-			() -> assertThat(ticket.getStatus()).isEqualTo(TicketStatus.SALE),
-			() -> assertThat(ticket.getPaymentId()).isNull()
-		);
-	}
-
-	@Test
-	@DisplayName("관리자 환불 실패 - 상태 SALE")
-	void refundFail_SALE() {
-		// given
-		Ticket ticket = tickets.get(0);
-
-		// when
-		// then
-		assertThatThrownBy(ticket::refund)
-			.isInstanceOf(TicketingException.class)
-			.extracting("errorCode")
-			.isEqualTo(ErrorCode.NOT_REFUNDABLE_SEAT);
-	}
-
-	@Test
-	@DisplayName("관리자 환불 실패 - 상태 RESERVATION")
-	void refundFail_RESERVATION() {
-		// given
-		Ticket ticket = tickets.get(0);
-
-		// when
-		ticket.makeReservation();
-
-		// then
-		assertThatThrownBy(ticket::refund)
-			.isInstanceOf(TicketingException.class)
-			.extracting("errorCode")
-			.isEqualTo(ErrorCode.NOT_REFUNDABLE_SEAT);
-	}
-
 }

server/src/test/java/com/ticketing/server/payment/service/PaymentServiceImplTest.java

@@ -57,8 +57,7 @@ class PaymentServiceImplTest {
 					"T2d03c9130bf237a97001",
 					List.of(3L),
 					userAlternateId,
-					1241242343245L,
-					15_000
+					1241242343245L
 				),
 				KAKAO_PAY,
 				SOLD,
@@ -71,8 +70,7 @@ class PaymentServiceImplTest {
 					"T2d03c9130bf237a97002",
 					List.of(3L),
 					userAlternateId,
-					12412343212445L,
-					30_000
+					12412343212445L
 				),
 				KAKAO_PAY,
 				SOLD,

server/src/test/java/com/ticketing/server/user/service/UserApisServiceImplTest.java

@@ -76,8 +76,7 @@ class UserApisServiceImplTest {
 						"T2d03c9130bf237a9700",
 						List.of(1L, 2L),
 						user.getAlternateId(),
-						124124231513245L,
-						15_000
+						124124231513245L
 					),
 					KAKAO_PAY,
 					SOLD,
@@ -92,8 +91,7 @@ class UserApisServiceImplTest {
 						"T2d03c9130bf237a97001",
 						List.of(3L),
 						user.getAlternateId(),
-						1241242343245L,
-						15_000
+						1241242343245L
 					),
 					KAKAO_PAY,
 					SOLD,