Compare commits

...

11 Commits

Author SHA1 Message Date
손창현
30dd038afc refactor: variable DTO -> Dto 2022-07-11 15:35:10 +09:00
손창현
e47b0a8110 feat: add movie information - STAFF 2022-07-11 14:33:29 +09:00
손창현
0a74de08be add: registerMovie() in MovieService 2022-07-10 23:40:46 +09:00
손창현
15443d9d24 add: DUPLICATE MOVIE exception 2022-07-10 23:38:03 +09:00
손창현
2dd4121782 add: MovieRegisterDTO 2022-07-10 23:28:48 +09:00
손창현
697de67d56 add: MovieTitleResponse 2022-07-09 20:21:17 +09:00
Kim DongHyo
720c495b51 Update README.md 2022-07-09 13:47:25 +09:00
Kim DongHyo
bd7b761636 Update README.md 2022-07-09 13:46:27 +09:00
Kim DongHyo
c9c4201920 Update README.md 2022-07-09 13:46:11 +09:00
Kim DongHyo
16eed0cbed [User] 회원 결제목록 조회 및 Exception Method 한 곳으로 이동 (#50)
* feat: findPayments

* refactor: Exception Method 한 곳으로 이동
2022-07-08 11:33:21 +09:00
Kim DongHyo
8d5f179647 Update README.md 2022-07-06 04:28:09 +09:00
39 changed files with 579 additions and 122 deletions

View File

@@ -44,7 +44,7 @@
``` mermaid
erDiagram
MOVIE ||--o{ MOVIE_TIMES : ""
MOVIE ||--o{ MOVIE_TIME : ""
MOVIE {
bigint id PK "영화 ID"
varchar title "영화제목"
@@ -52,7 +52,7 @@ erDiagram
datetime created_at "등록일시"
datetime updated_at "수정일시"
}
THEATER ||--o{ MOVIE_TIMES : ""
THEATER ||--o{ MOVIE_TIME : ""
THEATER ||--|{ SEAT : ""
THEATER {
bigint id PK "상영관 ID"
@@ -70,8 +70,8 @@ erDiagram
datetime created_at "등록일시"
datetime updated_at "수정일시"
}
MOVIE_TIMES ||--o{ TICKET : ""
MOVIE_TIMES {
MOVIE_TIME ||--o{ TICKET : ""
MOVIE_TIME {
bigint id PK "상영시간표 ID"
bigint movie_id FK "영화 ID"
bigint theater_id FK "상영관 ID"
@@ -84,8 +84,8 @@ erDiagram
TICKET {
bigint id PK "티켓 ID"
bigint seat_id FK "좌석 ID"
bigint movie_times_id FK "상영시간표 ID"
bigint payment_id FK "결제 ID"
bigint movie_time_id FK "상영시간표 ID"
bigint payment_id "결제 ID"
varchar status "상태 - 구매가능/예약진행중/판매완료"
int ticket_price "가격"
datetime created_at "등록일시"
@@ -94,7 +94,8 @@ erDiagram
TICKET }|--|| PAYMENT : ""
PAYMENT {
bigint id PK "결제 ID"
bigint user_id FK "유저ID"
bigint user_id "유저ID"
varchar movie_title "영화제목"
varchar type "결제 타입 - 예) 네이버페이, 카카오페이"
varchar status "상태 - 완료/환불/실패"
varchar failed_message "실패사유 - 컬럼명을 알아보기 쉬운가?"

View File

@@ -18,15 +18,60 @@ 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, "리프레쉬 토큰을 찾을 수 없습니다."),
/* 409 CONFLICT : Resource 의 현재 상태와 충돌. 보통 중복된 데이터 존재 */
DUPLICATE_EMAIL(CONFLICT, "이메일이 이미 존재합니다."),
DUPLICATE_MOVIE(CONFLICT, "해당 영화 정보가 이미 존재합니다."),
DELETED_EMAIL(CONFLICT, "이미 삭제된 이메일 입니다.");
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 throwDuplicateMovie() {
throw new TicketingException(DUPLICATE_MOVIE);
}
public static TicketingException throwDeletedEmail() {
throw new TicketingException(DELETED_EMAIL);
}
}

View File

@@ -53,7 +53,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers(HttpMethod.POST, "/api/auth/token").permitAll()
.antMatchers(HttpMethod.POST, "/api/auth/refresh").permitAll()
.antMatchers(HttpMethod.POST, "/api/users").permitAll()
.antMatchers("/api/movies/**").permitAll()
.antMatchers(HttpMethod.GET,"/api/movies").permitAll()
.antMatchers("/api/movieTimes/**").permitAll()
.antMatchers("/l7check").permitAll()
.antMatchers("/actuator/**").permitAll()

View File

@@ -1,14 +1,20 @@
package com.ticketing.server.movie.application;
import com.ticketing.server.movie.application.request.MovieRegisterRequest;
import com.ticketing.server.movie.application.response.MovieListResponse;
import com.ticketing.server.movie.application.response.MovieTitleResponse;
import com.ticketing.server.movie.service.interfaces.MovieService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.annotation.Secured;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -19,12 +25,29 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
public class MovieController {
private final MovieService movieService;
private final MovieService movieService;
@GetMapping()
@ApiOperation(value = "영화 목록 조회")
public ResponseEntity<MovieListResponse> getMovies() {
return ResponseEntity.status(HttpStatus.OK).body(MovieListResponse.from(movieService.getMovies()));
}
@PostMapping()
@ApiOperation(value = "영화 정보 등록")
@Secured("ROLE_STAFF")
public ResponseEntity<MovieTitleResponse> registerMovie(@RequestBody @Valid MovieRegisterRequest request) {
return ResponseEntity.status(HttpStatus.OK)
.body(
MovieTitleResponse.from(
movieService.registerMovie(request.toMovieRegisterDTO())
)
);
}
@GetMapping()
@ApiOperation(value = "영화 목록 조회")
public ResponseEntity<MovieListResponse> getMovies() {
return ResponseEntity.status(HttpStatus.OK)
.body(
MovieListResponse.from(
movieService.getMovies()
)
);
}
}

View File

@@ -0,0 +1,25 @@
package com.ticketing.server.movie.application.request;
import com.ticketing.server.movie.service.dto.MovieRegisterDTO;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class MovieRegisterRequest {
@NotEmpty(message = "{validation.not.empty.title}")
private String title;
@NotNull(message = "{validation.not.null.runningTime}")
private Long runningTime;
public MovieRegisterDTO toMovieRegisterDTO() {
return new MovieRegisterDTO(this.title, this.runningTime);
}
}

View File

@@ -1,6 +1,6 @@
package com.ticketing.server.movie.application.response;
import com.ticketing.server.movie.service.dto.MovieDto;
import com.ticketing.server.movie.service.dto.MovieDTO;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.AccessLevel;
@@ -12,9 +12,9 @@ import lombok.Getter;
public class MovieListResponse {
@ApiModelProperty(value = "영화 제목")
private List<MovieDto> movieDtos;
private List<MovieDTO> movieDtos;
public static MovieListResponse from(List<MovieDto> movieDtos) {
public static MovieListResponse from(List<MovieDTO> movieDtos) {
return new MovieListResponse(movieDtos);
}

View File

@@ -1,6 +1,6 @@
package com.ticketing.server.movie.application.response;
import com.ticketing.server.movie.service.dto.MovieTimeDto;
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.AccessLevel;
@@ -12,9 +12,9 @@ import lombok.Getter;
public class MovieTimeListResponse {
@ApiModelProperty(value = "영화 시간표 정보")
private List<MovieTimeDto> movieTimeDtos;
private List<MovieTimeDTO> movieTimeDTOS;
public static MovieTimeListResponse from(List<MovieTimeDto> movieTimeDtos) {
public static MovieTimeListResponse from(List<MovieTimeDTO> movieTimeDtos) {
return new MovieTimeListResponse(movieTimeDtos);
}

View File

@@ -0,0 +1,20 @@
package com.ticketing.server.movie.application.response;
import com.ticketing.server.movie.service.dto.MovieDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class MovieTitleResponse {
@ApiModelProperty(value = "영화 제목")
private String title;
public static MovieTitleResponse from(MovieDTO movieDto) {
return new MovieTitleResponse(movieDto.getTitle());
}
}

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 seatColumn;
@NotNull
private Integer seatRow;
public Seat(Integer seatColumn, Integer seatRow, Theater theater) {
this.seatColumn = seatColumn;
@NotNull
private Integer seatColumn;
public Seat(Integer seatRow, Integer seatColumn, Theater theater) {
this.seatRow = seatRow;
this.seatColumn = seatColumn;
setTheater(theater);
}

View File

@@ -1,7 +1,6 @@
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;
@@ -26,9 +25,7 @@ public class Ticket extends AbstractEntity {
@JoinColumn(name = "movie_times_id", referencedColumnName = "id", updatable = false)
private MovieTime movieTime;
@ManyToOne
@JoinColumn(name = "payment_id", referencedColumnName = "id", updatable = false)
private Payment payment;
private Long paymentId;
@NotNull
@Enumerated(EnumType.STRING)

View File

@@ -1,10 +1,13 @@
package com.ticketing.server.movie.service;
import com.ticketing.server.global.exception.ErrorCode;
import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.service.dto.MovieDto;
import com.ticketing.server.movie.service.dto.MovieDTO;
import com.ticketing.server.movie.service.dto.MovieRegisterDTO;
import com.ticketing.server.movie.service.interfaces.MovieService;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -15,15 +18,27 @@ import org.springframework.stereotype.Service;
@Slf4j
public class MovieServiceImpl implements MovieService {
private final MovieRepository movieRepository;
private final MovieRepository movieRepository;
public List<MovieDto> getMovies() {
List<Movie> movies = movieRepository.findValidMovies();
@Override
public MovieDTO registerMovie(MovieRegisterDTO movieRegisterDto) {
Optional<Movie> movie = movieRepository.findByTitle(movieRegisterDto.getTitle());
return movies.stream()
.map(MovieDto::from)
.collect(Collectors.toList());
if(movie.isEmpty()) {
return MovieDTO.from(movieRepository.save(movieRegisterDto.toMovie()));
}
}
throw ErrorCode.throwDuplicateMovie();
}
@Override
public List<MovieDTO> getMovies() {
List<Movie> movies = movieRepository.findValidMovies();
return movies.stream()
.map(MovieDTO::from)
.collect(Collectors.toList());
}
}

View File

@@ -1,13 +1,11 @@
package com.ticketing.server.movie.service;
import static com.ticketing.server.global.exception.ErrorCode.MOVIE_NOT_FOUND;
import com.ticketing.server.global.exception.TicketingException;
import com.ticketing.server.global.exception.ErrorCode;
import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.MovieTime;
import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
import com.ticketing.server.movie.service.dto.MovieTimeDto;
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
import com.ticketing.server.movie.service.interfaces.MovieTimeService;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -22,28 +20,24 @@ 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(MovieTimeServiceImpl::throwMovieNotFound);
@Override
public List<MovieTimeDTO> getMovieTimes(String title, LocalDate runningDate) {
Movie movie = movieRepository.findByTitle(title)
.orElseThrow(ErrorCode::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

@@ -7,12 +7,12 @@ import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class MovieDto {
public class MovieDTO {
private String title;
public static MovieDto from(Movie movie) {
return new MovieDto(movie.getTitle());
public static MovieDTO from(Movie movie) {
return new MovieDTO(movie.getTitle());
}
}

View File

@@ -0,0 +1,24 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.domain.Movie;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class MovieRegisterDTO {
@NotEmpty(message = "{validation.not.empty.title}")
private String title;
@NotNull(message = "{validation.not.null.runningTime}")
private Long runningTime;
public Movie toMovie() {
return new Movie(this.title, this.runningTime);
}
}

View File

@@ -8,7 +8,7 @@ import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class MovieTimeDto {
public class MovieTimeDTO {
private Long movieTimeId;
@@ -20,8 +20,8 @@ public class MovieTimeDto {
private LocalDateTime endAt;
public static MovieTimeDto from(MovieTime movieTime) {
return new MovieTimeDto(movieTime.getId(), movieTime.getTheater().getTheaterNumber(),
public static MovieTimeDTO from(MovieTime movieTime) {
return new MovieTimeDTO(movieTime.getId(), movieTime.getTheater().getTheaterNumber(),
movieTime.getRound(), movieTime.getStartAt(), movieTime.getEndAt());
}

View File

@@ -1,10 +1,13 @@
package com.ticketing.server.movie.service.interfaces;
import com.ticketing.server.movie.service.dto.MovieDto;
import com.ticketing.server.movie.service.dto.MovieDTO;
import com.ticketing.server.movie.service.dto.MovieRegisterDTO;
import java.util.List;
public interface MovieService {
List<MovieDto> getMovies();
MovieDTO registerMovie(MovieRegisterDTO movieRegisterDto);
List<MovieDTO> getMovies();
}

View File

@@ -1,11 +1,11 @@
package com.ticketing.server.movie.service.interfaces;
import com.ticketing.server.movie.service.dto.MovieTimeDto;
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
import java.time.LocalDate;
import java.util.List;
public interface MovieTimeService {
List<MovieTimeDto> getMovieTimes(String title, LocalDate runningDate);
List<MovieTimeDTO> getMovieTimes(String title, LocalDate runningDate);
}

View File

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

View File

@@ -1,23 +1,26 @@
package com.ticketing.server.payment.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.payment.service.dto.CreatePaymentDto;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotEmpty;
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
@ManyToOne
@JoinColumn(name = "user_id", referencedColumnName = "id", updatable = false)
private User user;
private Long userId;
@NotEmpty
private String movieTitle;
@NotNull
@Enumerated(value = EnumType.STRING)
@@ -29,10 +32,28 @@ public class Payment extends AbstractEntity {
private String failedMessage;
@NotNull
@NotEmpty
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,10 +1,12 @@
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,9 +1,26 @@
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

@@ -0,0 +1,30 @@
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

@@ -0,0 +1,25 @@
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,5 +1,9 @@
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

@@ -0,0 +1,10 @@
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

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

@@ -0,0 +1,21 @@
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

@@ -0,0 +1,21 @@
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,6 +4,7 @@ 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;
@@ -65,4 +66,11 @@ 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

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

View File

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

View File

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

View File

@@ -1,9 +1,10 @@
package com.ticketing.server.user.service;
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.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 com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.repository.UserRepository;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
@@ -26,6 +27,7 @@ import org.springframework.validation.annotation.Validated;
public class UserServiceImpl implements UserService {
private final UserRepository userRepository;
private final PaymentClient paymentClient;
@Override
@Transactional
@@ -35,7 +37,7 @@ public class UserServiceImpl implements UserService {
return userRepository.save(signUpDto.toUser());
}
throw new TicketingException(DUPLICATE_EMAIL);
throw ErrorCode.throwDuplicateEmail();
}
@Override
@@ -55,16 +57,20 @@ public class UserServiceImpl implements UserService {
@Override
public User findByEmail(String email) {
return userRepository.findByEmail(email)
.orElseThrow(UserServiceImpl::throwEmailNotFound);
.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);
}
private User findNotDeletedUserByEmail(String email) {
return userRepository.findByEmailAndIsDeletedFalse(email)
.orElseThrow(UserServiceImpl::throwEmailNotFound);
}
private static RuntimeException throwEmailNotFound() {
throw new TicketingException(EMAIL_NOT_FOUND);
.orElseThrow(ErrorCode::throwEmailNotFound);
}
}

View File

@@ -1,5 +1,6 @@
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;
@@ -15,4 +16,7 @@ public interface UserService {
User changePassword(@Valid ChangePasswordDTO changePasswordDto);
User findByEmail(String email);
SimplePaymentDetailsResponse findSimplePaymentDetails(String email);
}

View File

@@ -5,11 +5,10 @@ import static org.mockito.Mockito.when;
import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.service.dto.MovieDto;
import com.ticketing.server.movie.service.dto.MovieDTO;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -21,9 +20,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
public class MovieServiceImplTest {
Movie movie;
MovieDto movieDto;
MovieDTO movieDto;
List<Movie> movies = new ArrayList<>();
List<MovieDto> movieDtos = new ArrayList<>();
List<MovieDTO> movieDTOS = new ArrayList<>();
@Mock
MovieRepository movieRepository;
@@ -39,10 +38,10 @@ public class MovieServiceImplTest {
.thenReturn(Collections.emptyList());
// when
List<MovieDto> movieDtoList = movieService.getMovies();
List<MovieDTO> movieDTOList = movieService.getMovies();
// then
assertTrue(movieDtoList.isEmpty());
assertTrue(movieDTOList.isEmpty());
}
@Test
@@ -52,16 +51,16 @@ public class MovieServiceImplTest {
movie = new Movie("범죄도시2", 106L);
movieDto = movieDto.from(movie);
movies.add(movie);
movieDtos.add(movieDto);
movieDTOS.add(movieDto);
when(movieRepository.findValidMovies())
.thenReturn(movies);
// when
List<MovieDto> movieDtoList = movieService.getMovies();
List<MovieDTO> movieDTOList = movieService.getMovies();
// then
assertTrue(!movieDtoList.isEmpty());
assertTrue(!movieDTOList.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.MovieTimeDto;
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
List<MovieTimeDto> movieTimeDtoList = movieTimeService.getMovieTimes(title, LocalDate.now());
List<MovieTimeDTO> movieTimeDTOList = movieTimeService.getMovieTimes(title, LocalDate.now());
// then
assertTrue(movieTimeDtoList.isEmpty());
assertTrue(movieTimeDTOList.isEmpty());
}
@Test
@@ -76,10 +76,10 @@ public class MovieTimeServiceImplTest {
.thenReturn(movieTimes);
// when
List<MovieTimeDto> movieTimeDtoList = movieTimeService.getMovieTimes(title, LocalDate.of(2022, 07, 01));
List<MovieTimeDTO> movieTimeDTOList = movieTimeService.getMovieTimes(title, LocalDate.of(2022, 07, 01));
// then
assertTrue(!movieTimeDtoList.isEmpty());
assertTrue(!movieTimeDTOList.isEmpty());
}
}

View File

@@ -0,0 +1,71 @@
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,5 +1,7 @@
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;
@@ -7,6 +9,13 @@ 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;
@@ -14,6 +23,8 @@ 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;
@@ -34,6 +45,9 @@ class UserServiceImplTest {
@Mock
UserRepository userRepository;
@Mock
PaymentClient paymentClient;
@InjectMocks
UserServiceImpl userService;
@@ -124,4 +138,30 @@ 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)
);
}
}