Compare commits

...

5 Commits

Author SHA1 Message Date
손창현
76e77fe35a refactor: MovieTimeServiceImplTest - removed MovieTimeListDto 2022-07-18 17:13:12 +09:00
손창현
5afce2c730 refactor: removed MovieTimeListDTO 2022-07-18 16:56:02 +09:00
손창현
75661c1dcd refactor: removed MovieListDTO: 2022-07-18 16:54:20 +09:00
Kim DongHyo
a2cfd7ab15 [Payment] 환불 구현 (#76)
* feat: 본인결제내역 환불 구현

* feat: 관리자 환불 구현

* refactor: 피드백 반영
2022-07-17 23:40:28 +09:00
Kim DongHyo
61f6636653 Update README.md 2022-07-15 17:54:03 +09:00
42 changed files with 701 additions and 110 deletions

View File

@@ -91,7 +91,7 @@ erDiagram
bigint seat_id FK "좌석 ID"
bigint movie_time_id FK "상영시간표 ID"
bigint payment_id "결제 ID"
varchar status "상태 - 매가능/예약진행중/판매완료"
varchar status "상태 - 매가능/예약/"
int ticket_price "가격"
datetime deleted_at "삭제일시"
datetime created_at "등록일시"
@@ -101,10 +101,11 @@ erDiagram
PAYMENT {
bigint id PK "결제 ID"
bigint user_alternate_id "유저 대체ID"
varchar tid "카카오페이 결제고유번호"
varchar movie_title "영화제목"
varchar type "결제 타입 - 예) 네이버페이, 카카오페이"
varchar status "상태 - 완료/환불/실패"
varchar failed_message "실패사유 - 컬럼명을 알아보기 쉬운가?"
varchar status "상태 - 완료/환불"
varchar failed_message "실패사유"
varchar payment_number "예매번호"
int total_price "결제 금액"
datetime deleted_at "삭제일시"

View File

@@ -24,6 +24,8 @@ 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, "해당 정보에 접근 권한이 존재하지 않습니다."),
@@ -85,6 +87,14 @@ 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);

View File

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

View File

@@ -8,11 +8,12 @@ import com.ticketing.server.movie.application.response.MovieDeleteResponse;
import com.ticketing.server.movie.application.response.MovieListResponse;
import com.ticketing.server.movie.application.response.MovieInfoResponse;
import com.ticketing.server.movie.service.dto.DeletedMovieDTO;
import com.ticketing.server.movie.service.dto.MovieListDTO;
import com.ticketing.server.movie.service.dto.MovieDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
import com.ticketing.server.movie.service.interfaces.MovieService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -51,11 +52,11 @@ public class MovieController {
@GetMapping()
@ApiOperation(value = "영화 목록 조회")
public ResponseEntity<MovieListResponse> getMovies() {
MovieListDTO movieListDto = movieService.getMovies();
List<MovieDTO> movieDtos = movieService.getMovies();
return ResponseEntity.status(HttpStatus.OK)
.body(
movieListDto.toResponse()
new MovieListResponse(movieDtos)
);
}

View File

@@ -5,13 +5,14 @@ import static com.ticketing.server.user.domain.UserGrade.ROLES.STAFF;
import com.ticketing.server.movie.application.request.MovieTimeRegisterRequest;
import com.ticketing.server.movie.application.response.MovieTimeInfoResponse;
import com.ticketing.server.movie.application.response.MovieTimeListResponse;
import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
import com.ticketing.server.movie.service.interfaces.MovieTimeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import java.time.LocalDate;
import java.util.List;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
@@ -58,11 +59,11 @@ public class MovieTimeController {
public ResponseEntity<MovieTimeListResponse> getMovieTimes(
@ApiParam(value = "영화 ID", required = true) @RequestParam @NotNull Long movieId,
@ApiParam(value = "상영 날짜", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate runningDate) {
MovieTimeListDTO movieTimeListDto = movieTimeService.getMovieTimes(movieId, runningDate);
List<MovieTimeDTO> movieTimeDtos = movieTimeService.getMovieTimes(movieId, runningDate);
return ResponseEntity.status(HttpStatus.OK)
.body(
movieTimeListDto.toResponse()
new MovieTimeListResponse(movieTimeDtos)
);
}

View File

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

View File

@@ -3,6 +3,7 @@ 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;
@@ -78,6 +79,26 @@ 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;
}

View File

@@ -5,7 +5,6 @@ import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.service.dto.DeletedMovieDTO;
import com.ticketing.server.movie.service.dto.MovieDTO;
import com.ticketing.server.movie.service.dto.MovieListDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
import com.ticketing.server.movie.service.interfaces.MovieService;
import java.util.List;
@@ -39,14 +38,12 @@ public class MovieServiceImpl implements MovieService {
}
@Override
public MovieListDTO getMovies() {
public List<MovieDTO> getMovies() {
List<Movie> movies = movieRepository.findValidMovies();
List<MovieDTO> movieDtos = movies.stream()
return movies.stream()
.map(movie -> movie.toMovieDTO())
.collect(Collectors.toList());
return new MovieListDTO(movieDtos);
}
@Override

View File

@@ -8,9 +8,7 @@ import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
import com.ticketing.server.movie.domain.repository.TheaterRepository;
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
import com.ticketing.server.movie.service.dto.MovieTimeRegisterDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
import com.ticketing.server.movie.service.interfaces.MovieTimeService;
import java.time.LocalDate;
@@ -56,7 +54,7 @@ public class MovieTimeServiceImpl implements MovieTimeService {
}
@Override
public MovieTimeListDTO getMovieTimes(Long movieId, LocalDate runningDate) {
public List<MovieTimeDTO> getMovieTimes(Long movieId, LocalDate runningDate) {
Movie movie = findMovieById(movieId);
LocalDateTime startOfDay = runningDate.atStartOfDay().plusHours(6);
@@ -64,11 +62,9 @@ public class MovieTimeServiceImpl implements MovieTimeService {
List<MovieTime> movieTimes = movieTimeRepository.findValidMovieTimes(movie, startOfDay, endOfDay);
List<MovieTimeDTO> movieTimeDtos = movieTimes.stream()
return movieTimes.stream()
.map(movieTime -> movieTime.toMovieTimeDTO())
.collect(Collectors.toList());
return new MovieTimeListDTO(movieTimeDtos);
}
@Override

View File

@@ -9,14 +9,19 @@ 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;
@@ -104,6 +109,19 @@ 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);

View File

@@ -1,18 +0,0 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.application.response.MovieListResponse;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class MovieListDTO {
private final List<MovieDTO> movieDtos;
public MovieListResponse toResponse() {
return new MovieListResponse(movieDtos);
}
}

View File

@@ -1,18 +0,0 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.application.response.MovieTimeListResponse;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class MovieTimeListDTO {
private final List<MovieTimeDTO> movieTimeDtos;
public MovieTimeListResponse toResponse() {
return new MovieTimeListResponse(movieTimeDtos);
}
}

View File

@@ -0,0 +1,20 @@
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());
}
}

View File

@@ -0,0 +1,16 @@
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);
}
}

View File

@@ -0,0 +1,21 @@
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());
}
}

View File

@@ -1,14 +1,15 @@
package com.ticketing.server.movie.service.interfaces;
import com.ticketing.server.movie.service.dto.DeletedMovieDTO;
import com.ticketing.server.movie.service.dto.MovieListDTO;
import com.ticketing.server.movie.service.dto.MovieDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
import java.util.List;
public interface MovieService {
RegisteredMovieDTO registerMovie(String title, Long runningTime);
MovieListDTO getMovies();
List<MovieDTO> getMovies();
DeletedMovieDTO deleteMovie(Long id);
}

View File

@@ -2,17 +2,18 @@ package com.ticketing.server.movie.service.interfaces;
import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.Theater;
import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
import com.ticketing.server.movie.service.dto.MovieTimeRegisterDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
import java.time.LocalDate;
import java.util.List;
import javax.validation.Valid;
public interface MovieTimeService {
RegisteredMovieTimeDTO registerMovieTime(@Valid MovieTimeRegisterDTO movieTimeRegisterDto);
MovieTimeListDTO getMovieTimes(Long movieId, LocalDate runningDate);
List<MovieTimeDTO> getMovieTimes(Long movieId, LocalDate runningDate);
Movie findMovieById(Long movieId);

View File

@@ -1,12 +1,15 @@
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 {
@@ -21,4 +24,6 @@ public interface TicketService {
TicketsCancelDTO ticketCancel(@NotEmptyCollection List<Long> ticketIds);
TicketsRefundDTO ticketsRefund(@NotNull Long paymentId, UnaryOperator<Ticket> refund);
}

View File

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

View File

@@ -3,8 +3,10 @@ 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;
@@ -23,4 +25,8 @@ 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);
}

View File

@@ -2,11 +2,14 @@ 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 {
@@ -18,4 +21,8 @@ public interface MovieClient {
TicketSoldResponse ticketSold(@NotNull TicketSoldRequest request);
TicketCancelResponse ticketCancel(@NotNull TicketCancelRequest request);
TicketsRefundResponse ticketRefundByDateTime(TicketsRefundRequest request, LocalDateTime dateTime);
TicketsRefundResponse ticketRefund(TicketsRefundRequest request);
}

View File

@@ -0,0 +1,47 @@
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;
}
}

View File

@@ -0,0 +1,16 @@
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;
}

View File

@@ -0,0 +1,16 @@
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;
}

View File

@@ -0,0 +1,16 @@
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;
}

View File

@@ -0,0 +1,50 @@
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();
}
}

View File

@@ -7,12 +7,16 @@ 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;
@@ -49,4 +53,16 @@ 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();
}
}

View File

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

View File

@@ -1,18 +1,25 @@
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.response.PaymentDetailResponse;
import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
import com.ticketing.server.payment.service.dto.PaymentCancelDTO;
import com.ticketing.server.payment.application.request.PaymentRefundRequest;
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.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.service.dto.PaymentCompleteDTO;
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;
@@ -37,9 +44,11 @@ public class PaymentController {
private final PaymentApisService paymentApisService;
private final PaymentService paymentService;
private final AdminKakaoPayRefundService adminKakaoPayRefundService;
private final MyKakaoPayRefundService myKakaoPayRefundService;
@GetMapping
@Secured(UserGrade.ROLES.USER)
@Secured(USER)
public ResponseEntity<SimplePaymentsResponse> simplePayments(@NotNull Long userAlternateId) {
SimplePaymentsDTO simplePayments = paymentService.findSimplePayments(userAlternateId);
@@ -48,7 +57,7 @@ public class PaymentController {
}
@GetMapping("/detail")
@Secured(UserGrade.ROLES.USER)
@Secured(USER)
public ResponseEntity<PaymentDetailResponse> detail(@NotNull Long paymentId) {
PaymentDetailDTO paymentDetail = paymentApisService.findPaymentDetail(paymentId);
@@ -57,7 +66,7 @@ public class PaymentController {
}
@PostMapping("/ready")
@Secured(UserGrade.ROLES.USER)
@Secured(USER)
public ResponseEntity<PaymentReadyDTO> ready(@RequestBody @Valid PaymentReadyRequest request) {
PaymentReadyDTO paymentReadyDto = paymentApisService.ready(request.getTicketIds());
@@ -66,7 +75,7 @@ public class PaymentController {
}
@GetMapping("/complete")
@Secured(UserGrade.ROLES.USER)
@Secured(USER)
public ResponseEntity<PaymentCompleteResponse> complete(
@AuthenticationPrincipal UserDetails userRequest,
@RequestParam("pg_token") String pgToken) {
@@ -77,7 +86,7 @@ public class PaymentController {
}
@GetMapping("/cancel")
@Secured(UserGrade.ROLES.USER)
@Secured(USER)
public ResponseEntity<PaymentCancelResponse> cancel(@AuthenticationPrincipal UserDetails userRequest) {
PaymentCancelDTO paymentCancelDto = paymentApisService.cancel(userRequest.getUsername());
@@ -85,4 +94,22 @@ 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());
}
}

View File

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

View File

@@ -0,0 +1,18 @@
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;
}

View File

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

View File

@@ -0,0 +1,40 @@
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;
}
}

View File

@@ -0,0 +1,54 @@
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;
}
}

View File

@@ -76,6 +76,10 @@ 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();
@@ -95,21 +99,18 @@ public class PaymentApisServiceImpl implements PaymentApisService {
);
KakaoPayReadyResponse response = kakaoPayClient.ready(kakaoPayProperties.getAuthorization(), request);
PaymentCache paymentReady = new PaymentCache(
userResponse.getEmail(),
movieTitle,
response.getTid(),
ticketIds,
userAlternateId,
paymentNumber
paymentCacheRepository.save(
new PaymentCache(
userResponse.getEmail(),
movieTitle,
response.getTid(),
ticketIds,
userAlternateId,
paymentNumber,
request.getTotalAmount()
)
);
paymentCacheRepository.findByEmail(userResponse.getEmail())
.ifPresentOrElse(
paymentCache -> ErrorCode.throwBadRequestPaymentReady()
, () -> paymentCacheRepository.save(paymentReady)
);
return new PaymentReadyDTO(response);
}
@@ -119,6 +120,13 @@ 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(
@@ -132,12 +140,6 @@ 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);
}

View File

@@ -0,0 +1,41 @@
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
);
}
}

View File

@@ -0,0 +1,42 @@
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);
}

View File

@@ -8,6 +8,7 @@ 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;
@@ -165,10 +166,94 @@ 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);
}
}

View File

@@ -39,10 +39,10 @@ public class MovieServiceImplTest {
.thenReturn(Collections.emptyList());
// when
MovieListDTO movieListDto = movieService.getMovies();
List<MovieDTO> movieDtos = movieService.getMovies();
// then
assertTrue(movieListDto.getMovieDtos().isEmpty());
assertTrue(movieDtos.isEmpty());
}
@Test
@@ -55,11 +55,11 @@ public class MovieServiceImplTest {
when(movieRepository.findValidMovies())
.thenReturn(movies);
// when
MovieListDTO movieListDto = movieService.getMovies();
// when
List<MovieDTO> movieDtos = movieService.getMovies();
// then
assertTrue(!movieListDto.getMovieDtos().isEmpty());
// then
assertTrue(movieDtos.isEmpty());
}
}

View File

@@ -9,7 +9,7 @@ import com.ticketing.server.movie.domain.MovieTime;
import com.ticketing.server.movie.domain.Theater;
import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
@@ -51,10 +51,10 @@ public class MovieTimeServiceImplTest {
.thenReturn(Collections.emptyList());
// when
MovieTimeListDTO movieTimeListDto = movieTimeService.getMovieTimes(any(), LocalDate.now());
List<MovieTimeDTO> movieTimeDtos = movieTimeService.getMovieTimes(any(), LocalDate.now());
// then
assertTrue(movieTimeListDto.getMovieTimeDtos().isEmpty());
assertTrue(movieTimeDtos.isEmpty());
}
@Test
@@ -76,10 +76,10 @@ public class MovieTimeServiceImplTest {
.thenReturn(movieTimes);
// when
MovieTimeListDTO movieTimeListDto = movieTimeService.getMovieTimes(any(), LocalDate.of(2022, 07, 01));
List<MovieTimeDTO> movieTimeDtos = movieTimeService.getMovieTimes(any(), LocalDate.of(2022, 07, 01));
// then
assertTrue(!movieTimeListDto.getMovieTimeDtos().isEmpty());
assertTrue(!movieTimeDtos.isEmpty());
}
}

View File

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

View File

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