Compare commits

..

1 Commits

Author SHA1 Message Date
dongHyo
fd14666c8b feat: movie test data setup
feat: 영화 테스트 데이터 setup 구현
2022-07-04 20:08:29 +09:00
24 changed files with 69 additions and 411 deletions

View File

@@ -18,7 +18,6 @@ public enum ErrorCode {
UNAVAILABLE_REFRESH_TOKEN(BAD_REQUEST, "사용할 수 없는 토큰 입니다."),
/* 404 NOT_FOUND : Resource 를 찾을 수 없음 */
USER_NOT_FOUND(NOT_FOUND, "해당 유저 정보를 찾을 수 없습니다."),
EMAIL_NOT_FOUND(NOT_FOUND, "해당 이메일을 찾을 수 없습니다."),
MOVIE_NOT_FOUND(NOT_FOUND, "해당 제목의 영화를 찾을 수 없습니다."),
REFRESH_TOKEN_NOT_FOUND(NOT_FOUND, "리프레쉬 토큰을 찾을 수 없습니다."),
@@ -30,43 +29,4 @@ public enum ErrorCode {
private final HttpStatus httpStatus;
private final String detail;
/* 400 BAD_REQUEST : 잘못된 요청 */
public static TicketingException throwMismatchPassword() {
throw new TicketingException(MISMATCH_PASSWORD);
}
public static TicketingException throwTokenType() {
throw new TicketingException(TOKEN_TYPE);
}
public static TicketingException throwUnavailableRefreshToken() {
throw new TicketingException(UNAVAILABLE_REFRESH_TOKEN);
}
/* 404 NOT_FOUND : Resource 를 찾을 수 없음 */
public static TicketingException throwUserNotFound() {
throw new TicketingException(USER_NOT_FOUND);
}
public static TicketingException throwEmailNotFound() {
throw new TicketingException(EMAIL_NOT_FOUND);
}
public static TicketingException throwMovieNotFound() {
throw new TicketingException(MOVIE_NOT_FOUND);
}
public static TicketingException throwRefreshTokenNotFound() {
throw new TicketingException(REFRESH_TOKEN_NOT_FOUND);
}
/* 409 CONFLICT : Resource 의 현재 상태와 충돌. 보통 중복된 데이터 존재 */
public static TicketingException throwDuplicateEmail() {
throw new TicketingException(DUPLICATE_EMAIL);
}
public static TicketingException throwDeletedEmail() {
throw new TicketingException(DELETED_EMAIL);
}
}

View File

@@ -18,15 +18,15 @@ public class Seat extends AbstractEntity {
@JoinColumn(name = "theater_id", referencedColumnName = "id", updatable = false)
private Theater theater;
@NotNull
private Integer seatRow;
@NotNull
private Integer seatColumn;
public Seat(Integer seatRow, Integer seatColumn, Theater theater) {
this.seatRow = seatRow;
@NotNull
private Integer seatRow;
public Seat(Integer seatColumn, Integer seatRow, Theater theater) {
this.seatColumn = seatColumn;
this.seatRow = seatRow;
setTheater(theater);
}

View File

@@ -1,6 +1,7 @@
package com.ticketing.server.movie.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import com.ticketing.server.payment.domain.Payment;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -25,7 +26,9 @@ public class Ticket extends AbstractEntity {
@JoinColumn(name = "movie_times_id", referencedColumnName = "id", updatable = false)
private MovieTime movieTime;
private Long paymentId;
@ManyToOne
@JoinColumn(name = "payment_id", referencedColumnName = "id", updatable = false)
private Payment payment;
@NotNull
@Enumerated(EnumType.STRING)

View File

@@ -1,6 +1,8 @@
package com.ticketing.server.movie.service;
import com.ticketing.server.global.exception.ErrorCode;
import static com.ticketing.server.global.exception.ErrorCode.MOVIE_NOT_FOUND;
import com.ticketing.server.global.exception.TicketingException;
import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.MovieTime;
import com.ticketing.server.movie.domain.repository.MovieRepository;
@@ -20,24 +22,28 @@ import org.springframework.stereotype.Service;
@Slf4j
public class MovieTimeServiceImpl implements MovieTimeService {
private final MovieRepository movieRepository;
private final MovieRepository movieRepository;
private final MovieTimeRepository movieTimeRepository;
private final MovieTimeRepository movieTimeRepository;
@Override
public List<MovieTimeDto> getMovieTimes(String title, LocalDate runningDate) {
Movie movie = movieRepository.findByTitle(title)
.orElseThrow(ErrorCode::throwMovieNotFound);
@Override
public List<MovieTimeDto> getMovieTimes(String title, LocalDate runningDate) {
Movie movie = movieRepository.findByTitle(title)
.orElseThrow(MovieTimeServiceImpl::throwMovieNotFound);
LocalDateTime startOfDay = runningDate.atStartOfDay().plusHours(6);
LocalDateTime endOfDay = startOfDay.plusDays(1);
LocalDateTime startOfDay = runningDate.atStartOfDay().plusHours(6);
LocalDateTime endOfDay = startOfDay.plusDays(1);
List<MovieTime> movieTimes = movieTimeRepository.findValidMovieTimes(movie, startOfDay, endOfDay);
List<MovieTime> movieTimes = movieTimeRepository.findValidMovieTimes(movie, startOfDay, endOfDay);
return movieTimes.stream()
.map(MovieTimeDto::from)
.collect(Collectors.toList());
return movieTimes.stream()
.map(MovieTimeDto::from)
.collect(Collectors.toList());
}
}
private static RuntimeException throwMovieNotFound() {
throw new TicketingException(MOVIE_NOT_FOUND);
}
}

View File

@@ -19,8 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
@Service
@RequiredArgsConstructor
public class
MovieSetupService {
public class MovieSetupService {
private final MovieRepository movieRepository;
private final MovieTimeRepository movieTimeRepository;
@@ -54,9 +53,9 @@ MovieSetupService {
);
for (Theater theater : theaters) {
for (int row = 1; row <= 2; row++) {
for (int col = 1; col <= 10; col++) {
new Seat(row, col, theater);
for (int i = 1; i <= 2; i++) {
for (int j = 1; j <= 10; j++) {
new Seat(i, j, theater);
}
}
}

View File

@@ -1,26 +1,23 @@
package com.ticketing.server.payment.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import com.ticketing.server.payment.service.dto.CreatePaymentDto;
import com.ticketing.server.user.domain.User;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.validation.constraints.NotEmpty;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Entity
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Payment extends AbstractEntity {
@NotNull
private Long userId;
@NotEmpty
private String movieTitle;
@ManyToOne
@JoinColumn(name = "user_id", referencedColumnName = "id", updatable = false)
private User user;
@NotNull
@Enumerated(value = EnumType.STRING)
@@ -32,28 +29,10 @@ public class Payment extends AbstractEntity {
private String failedMessage;
@NotEmpty
@NotNull
private String paymentNumber;
@NotNull
private Integer totalPrice;
private Payment(Long userId, String movieTitle, PaymentType type, PaymentStatus status, String paymentNumber, Integer totalPrice) {
this.userId = userId;
this.movieTitle = movieTitle;
this.type = type;
this.status = status;
this.paymentNumber = paymentNumber;
this.totalPrice = totalPrice;
}
public static Payment from(CreatePaymentDto dto) {
return new Payment(dto.getUserId(),
dto.getMovieTitle(),
dto.getType(),
dto.getStatus(),
dto.getPaymentNumber(),
dto.getTotalPrice());
}
}

View File

@@ -1,12 +1,10 @@
package com.ticketing.server.payment.domain.repository;
import com.ticketing.server.payment.domain.Payment;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface PaymentRepository extends JpaRepository<Payment, Long> {
List<Payment> findByUserId(Long userId);
}

View File

@@ -1,26 +1,9 @@
package com.ticketing.server.payment.service;
import com.ticketing.server.payment.domain.repository.PaymentRepository;
import com.ticketing.server.payment.service.dto.SimplePaymentDto;
import com.ticketing.server.payment.service.interfaces.PaymentService;
import com.ticketing.server.user.api.dto.response.SimplePaymentsResponse;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class PaymentServiceImpl implements PaymentService {
private final PaymentRepository paymentRepository;
@Override
public SimplePaymentsResponse findSimplePayments(Long userId) {
return paymentRepository.findByUserId(userId)
.stream()
.map(SimplePaymentDto::from)
.collect(Collectors.collectingAndThen(Collectors.toList()
, list -> SimplePaymentsResponse.from(userId, list)));
}
}

View File

@@ -1,30 +0,0 @@
package com.ticketing.server.payment.service.dto;
import com.ticketing.server.payment.domain.PaymentStatus;
import com.ticketing.server.payment.domain.PaymentType;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class CreatePaymentDto {
private Long userId;
private String movieTitle;
private PaymentType type;
private PaymentStatus status;
private String paymentNumber;
private Integer totalPrice;
public static CreatePaymentDto of(
Long userId,
String movieTitle,
PaymentType type,
PaymentStatus status,
String paymentNumber,
Integer totalPrice) {
return new CreatePaymentDto(userId, movieTitle, type, status, paymentNumber, totalPrice);
}
}

View File

@@ -1,25 +0,0 @@
package com.ticketing.server.payment.service.dto;
import com.ticketing.server.payment.domain.Payment;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class SimplePaymentDto {
private Long paymentId;
private String movieTitle;
private String paymentNumber;
private Integer totalPrice;
public static SimplePaymentDto from(Payment payment) {
return new SimplePaymentDto(
payment.getId(),
payment.getMovieTitle(),
payment.getPaymentNumber(),
payment.getTotalPrice()
);
}
}

View File

@@ -1,9 +1,5 @@
package com.ticketing.server.payment.service.interfaces;
import com.ticketing.server.user.api.dto.response.SimplePaymentsResponse;
public interface PaymentService {
SimplePaymentsResponse findSimplePayments(Long userId);
}

View File

@@ -1,10 +0,0 @@
package com.ticketing.server.user.api;
import com.ticketing.server.user.api.dto.request.SimplePaymentsRequest;
import com.ticketing.server.user.api.dto.response.SimplePaymentsResponse;
public interface PaymentClient {
SimplePaymentsResponse getSimplePayments(SimplePaymentsRequest request);
}

View File

@@ -1,18 +0,0 @@
package com.ticketing.server.user.api.dto.request;
import com.ticketing.server.user.domain.User;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class SimplePaymentsRequest {
private Long userId;
public static SimplePaymentsRequest from(User user) {
return new SimplePaymentsRequest(user.getId());
}
}

View File

@@ -1,21 +0,0 @@
package com.ticketing.server.user.api.dto.response;
import com.ticketing.server.payment.service.dto.SimplePaymentDto;
import java.util.List;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class SimplePaymentsResponse {
private Long userId;
private List<SimplePaymentDto> payments;
public static SimplePaymentsResponse from(Long userId, List<SimplePaymentDto> simplePayments) {
return new SimplePaymentsResponse(userId, simplePayments);
}
}

View File

@@ -1,21 +0,0 @@
package com.ticketing.server.user.api.impl;
import com.ticketing.server.payment.service.PaymentServiceImpl;
import com.ticketing.server.user.api.PaymentClient;
import com.ticketing.server.user.api.dto.request.SimplePaymentsRequest;
import com.ticketing.server.user.api.dto.response.SimplePaymentsResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class PaymentClientImpl implements PaymentClient {
private final PaymentServiceImpl paymentService;
@Override
public SimplePaymentsResponse getSimplePayments(SimplePaymentsRequest request) {
return paymentService.findSimplePayments(request.getUserId());
}
}

View File

@@ -4,7 +4,6 @@ import com.ticketing.server.user.application.request.SignUpRequest;
import com.ticketing.server.user.application.request.UserChangePasswordRequest;
import com.ticketing.server.user.application.request.UserDeleteRequest;
import com.ticketing.server.user.application.response.SignUpResponse;
import com.ticketing.server.user.application.response.SimplePaymentDetailsResponse;
import com.ticketing.server.user.application.response.UserChangePasswordResponse;
import com.ticketing.server.user.application.response.UserDeleteResponse;
import com.ticketing.server.user.application.response.UserDetailResponse;
@@ -66,11 +65,4 @@ public class UserController {
return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.from(user));
}
@GetMapping("/payments")
@Secured("ROLE_GUEST")
public ResponseEntity<SimplePaymentDetailsResponse> getPayments(@AuthenticationPrincipal UserDetails userRequest) {
SimplePaymentDetailsResponse paymentDetails = userService.findSimplePaymentDetails(userRequest.getUsername());
return ResponseEntity.status(HttpStatus.OK).body(paymentDetails);
}
}

View File

@@ -1,21 +0,0 @@
package com.ticketing.server.user.application.response;
import com.ticketing.server.payment.service.dto.SimplePaymentDto;
import com.ticketing.server.user.api.dto.response.SimplePaymentsResponse;
import java.util.List;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class SimplePaymentDetailsResponse {
private String email;
private List<SimplePaymentDto> payments;
public static SimplePaymentDetailsResponse of(String email, SimplePaymentsResponse paymentsResponse) {
return new SimplePaymentDetailsResponse(email, paymentsResponse.getPayments());
}
}

View File

@@ -1,7 +1,10 @@
package com.ticketing.server.user.domain;
import static com.ticketing.server.global.exception.ErrorCode.DELETED_EMAIL;
import static com.ticketing.server.global.exception.ErrorCode.MISMATCH_PASSWORD;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import com.ticketing.server.global.exception.ErrorCode;
import com.ticketing.server.global.exception.TicketingException;
import com.ticketing.server.global.validator.constraints.Phone;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
@@ -59,7 +62,7 @@ public class User extends AbstractEntity {
public User delete(DeleteUserDTO deleteUser) {
if (isDeleted) {
throw ErrorCode.throwDeletedEmail();
throw new TicketingException(DELETED_EMAIL);
}
checkPassword(deleteUser);
@@ -78,7 +81,7 @@ public class User extends AbstractEntity {
public void checkPassword(PasswordMatches passwordMatches) {
if (!passwordMatches.passwordMatches(password)) {
throw ErrorCode.throwMismatchPassword();
throw new TicketingException(MISMATCH_PASSWORD);
}
}

View File

@@ -1,6 +1,10 @@
package com.ticketing.server.user.service;
import com.ticketing.server.global.exception.ErrorCode;
import static com.ticketing.server.global.exception.ErrorCode.REFRESH_TOKEN_NOT_FOUND;
import static com.ticketing.server.global.exception.ErrorCode.TOKEN_TYPE;
import static com.ticketing.server.global.exception.ErrorCode.UNAVAILABLE_REFRESH_TOKEN;
import com.ticketing.server.global.exception.TicketingException;
import com.ticketing.server.global.redis.RefreshRedisRepository;
import com.ticketing.server.global.redis.RefreshToken;
import com.ticketing.server.global.security.jwt.JwtProperties;
@@ -59,11 +63,11 @@ public class AuthenticationServiceImpl implements AuthenticationService {
// Redis 에 토큰이 있는지 검증
RefreshToken findTokenEntity = refreshRedisRepository.findByEmail(authentication.getName())
.orElseThrow(ErrorCode::throwRefreshTokenNotFound);
.orElseThrow(() -> new TicketingException(REFRESH_TOKEN_NOT_FOUND));
// redis 토큰과 input 토큰이 일치한지 확인
if (!refreshToken.equals(findTokenEntity.getToken())) {
throw ErrorCode.throwUnavailableRefreshToken();
throw new TicketingException(UNAVAILABLE_REFRESH_TOKEN);
}
// 토큰 발급
@@ -90,7 +94,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
if (StringUtils.hasText(bearerToken) && jwtProperties.hasTokenStartsWith(bearerToken)) {
return bearerToken.substring(7);
}
throw ErrorCode.throwTokenType();
throw new TicketingException(TOKEN_TYPE);
}
}

View File

@@ -1,6 +1,8 @@
package com.ticketing.server.user.service;
import com.ticketing.server.global.exception.ErrorCode;
import static com.ticketing.server.global.exception.ErrorCode.EMAIL_NOT_FOUND;
import com.ticketing.server.global.exception.TicketingException;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.repository.UserRepository;
import java.util.Collections;
@@ -21,7 +23,7 @@ public class CustomUserDetailsService implements UserDetailsService {
public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
return userRepository.findByEmailAndIsDeletedFalse(email)
.map(this::createUserDetails)
.orElseThrow(ErrorCode::throwEmailNotFound);
.orElseThrow(() -> new TicketingException(EMAIL_NOT_FOUND));
}
private UserDetails createUserDetails(User user) {

View File

@@ -1,10 +1,9 @@
package com.ticketing.server.user.service;
import com.ticketing.server.global.exception.ErrorCode;
import com.ticketing.server.user.api.PaymentClient;
import com.ticketing.server.user.api.dto.request.SimplePaymentsRequest;
import com.ticketing.server.user.api.dto.response.SimplePaymentsResponse;
import com.ticketing.server.user.application.response.SimplePaymentDetailsResponse;
import static com.ticketing.server.global.exception.ErrorCode.DUPLICATE_EMAIL;
import static com.ticketing.server.global.exception.ErrorCode.EMAIL_NOT_FOUND;
import com.ticketing.server.global.exception.TicketingException;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.repository.UserRepository;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
@@ -27,7 +26,6 @@ import org.springframework.validation.annotation.Validated;
public class UserServiceImpl implements UserService {
private final UserRepository userRepository;
private final PaymentClient paymentClient;
@Override
@Transactional
@@ -37,7 +35,7 @@ public class UserServiceImpl implements UserService {
return userRepository.save(signUpDto.toUser());
}
throw ErrorCode.throwDuplicateEmail();
throw new TicketingException(DUPLICATE_EMAIL);
}
@Override
@@ -57,20 +55,16 @@ public class UserServiceImpl implements UserService {
@Override
public User findByEmail(String email) {
return userRepository.findByEmail(email)
.orElseThrow(ErrorCode::throwEmailNotFound);
}
@Override
public SimplePaymentDetailsResponse findSimplePaymentDetails(String email) {
User user = findNotDeletedUserByEmail(email);
SimplePaymentsResponse simplePayments = paymentClient.getSimplePayments(SimplePaymentsRequest.from(user));
return SimplePaymentDetailsResponse.of(email, simplePayments);
.orElseThrow(UserServiceImpl::throwEmailNotFound);
}
private User findNotDeletedUserByEmail(String email) {
return userRepository.findByEmailAndIsDeletedFalse(email)
.orElseThrow(ErrorCode::throwEmailNotFound);
.orElseThrow(UserServiceImpl::throwEmailNotFound);
}
private static RuntimeException throwEmailNotFound() {
throw new TicketingException(EMAIL_NOT_FOUND);
}
}

View File

@@ -1,6 +1,5 @@
package com.ticketing.server.user.service.interfaces;
import com.ticketing.server.user.application.response.SimplePaymentDetailsResponse;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
@@ -16,7 +15,4 @@ public interface UserService {
User changePassword(@Valid ChangePasswordDTO changePasswordDto);
User findByEmail(String email);
SimplePaymentDetailsResponse findSimplePaymentDetails(String email);
}

View File

@@ -1,71 +0,0 @@
package com.ticketing.server.payment.service;
import static com.ticketing.server.payment.domain.PaymentStatus.COMPLETED;
import static com.ticketing.server.payment.domain.PaymentType.KAKAO_PAY;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
import static org.mockito.Mockito.when;
import com.ticketing.server.payment.domain.Payment;
import com.ticketing.server.payment.domain.repository.PaymentRepository;
import com.ticketing.server.payment.service.dto.CreatePaymentDto;
import com.ticketing.server.user.api.dto.response.SimplePaymentsResponse;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
class PaymentServiceImplTest {
@Mock
PaymentRepository paymentRepository;
@InjectMocks
PaymentServiceImpl paymentService;
@Test
@DisplayName("유저 ID로 결제내역이 없을 경우")
void findSimplePaymentsZero() {
// given
when(paymentRepository.findByUserId(2L)).thenReturn(Collections.emptyList());
// when
SimplePaymentsResponse simplePayments = paymentService.findSimplePayments(2L);
// then
assertAll(
() -> assertThat(simplePayments.getUserId()).isEqualTo(2L)
, () -> assertThat(simplePayments.getPayments()).isEmpty()
);
}
@ParameterizedTest
@DisplayName("유저 ID로 간소 결제내역 조회 성공")
@ValueSource(longs = {1L, 2L, 100L, 154L})
void findSimplePaymentsSuccess(Long userId) {
// given
List<Payment> payments = Arrays.asList(
Payment.from(CreatePaymentDto.of(userId, "범죄도시2", KAKAO_PAY, COMPLETED, "004-323-77542", 15_000)),
Payment.from(CreatePaymentDto.of(userId, "토르", KAKAO_PAY, COMPLETED, "004-323-77544", 30_000))
);
when(paymentRepository.findByUserId(userId)).thenReturn(payments);
// when
SimplePaymentsResponse simplePayments = paymentService.findSimplePayments(userId);
// then
assertAll(
() -> assertThat(simplePayments.getUserId()).isEqualTo(userId)
, () -> assertThat(simplePayments.getPayments()).hasSize(2)
);
}
}

View File

@@ -1,7 +1,5 @@
package com.ticketing.server.user.service;
import static com.ticketing.server.payment.domain.PaymentStatus.COMPLETED;
import static com.ticketing.server.payment.domain.PaymentType.KAKAO_PAY;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertAll;
@@ -9,13 +7,6 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import com.ticketing.server.global.exception.TicketingException;
import com.ticketing.server.payment.domain.Payment;
import com.ticketing.server.payment.service.dto.CreatePaymentDto;
import com.ticketing.server.payment.service.dto.SimplePaymentDto;
import com.ticketing.server.user.api.PaymentClient;
import com.ticketing.server.user.api.dto.request.SimplePaymentsRequest;
import com.ticketing.server.user.api.dto.response.SimplePaymentsResponse;
import com.ticketing.server.user.application.response.SimplePaymentDetailsResponse;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.UserGrade;
import com.ticketing.server.user.domain.repository.UserRepository;
@@ -23,8 +14,6 @@ import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
import com.ticketing.server.user.service.dto.DeleteUserDtoTest;
import com.ticketing.server.user.service.dto.SignUpDTO;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
@@ -45,9 +34,6 @@ class UserServiceImplTest {
@Mock
UserRepository userRepository;
@Mock
PaymentClient paymentClient;
@InjectMocks
UserServiceImpl userService;
@@ -138,30 +124,4 @@ class UserServiceImplTest {
assertThat(user).isNotNull();
}
@Test
@DisplayName("회원 결제목록 조회")
void findSimplePaymentDetailsSuccess() {
// given
List<SimplePaymentDto> paymentDtos = Arrays.asList(
SimplePaymentDto.from(
Payment.from(
CreatePaymentDto.of(1L, "범죄도시2", KAKAO_PAY, COMPLETED, "004-323-77542", 15_000))),
SimplePaymentDto.from(
Payment.from(
CreatePaymentDto.of(1L, "토르", KAKAO_PAY, COMPLETED, "004-323-77544", 30_000)))
);
when(userRepository.findByEmailAndIsDeletedFalse("ticketing@gmail.com")).thenReturn(Optional.of(user));
when(paymentClient.getSimplePayments(any())).thenReturn(SimplePaymentsResponse.from(1L, paymentDtos));
// when
SimplePaymentDetailsResponse paymentDetails = userService.findSimplePaymentDetails("ticketing@gmail.com");
// then
assertAll(
() -> assertThat(paymentDetails.getEmail()).isEqualTo("ticketing@gmail.com")
, () -> assertThat(paymentDetails.getPayments()).hasSize(2)
);
}
}