Compare commits
23 Commits
feature/fi
...
feature/re
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dd59423238 | ||
|
|
fb5c34b520 | ||
|
|
12a23667b6 | ||
|
|
45b73509d2 | ||
|
|
22c4fd900b | ||
|
|
1b9dab4a4a | ||
|
|
50bc3b97dc | ||
|
|
4005dad9ac | ||
|
|
43674f8f66 | ||
|
|
d80a370232 | ||
|
|
12f1d6b9be | ||
|
|
db5e8272b6 | ||
|
|
9780a84609 | ||
|
|
7283eeb5d3 | ||
|
|
0521b85dd9 | ||
|
|
b836598be3 | ||
|
|
0173fc92ed | ||
|
|
73cc0241d3 | ||
|
|
720c495b51 | ||
|
|
bd7b761636 | ||
|
|
c9c4201920 | ||
|
|
16eed0cbed | ||
|
|
8d5f179647 |
24
README.md
24
README.md
@@ -37,6 +37,7 @@
|
|||||||
- [패키지 구조](https://github.com/f-lab-edu/Ticketing/wiki#-%ED%8C%A8%ED%82%A4%EC%A7%80-%EA%B5%AC%EC%A1%B0)
|
- [패키지 구조](https://github.com/f-lab-edu/Ticketing/wiki#-%ED%8C%A8%ED%82%A4%EC%A7%80-%EA%B5%AC%EC%A1%B0)
|
||||||
- [Use Case](https://github.com/f-lab-edu/Ticketing/wiki/Use-Case)
|
- [Use Case](https://github.com/f-lab-edu/Ticketing/wiki/Use-Case)
|
||||||
- [Prototype](https://github.com/f-lab-edu/Ticketing/wiki/Prototype)
|
- [Prototype](https://github.com/f-lab-edu/Ticketing/wiki/Prototype)
|
||||||
|
- [Issue Posting](https://github.com/f-lab-edu/Ticketing/wiki/Issue-Posting)
|
||||||
|
|
||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
@@ -44,20 +45,22 @@
|
|||||||
|
|
||||||
``` mermaid
|
``` mermaid
|
||||||
erDiagram
|
erDiagram
|
||||||
MOVIE ||--o{ MOVIE_TIMES : ""
|
MOVIE ||--o{ MOVIE_TIME : ""
|
||||||
MOVIE {
|
MOVIE {
|
||||||
bigint id PK "영화 ID"
|
bigint id PK "영화 ID"
|
||||||
varchar title "영화제목"
|
varchar title "영화제목"
|
||||||
int running_time "러닝타임"
|
int running_time "러닝타임"
|
||||||
|
datetime deleted_at "삭제일시"
|
||||||
datetime created_at "등록일시"
|
datetime created_at "등록일시"
|
||||||
datetime updated_at "수정일시"
|
datetime updated_at "수정일시"
|
||||||
}
|
}
|
||||||
THEATER ||--o{ MOVIE_TIMES : ""
|
THEATER ||--o{ MOVIE_TIME : ""
|
||||||
THEATER ||--|{ SEAT : ""
|
THEATER ||--|{ SEAT : ""
|
||||||
THEATER {
|
THEATER {
|
||||||
bigint id PK "상영관 ID"
|
bigint id PK "상영관 ID"
|
||||||
int theater_number "상영관 번호"
|
int theater_number "상영관 번호"
|
||||||
int seat_count "좌석수"
|
int seat_count "좌석수"
|
||||||
|
datetime deleted_at "삭제일시"
|
||||||
datetime created_at "등록일시"
|
datetime created_at "등록일시"
|
||||||
datetime updated_at "수정일시"
|
datetime updated_at "수정일시"
|
||||||
}
|
}
|
||||||
@@ -67,51 +70,56 @@ erDiagram
|
|||||||
bigint theater_id FK "상영관 ID"
|
bigint theater_id FK "상영관 ID"
|
||||||
int column "열"
|
int column "열"
|
||||||
int row "행"
|
int row "행"
|
||||||
|
datetime deleted_at "삭제일시"
|
||||||
datetime created_at "등록일시"
|
datetime created_at "등록일시"
|
||||||
datetime updated_at "수정일시"
|
datetime updated_at "수정일시"
|
||||||
}
|
}
|
||||||
MOVIE_TIMES ||--o{ TICKET : ""
|
MOVIE_TIME ||--o{ TICKET : ""
|
||||||
MOVIE_TIMES {
|
MOVIE_TIME {
|
||||||
bigint id PK "상영시간표 ID"
|
bigint id PK "상영시간표 ID"
|
||||||
bigint movie_id FK "영화 ID"
|
bigint movie_id FK "영화 ID"
|
||||||
bigint theater_id FK "상영관 ID"
|
bigint theater_id FK "상영관 ID"
|
||||||
int round "회차"
|
int round "회차"
|
||||||
time start_at "시작 시간"
|
time start_at "시작 시간"
|
||||||
time end_at "종료 시간"
|
time end_at "종료 시간"
|
||||||
|
datetime deleted_at "삭제일시"
|
||||||
datetime created_at "등록일시"
|
datetime created_at "등록일시"
|
||||||
datetime updated_at "수정일시"
|
datetime updated_at "수정일시"
|
||||||
}
|
}
|
||||||
TICKET {
|
TICKET {
|
||||||
bigint id PK "티켓 ID"
|
bigint id PK "티켓 ID"
|
||||||
bigint seat_id FK "좌석 ID"
|
bigint seat_id FK "좌석 ID"
|
||||||
bigint movie_times_id FK "상영시간표 ID"
|
bigint movie_time_id FK "상영시간표 ID"
|
||||||
bigint payment_id FK "결제 ID"
|
bigint payment_id "결제 ID"
|
||||||
varchar status "상태 - 구매가능/예약진행중/판매완료"
|
varchar status "상태 - 구매가능/예약진행중/판매완료"
|
||||||
int ticket_price "가격"
|
int ticket_price "가격"
|
||||||
|
datetime deleted_at "삭제일시"
|
||||||
datetime created_at "등록일시"
|
datetime created_at "등록일시"
|
||||||
datetime updated_at "수정일시"
|
datetime updated_at "수정일시"
|
||||||
}
|
}
|
||||||
TICKET }|--|| PAYMENT : ""
|
TICKET }|--|| PAYMENT : ""
|
||||||
PAYMENT {
|
PAYMENT {
|
||||||
bigint id PK "결제 ID"
|
bigint id PK "결제 ID"
|
||||||
bigint user_id FK "유저ID"
|
bigint user_alternate_id "유저 대체ID"
|
||||||
|
varchar movie_title "영화제목"
|
||||||
varchar type "결제 타입 - 예) 네이버페이, 카카오페이"
|
varchar type "결제 타입 - 예) 네이버페이, 카카오페이"
|
||||||
varchar status "상태 - 완료/환불/실패"
|
varchar status "상태 - 완료/환불/실패"
|
||||||
varchar failed_message "실패사유 - 컬럼명을 알아보기 쉬운가?"
|
varchar failed_message "실패사유 - 컬럼명을 알아보기 쉬운가?"
|
||||||
varchar payment_number "예매번호"
|
varchar payment_number "예매번호"
|
||||||
int total_price "결제 금액"
|
int total_price "결제 금액"
|
||||||
|
datetime deleted_at "삭제일시"
|
||||||
datetime created_at "결제일시"
|
datetime created_at "결제일시"
|
||||||
datetime updated_at "수정일시"
|
datetime updated_at "수정일시"
|
||||||
}
|
}
|
||||||
USER ||--o{ PAYMENT : ""
|
USER ||--o{ PAYMENT : ""
|
||||||
USER {
|
USER {
|
||||||
bigint id "회원"
|
bigint id "회원"
|
||||||
|
bigint alternate_id "대체ID"
|
||||||
varchar name "이름"
|
varchar name "이름"
|
||||||
varchar email "이메일"
|
varchar email "이메일"
|
||||||
varchar password "비밀번호"
|
varchar password "비밀번호"
|
||||||
varchar grade "등급 - 고객/임직원"
|
varchar grade "등급 - 고객/임직원"
|
||||||
varchar phone "휴대폰 번호"
|
varchar phone "휴대폰 번호"
|
||||||
boolean is_deleted "탈퇴여부"
|
|
||||||
datetime deleted_at "탈퇴일시"
|
datetime deleted_at "탈퇴일시"
|
||||||
datetime created_at "가입일시"
|
datetime created_at "가입일시"
|
||||||
datetime updated_at "수정일시"
|
datetime updated_at "수정일시"
|
||||||
|
|||||||
@@ -19,15 +19,15 @@ public abstract class AbstractEntity {
|
|||||||
|
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
private Long id;
|
protected Long id;
|
||||||
|
|
||||||
@Column(nullable = false, updatable = false)
|
@Column(nullable = false, updatable = false)
|
||||||
@CreatedDate
|
@CreatedDate
|
||||||
private LocalDateTime createdAt;
|
protected LocalDateTime createdAt;
|
||||||
|
|
||||||
@LastModifiedDate
|
@LastModifiedDate
|
||||||
private LocalDateTime updatedAt;
|
protected LocalDateTime updatedAt;
|
||||||
|
|
||||||
private LocalDateTime deletedAt;
|
protected LocalDateTime deletedAt;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.ticketing.server.global.exception;
|
|||||||
|
|
||||||
import static org.springframework.http.HttpStatus.BAD_REQUEST;
|
import static org.springframework.http.HttpStatus.BAD_REQUEST;
|
||||||
import static org.springframework.http.HttpStatus.CONFLICT;
|
import static org.springframework.http.HttpStatus.CONFLICT;
|
||||||
|
import static org.springframework.http.HttpStatus.FORBIDDEN;
|
||||||
import static org.springframework.http.HttpStatus.NOT_FOUND;
|
import static org.springframework.http.HttpStatus.NOT_FOUND;
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
@@ -16,17 +17,100 @@ public enum ErrorCode {
|
|||||||
MISMATCH_PASSWORD(BAD_REQUEST, "비밀번호가 일치하지 않습니다."),
|
MISMATCH_PASSWORD(BAD_REQUEST, "비밀번호가 일치하지 않습니다."),
|
||||||
TOKEN_TYPE(BAD_REQUEST, "토큰 타입이 올바르지 않습니다."),
|
TOKEN_TYPE(BAD_REQUEST, "토큰 타입이 올바르지 않습니다."),
|
||||||
UNAVAILABLE_REFRESH_TOKEN(BAD_REQUEST, "사용할 수 없는 토큰 입니다."),
|
UNAVAILABLE_REFRESH_TOKEN(BAD_REQUEST, "사용할 수 없는 토큰 입니다."),
|
||||||
|
UNABLE_CHANGE_GRADE(BAD_REQUEST, "동일한 등급으로 변경할 수 없습니다."),
|
||||||
|
|
||||||
|
/* 403 FORBIDDEN : 접근 권한 제한 */
|
||||||
|
VALID_USER_ID(FORBIDDEN, "해당 정보에 접근 권한이 존재하지 않습니다."),
|
||||||
|
|
||||||
/* 404 NOT_FOUND : Resource 를 찾을 수 없음 */
|
/* 404 NOT_FOUND : Resource 를 찾을 수 없음 */
|
||||||
|
USER_NOT_FOUND(NOT_FOUND, "해당 유저 정보를 찾을 수 없습니다."),
|
||||||
EMAIL_NOT_FOUND(NOT_FOUND, "해당 이메일을 찾을 수 없습니다."),
|
EMAIL_NOT_FOUND(NOT_FOUND, "해당 이메일을 찾을 수 없습니다."),
|
||||||
MOVIE_NOT_FOUND(NOT_FOUND, "해당 제목의 영화를 찾을 수 없습니다."),
|
MOVIE_NOT_FOUND(NOT_FOUND, "해당 제목의 영화를 찾을 수 없습니다."),
|
||||||
REFRESH_TOKEN_NOT_FOUND(NOT_FOUND, "리프레쉬 토큰을 찾을 수 없습니다."),
|
REFRESH_TOKEN_NOT_FOUND(NOT_FOUND, "리프레쉬 토큰을 찾을 수 없습니다."),
|
||||||
|
PAYMENT_ID_NOT_FOUND(NOT_FOUND, "결제정보를 찾을 수 없습니다."),
|
||||||
|
THEATER_NOT_FOUND(NOT_FOUND, "상영관 정보를 찾을 수 없습니다."),
|
||||||
|
|
||||||
/* 409 CONFLICT : Resource 의 현재 상태와 충돌. 보통 중복된 데이터 존재 */
|
/* 409 CONFLICT : Resource 의 현재 상태와 충돌. 보통 중복된 데이터 존재 */
|
||||||
DUPLICATE_EMAIL(CONFLICT, "이메일이 이미 존재합니다."),
|
DUPLICATE_EMAIL(CONFLICT, "이메일이 이미 존재합니다."),
|
||||||
DELETED_EMAIL(CONFLICT, "이미 삭제된 이메일 입니다.");
|
DUPLICATE_PAYMENT(CONFLICT, "해당 좌석은 현재 판매된 좌석입니다."),
|
||||||
|
DUPLICATE_MOVIE(CONFLICT, "해당 영화 정보가 이미 존재합니다."),
|
||||||
|
DUPLICATE_MOVIE_TIME(CONFLICT, "해당 영화 시간표 정보가 이미 존재합니다."),
|
||||||
|
DELETED_EMAIL(CONFLICT, "이미 삭제된 이메일 입니다."),
|
||||||
|
DELETED_MOVIE(CONFLICT, "이미 삭제된 영화 입니다.");
|
||||||
|
|
||||||
private final HttpStatus httpStatus;
|
private final HttpStatus httpStatus;
|
||||||
private final String detail;
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TicketingException throwUnableChangeGrade() {
|
||||||
|
throw new TicketingException(UNABLE_CHANGE_GRADE);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 403 FORBIDDEN : 접근 권한 제한 */
|
||||||
|
public static TicketingException throwValidUserId() {
|
||||||
|
throw new TicketingException(VALID_USER_ID);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 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);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TicketingException throwPaymentIdNotFound() {
|
||||||
|
throw new TicketingException(PAYMENT_ID_NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TicketingException throwTheaterNotFound() {
|
||||||
|
throw new TicketingException(THEATER_NOT_FOUND);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 409 CONFLICT : Resource 의 현재 상태와 충돌. 보통 중복된 데이터 존재 */
|
||||||
|
public static TicketingException throwDuplicateEmail() {
|
||||||
|
throw new TicketingException(DUPLICATE_EMAIL);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TicketingException throwDuplicatePayment() {
|
||||||
|
throw new TicketingException(DUPLICATE_PAYMENT);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TicketingException throwDuplicateMovie() {
|
||||||
|
throw new TicketingException(DUPLICATE_MOVIE);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TicketingException throwDuplicateMovieTime() {
|
||||||
|
throw new TicketingException(DUPLICATE_MOVIE_TIME);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TicketingException throwDeletedEmail() {
|
||||||
|
throw new TicketingException(DELETED_EMAIL);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TicketingException throwDeletedMovie() {
|
||||||
|
throw new TicketingException(DELETED_MOVIE);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import static org.springframework.http.HttpStatus.UNAUTHORIZED;
|
|||||||
import static org.springframework.http.HttpStatus.UNSUPPORTED_MEDIA_TYPE;
|
import static org.springframework.http.HttpStatus.UNSUPPORTED_MEDIA_TYPE;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@@ -53,7 +54,8 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
|
|||||||
|
|
||||||
List<String> errors = generateErrors(ex);
|
List<String> errors = generateErrors(ex);
|
||||||
ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), errors);
|
ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), errors);
|
||||||
return handleExceptionInternal(ex, response, headers, response.getStatus(), request);
|
|
||||||
|
return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
/***
|
/***
|
||||||
@@ -66,7 +68,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
|
|||||||
|
|
||||||
List<String> errors = generateErrors(ex);
|
List<String> errors = generateErrors(ex);
|
||||||
ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), errors);
|
ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), errors);
|
||||||
return handleExceptionInternal(ex, response, headers, response.getStatus(), request);
|
return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -238,7 +240,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
|
|||||||
List<ObjectError> allErrors = ex.getBindingResult().getAllErrors();
|
List<ObjectError> allErrors = ex.getBindingResult().getAllErrors();
|
||||||
|
|
||||||
for (ObjectError error : allErrors) {
|
for (ObjectError error : allErrors) {
|
||||||
errors.add(((FieldError) error).getField() + ": " + error.getDefaultMessage());
|
errors.add(error.getDefaultMessage());
|
||||||
}
|
}
|
||||||
return errors;
|
return errors;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
|
|||||||
.antMatchers(HttpMethod.POST, "/api/auth/token").permitAll()
|
.antMatchers(HttpMethod.POST, "/api/auth/token").permitAll()
|
||||||
.antMatchers(HttpMethod.POST, "/api/auth/refresh").permitAll()
|
.antMatchers(HttpMethod.POST, "/api/auth/refresh").permitAll()
|
||||||
.antMatchers(HttpMethod.POST, "/api/users").permitAll()
|
.antMatchers(HttpMethod.POST, "/api/users").permitAll()
|
||||||
.antMatchers("/api/movies/**").permitAll()
|
.antMatchers(HttpMethod.GET,"/api/movies").permitAll()
|
||||||
.antMatchers("/api/movieTimes/**").permitAll()
|
.antMatchers("/api/movieTimes/**").permitAll()
|
||||||
.antMatchers("/l7check").permitAll()
|
.antMatchers("/l7check").permitAll()
|
||||||
.antMatchers("/actuator/**").permitAll()
|
.antMatchers("/actuator/**").permitAll()
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.ticketing.server.global.security.jwt;
|
package com.ticketing.server.global.security.jwt;
|
||||||
|
|
||||||
import com.ticketing.server.user.application.response.TokenDto;
|
import com.ticketing.server.user.service.dto.TokenDTO;
|
||||||
import io.jsonwebtoken.Claims;
|
import io.jsonwebtoken.Claims;
|
||||||
import io.jsonwebtoken.Jwts;
|
import io.jsonwebtoken.Jwts;
|
||||||
import io.jsonwebtoken.SignatureAlgorithm;
|
import io.jsonwebtoken.SignatureAlgorithm;
|
||||||
@@ -42,12 +42,12 @@ public class JwtProvider {
|
|||||||
this.refreshTokenValidityInMilliseconds = jwtProperties.getRefreshTokenValidityInSeconds() * 1000L;
|
this.refreshTokenValidityInMilliseconds = jwtProperties.getRefreshTokenValidityInSeconds() * 1000L;
|
||||||
}
|
}
|
||||||
|
|
||||||
public TokenDto generateTokenDto(Authentication authentication) {
|
public TokenDTO generateTokenDto(Authentication authentication) {
|
||||||
String accessToken = createAccessToken(authentication);
|
String accessToken = createAccessToken(authentication);
|
||||||
String refreshToken = createRefreshToken(authentication);
|
String refreshToken = createRefreshToken(authentication);
|
||||||
long expiresIn = accessTokenValidityInMilliseconds / 1000L;
|
long expiresIn = accessTokenValidityInMilliseconds / 1000L;
|
||||||
|
|
||||||
return TokenDto.of(accessToken, refreshToken, prefix, expiresIn);
|
return new TokenDTO(accessToken, refreshToken, prefix, expiresIn);
|
||||||
}
|
}
|
||||||
|
|
||||||
private String createAccessToken(Authentication authentication) {
|
private String createAccessToken(Authentication authentication) {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package com.ticketing.server.global.security.jwt.handle;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.beans.factory.annotation.Qualifier;
|
import org.springframework.beans.factory.annotation.Qualifier;
|
||||||
import org.springframework.security.core.AuthenticationException;
|
import org.springframework.security.core.AuthenticationException;
|
||||||
import org.springframework.security.web.AuthenticationEntryPoint;
|
import org.springframework.security.web.AuthenticationEntryPoint;
|
||||||
@@ -23,4 +22,5 @@ public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
|
|||||||
public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException {
|
public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException {
|
||||||
resolver.resolveException(request, response, null, authException);
|
resolver.resolveException(request, response, null, authException);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import javax.validation.Payload;
|
|||||||
@Documented
|
@Documented
|
||||||
public @interface FieldsValueNotMatch {
|
public @interface FieldsValueNotMatch {
|
||||||
|
|
||||||
String message();
|
String message() default "validation.password.not.change";
|
||||||
|
|
||||||
String field();
|
String field();
|
||||||
|
|
||||||
|
|||||||
@@ -1,14 +1,28 @@
|
|||||||
package com.ticketing.server.movie.application;
|
package com.ticketing.server.movie.application;
|
||||||
|
|
||||||
|
import static com.ticketing.server.user.domain.UserGrade.ROLES.STAFF;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.application.request.MovieDeleteRequest;
|
||||||
|
import com.ticketing.server.movie.application.request.MovieRegisterRequest;
|
||||||
|
import com.ticketing.server.movie.application.response.MovieDeleteResponse;
|
||||||
import com.ticketing.server.movie.application.response.MovieListResponse;
|
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.RegisteredMovieDTO;
|
||||||
import com.ticketing.server.movie.service.interfaces.MovieService;
|
import com.ticketing.server.movie.service.interfaces.MovieService;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import javax.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.security.access.annotation.Secured;
|
||||||
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
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.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
@@ -19,12 +33,41 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
public class MovieController {
|
public class MovieController {
|
||||||
|
|
||||||
private final MovieService movieService;
|
private final MovieService movieService;
|
||||||
|
|
||||||
@GetMapping()
|
@PostMapping()
|
||||||
@ApiOperation(value = "영화 목록 조회")
|
@ApiOperation(value = "영화 정보 등록")
|
||||||
public ResponseEntity<MovieListResponse> getMovies() {
|
@Secured(STAFF)
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(MovieListResponse.from(movieService.getMovies()));
|
public ResponseEntity<MovieInfoResponse> registerMovie(@RequestBody @Valid MovieRegisterRequest request) {
|
||||||
}
|
RegisteredMovieDTO registeredMovieDto =
|
||||||
|
movieService.registerMovie(request.getTitle(), request.getRunningTime());
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(
|
||||||
|
registeredMovieDto.toResponse()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping()
|
||||||
|
@ApiOperation(value = "영화 목록 조회")
|
||||||
|
public ResponseEntity<MovieListResponse> getMovies() {
|
||||||
|
MovieListDTO movieListDto = movieService.getMovies();
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(
|
||||||
|
movieListDto.toResponse()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping()
|
||||||
|
@ApiOperation(value = "영화 정보 삭제")
|
||||||
|
@Secured(STAFF)
|
||||||
|
public ResponseEntity<MovieDeleteResponse> deleteMovie(@RequestBody @Valid MovieDeleteRequest request) {
|
||||||
|
DeletedMovieDTO deletedMovieDto = movieService.deleteMovie(request.getId());
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(
|
||||||
|
deletedMovieDto.toResponse()
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,29 @@
|
|||||||
package com.ticketing.server.movie.application;
|
package com.ticketing.server.movie.application;
|
||||||
|
|
||||||
|
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.application.response.MovieTimeListResponse;
|
||||||
|
import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
|
||||||
|
import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
|
||||||
import com.ticketing.server.movie.service.interfaces.MovieTimeService;
|
import com.ticketing.server.movie.service.interfaces.MovieTimeService;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import io.swagger.annotations.ApiParam;
|
import io.swagger.annotations.ApiParam;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
import javax.validation.Valid;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
import org.springframework.http.HttpStatus;
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.security.access.annotation.Secured;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
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.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
@@ -24,16 +35,35 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
public class MovieTimeController {
|
public class MovieTimeController {
|
||||||
|
|
||||||
private final MovieTimeService movieTimeService;
|
private final MovieTimeService movieTimeService;
|
||||||
|
|
||||||
@GetMapping
|
@PostMapping
|
||||||
@ApiOperation(value = "영화 시간표 조회")
|
@ApiOperation(value = "영화 시간표 등록")
|
||||||
@Validated
|
@Secured(STAFF)
|
||||||
public ResponseEntity<MovieTimeListResponse> getMovieTimes(
|
public ResponseEntity<MovieTimeInfoResponse> registerMovieTime(
|
||||||
@ApiParam(value = "영화 제목", required = true) @RequestParam String title,
|
@RequestBody @Valid MovieTimeRegisterRequest movieTimeRegisterRequest) {
|
||||||
@ApiParam(value = "상영 날짜", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate runningDate) {
|
RegisteredMovieTimeDTO registeredMovieTimeDto = movieTimeService.registerMovieTime(
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(MovieTimeListResponse.from(movieTimeService.getMovieTimes(title, runningDate)));
|
movieTimeRegisterRequest.toMovieTimeRegisterDTO()
|
||||||
}
|
);
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(
|
||||||
|
registeredMovieTimeDto.toResponse()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
@ApiOperation(value = "영화 시간표 조회")
|
||||||
|
@Validated
|
||||||
|
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);
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(
|
||||||
|
movieTimeListDto.toResponse()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,30 @@
|
|||||||
package com.ticketing.server.movie.application;
|
package com.ticketing.server.movie.application;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
|
||||||
|
import com.ticketing.server.movie.service.interfaces.TicketService;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@RequestMapping("/api/tickets")
|
||||||
|
@Validated
|
||||||
public class TicketController {
|
public class TicketController {
|
||||||
|
|
||||||
|
private final TicketService ticketService;
|
||||||
|
|
||||||
|
@GetMapping("payments/{paymentId}")
|
||||||
|
public ResponseEntity<TicketDetailsResponse> findTicketsByPaymentId(@PathVariable("paymentId") @NotNull Long paymentId) {
|
||||||
|
TicketDetailsDTO tickets = ticketService.findTicketsByPaymentId(paymentId);
|
||||||
|
return ResponseEntity.status(HttpStatus.OK).body(tickets.toResponse());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.ticketing.server.movie.application.request;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class MovieDeleteRequest {
|
||||||
|
|
||||||
|
@NotNull(message = "{validation.not.null.id}")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
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;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@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(title, runningTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
package com.ticketing.server.movie.application.request;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.ticketing.server.movie.service.dto.MovieTimeRegisterDTO;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class MovieTimeRegisterRequest {
|
||||||
|
|
||||||
|
@NotNull(message = "{validation.not.null.movieId}")
|
||||||
|
private Long movieId;
|
||||||
|
|
||||||
|
@NotNull(message = "{validation.not.null.theaterNumber}")
|
||||||
|
private Integer theaterNumber;
|
||||||
|
|
||||||
|
@NotNull(message = "{validation.not.null.round}")
|
||||||
|
private Integer round;
|
||||||
|
|
||||||
|
private LocalDateTime startAt;
|
||||||
|
|
||||||
|
public MovieTimeRegisterDTO toMovieTimeRegisterDTO() {
|
||||||
|
return new MovieTimeRegisterDTO(movieId, theaterNumber, round, startAt);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package com.ticketing.server.movie.application.response;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class MovieDeleteResponse {
|
||||||
|
|
||||||
|
private final Long id;
|
||||||
|
|
||||||
|
private final String title;
|
||||||
|
|
||||||
|
private final LocalDateTime deletedAt;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package com.ticketing.server.movie.application.response;
|
||||||
|
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class MovieInfoResponse {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "영화 ID")
|
||||||
|
private Long movieId;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "영화 제목")
|
||||||
|
private String title;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,21 +1,16 @@
|
|||||||
package com.ticketing.server.movie.application.response;
|
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 io.swagger.annotations.ApiModelProperty;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import lombok.AccessLevel;
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor
|
||||||
public class MovieListResponse {
|
public class MovieListResponse {
|
||||||
|
|
||||||
@ApiModelProperty(value = "영화 제목")
|
@ApiModelProperty(value = "영화 제목")
|
||||||
private List<MovieDto> movieDtos;
|
private List<MovieDTO> movieDtos;
|
||||||
|
|
||||||
public static MovieListResponse from(List<MovieDto> movieDtos) {
|
|
||||||
return new MovieListResponse(movieDtos);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package com.ticketing.server.movie.application.response;
|
||||||
|
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class MovieTimeInfoResponse {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "영화 시간표 ID")
|
||||||
|
private Long movieTimeId;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "상영관 번호")
|
||||||
|
private Integer theaterNumber;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "회차")
|
||||||
|
private Integer round;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "시작 시간")
|
||||||
|
private LocalDateTime startAt;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "종료 시간")
|
||||||
|
private LocalDateTime endAt;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.ticketing.server.movie.application.response;
|
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 io.swagger.annotations.ApiModelProperty;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import lombok.AccessLevel;
|
import lombok.AccessLevel;
|
||||||
@@ -8,14 +8,10 @@ import lombok.AllArgsConstructor;
|
|||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor
|
||||||
public class MovieTimeListResponse {
|
public class MovieTimeListResponse {
|
||||||
|
|
||||||
@ApiModelProperty(value = "영화 시간표 정보")
|
@ApiModelProperty(value = "영화 시간표 정보")
|
||||||
private List<MovieTimeDto> movieTimeDtos;
|
private List<MovieTimeDTO> movieTimeDtos;
|
||||||
|
|
||||||
public static MovieTimeListResponse from(List<MovieTimeDto> movieTimeDtos) {
|
|
||||||
return new MovieTimeListResponse(movieTimeDtos);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.ticketing.server.movie.application.response;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class TicketDetailsResponse {
|
||||||
|
|
||||||
|
private final List<TicketDetailDTO> ticketDetails;
|
||||||
|
|
||||||
|
public TicketDetailsResponse(List<TicketDetailDTO> ticketDetails) {
|
||||||
|
this.ticketDetails = ticketDetails;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,24 +1,46 @@
|
|||||||
package com.ticketing.server.movie.domain;
|
package com.ticketing.server.movie.domain;
|
||||||
|
|
||||||
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
||||||
import javax.persistence.Column;
|
import com.ticketing.server.global.exception.ErrorCode;
|
||||||
|
import com.ticketing.server.movie.service.dto.MovieDTO;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import javax.persistence.Entity;
|
import javax.persistence.Entity;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.AccessLevel;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Getter
|
@Getter
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class Movie extends AbstractEntity {
|
public class Movie extends AbstractEntity {
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@Column(unique = true)
|
|
||||||
private String title;
|
private String title;
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
private Long runningTime;
|
private Long runningTime;
|
||||||
|
|
||||||
|
Movie(Long id, String title, Long runningTime) {
|
||||||
|
this.id = id;
|
||||||
|
this.title = title;
|
||||||
|
this.runningTime = runningTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Movie delete() {
|
||||||
|
if (deletedAt != null) {
|
||||||
|
throw ErrorCode.throwDeletedMovie();
|
||||||
|
}
|
||||||
|
|
||||||
|
deletedAt = LocalDateTime.now();
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public MovieDTO toMovieDTO() {
|
||||||
|
return new MovieDTO(this.id, this.title);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,30 +1,34 @@
|
|||||||
package com.ticketing.server.movie.domain;
|
package com.ticketing.server.movie.domain;
|
||||||
|
|
||||||
|
|
||||||
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
||||||
|
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import javax.persistence.CascadeType;
|
import javax.persistence.CascadeType;
|
||||||
import javax.persistence.Entity;
|
import javax.persistence.Entity;
|
||||||
|
import javax.persistence.FetchType;
|
||||||
import javax.persistence.JoinColumn;
|
import javax.persistence.JoinColumn;
|
||||||
import javax.persistence.ManyToOne;
|
import javax.persistence.ManyToOne;
|
||||||
import javax.persistence.OneToMany;
|
import javax.persistence.OneToMany;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.AccessLevel;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Getter
|
@Getter
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||||
public class MovieTime extends AbstractEntity {
|
public class MovieTime extends AbstractEntity {
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@ManyToOne
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
@JoinColumn(name = "movie_id", referencedColumnName = "id", updatable = false)
|
@JoinColumn(name = "movie_id", referencedColumnName = "id", updatable = false)
|
||||||
private Movie movie;
|
private Movie movie;
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@ManyToOne
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
@JoinColumn(name = "theater_id", referencedColumnName = "id", updatable = false)
|
@JoinColumn(name = "theater_id", referencedColumnName = "id", updatable = false)
|
||||||
private Theater theater;
|
private Theater theater;
|
||||||
|
|
||||||
@@ -40,23 +44,39 @@ public class MovieTime extends AbstractEntity {
|
|||||||
@OneToMany(mappedBy = "movieTime", cascade = CascadeType.ALL)
|
@OneToMany(mappedBy = "movieTime", cascade = CascadeType.ALL)
|
||||||
private List<Ticket> tickets = new ArrayList<>();
|
private List<Ticket> tickets = new ArrayList<>();
|
||||||
|
|
||||||
private MovieTime(Movie movie, Theater theater, int round, LocalDateTime startAt, LocalDateTime endAt) {
|
public MovieTime(Movie movie, Theater theater, int round, LocalDateTime startAt) {
|
||||||
this.movie = movie;
|
this.movie = movie;
|
||||||
this.theater = theater;
|
this.theater = theater;
|
||||||
this.round = round;
|
this.round = round;
|
||||||
this.startAt = startAt;
|
this.startAt = startAt;
|
||||||
this.endAt = endAt;
|
this.endAt = generateEndAt(startAt);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static MovieTime of(Movie movie, Theater theater, int round, LocalDateTime startAt) {
|
MovieTime(Long id, Movie movie, Theater theater, int round, LocalDateTime startAt) {
|
||||||
Long runningTime = movie.getRunningTime();
|
this.id = id;
|
||||||
LocalDateTime endAt = startAt.plusMinutes(runningTime);
|
this.movie = movie;
|
||||||
|
this.theater = theater;
|
||||||
|
this.round = round;
|
||||||
|
this.startAt = startAt;
|
||||||
|
this.endAt = generateEndAt(startAt);
|
||||||
|
}
|
||||||
|
|
||||||
return new MovieTime(movie, theater, round, startAt, endAt);
|
private LocalDateTime generateEndAt(LocalDateTime startAt) {
|
||||||
|
Long runningTime = movie.getRunningTime();
|
||||||
|
return startAt.plusMinutes(runningTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMovieTitle() {
|
||||||
|
return this.movie.getTitle();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Seat> getSeats() {
|
public List<Seat> getSeats() {
|
||||||
return this.theater.getSeats();
|
return this.theater.getSeats();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public MovieTimeDTO toMovieTimeDTO() {
|
||||||
|
return new MovieTimeDTO(
|
||||||
|
this.id, this.theater.getTheaterNumber(), this.round, this.startAt, this.endAt);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,19 +2,21 @@ package com.ticketing.server.movie.domain;
|
|||||||
|
|
||||||
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
||||||
import javax.persistence.Entity;
|
import javax.persistence.Entity;
|
||||||
|
import javax.persistence.FetchType;
|
||||||
import javax.persistence.JoinColumn;
|
import javax.persistence.JoinColumn;
|
||||||
import javax.persistence.ManyToOne;
|
import javax.persistence.ManyToOne;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.AccessLevel;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Getter
|
@Getter
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||||
public class Seat extends AbstractEntity {
|
public class Seat extends AbstractEntity {
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@ManyToOne
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
@JoinColumn(name = "theater_id", referencedColumnName = "id", updatable = false)
|
@JoinColumn(name = "theater_id", referencedColumnName = "id", updatable = false)
|
||||||
private Theater theater;
|
private Theater theater;
|
||||||
|
|
||||||
@@ -30,8 +32,20 @@ public class Seat extends AbstractEntity {
|
|||||||
setTheater(theater);
|
setTheater(theater);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Seat(Long id, int column, int row, Theater theater) {
|
||||||
|
this.id = id;
|
||||||
|
this.seatColumn = column;
|
||||||
|
this.seatRow = row;
|
||||||
|
setTheater(theater);
|
||||||
|
}
|
||||||
|
|
||||||
private void setTheater(Theater theater) {
|
private void setTheater(Theater theater) {
|
||||||
this.theater = theater;
|
this.theater = theater;
|
||||||
theater.addSeat(this);
|
theater.addSeat(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Integer getTheaterNumber() {
|
||||||
|
return this.theater.getTheaterNumber();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,12 +7,13 @@ import javax.persistence.CascadeType;
|
|||||||
import javax.persistence.Entity;
|
import javax.persistence.Entity;
|
||||||
import javax.persistence.OneToMany;
|
import javax.persistence.OneToMany;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.AccessLevel;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Getter
|
@Getter
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||||
public class Theater extends AbstractEntity {
|
public class Theater extends AbstractEntity {
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@@ -21,6 +22,11 @@ public class Theater extends AbstractEntity {
|
|||||||
@OneToMany(mappedBy = "theater", cascade = CascadeType.ALL)
|
@OneToMany(mappedBy = "theater", cascade = CascadeType.ALL)
|
||||||
private List<Seat> seats = new ArrayList<>();
|
private List<Seat> seats = new ArrayList<>();
|
||||||
|
|
||||||
|
Theater(Long id, Integer theaterNumber) {
|
||||||
|
this.id = id;
|
||||||
|
this.theaterNumber = theaterNumber;
|
||||||
|
}
|
||||||
|
|
||||||
public Theater(Integer theaterNumber) {
|
public Theater(Integer theaterNumber) {
|
||||||
this.theaterNumber = theaterNumber;
|
this.theaterNumber = theaterNumber;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,34 +1,35 @@
|
|||||||
package com.ticketing.server.movie.domain;
|
package com.ticketing.server.movie.domain;
|
||||||
|
|
||||||
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
||||||
import com.ticketing.server.payment.domain.Payment;
|
import com.ticketing.server.global.exception.ErrorCode;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
import javax.persistence.Entity;
|
import javax.persistence.Entity;
|
||||||
import javax.persistence.EnumType;
|
import javax.persistence.EnumType;
|
||||||
import javax.persistence.Enumerated;
|
import javax.persistence.Enumerated;
|
||||||
|
import javax.persistence.FetchType;
|
||||||
import javax.persistence.JoinColumn;
|
import javax.persistence.JoinColumn;
|
||||||
import javax.persistence.ManyToOne;
|
import javax.persistence.ManyToOne;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.AccessLevel;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Getter
|
@Getter
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||||
public class Ticket extends AbstractEntity {
|
public class Ticket extends AbstractEntity {
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@ManyToOne
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
@JoinColumn(name = "seat_id", referencedColumnName = "id", updatable = false)
|
@JoinColumn(name = "seat_id", referencedColumnName = "id", updatable = false)
|
||||||
private Seat seat;
|
private Seat seat;
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@ManyToOne
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
@JoinColumn(name = "movie_times_id", referencedColumnName = "id", updatable = false)
|
@JoinColumn(name = "movie_times_id", referencedColumnName = "id", updatable = false)
|
||||||
private MovieTime movieTime;
|
private MovieTime movieTime;
|
||||||
|
|
||||||
@ManyToOne
|
private Long paymentId;
|
||||||
@JoinColumn(name = "payment_id", referencedColumnName = "id", updatable = false)
|
|
||||||
private Payment payment;
|
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@Enumerated(EnumType.STRING)
|
@Enumerated(EnumType.STRING)
|
||||||
@@ -37,15 +38,52 @@ public class Ticket extends AbstractEntity {
|
|||||||
@NotNull
|
@NotNull
|
||||||
private Integer ticketPrice;
|
private Integer ticketPrice;
|
||||||
|
|
||||||
private Ticket(Seat seat, MovieTime movieTime, Integer ticketPrice) {
|
public Ticket(Seat seat, MovieTime movieTime, Integer ticketPrice) {
|
||||||
this.seat = seat;
|
this.seat = seat;
|
||||||
this.movieTime = movieTime;
|
this.movieTime = movieTime;
|
||||||
this.ticketPrice = ticketPrice;
|
this.ticketPrice = ticketPrice;
|
||||||
this.status = TicketStatus.SALE;
|
this.status = TicketStatus.SALE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Ticket of(Seat seat, MovieTime movieTime, Integer ticketPrice) {
|
Ticket(Long id, Seat seat, MovieTime movieTime, Integer ticketPrice) {
|
||||||
return new Ticket(seat, movieTime, ticketPrice);
|
this.id = id;
|
||||||
|
this.seat = seat;
|
||||||
|
this.movieTime = movieTime;
|
||||||
|
this.ticketPrice = ticketPrice;
|
||||||
|
this.status = TicketStatus.SALE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Integer getColumn() {
|
||||||
|
return this.seat.getSeatColumn();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getRow() {
|
||||||
|
return this.seat.getSeatRow();
|
||||||
|
}
|
||||||
|
|
||||||
|
public LocalDateTime getStartAt() {
|
||||||
|
return this.movieTime.getStartAt();
|
||||||
|
}
|
||||||
|
|
||||||
|
public LocalDateTime getEndAt() {
|
||||||
|
return this.movieTime.getEndAt();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getTheaterNumber() {
|
||||||
|
return this.seat.getTheaterNumber();
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMovieTitle() {
|
||||||
|
return this.movieTime.getMovieTitle();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void registerPayment(Long id) {
|
||||||
|
if (this.paymentId != null) {
|
||||||
|
throw ErrorCode.throwDuplicatePayment();
|
||||||
|
}
|
||||||
|
|
||||||
|
this.paymentId = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,14 @@ public interface MovieRepository extends JpaRepository<Movie, Long> {
|
|||||||
|
|
||||||
Optional<Movie> findByTitle(String title);
|
Optional<Movie> findByTitle(String title);
|
||||||
|
|
||||||
|
Optional<Movie> findByIdAndDeletedAtNull(Long id);
|
||||||
|
|
||||||
|
@Query(value = "SELECT m "
|
||||||
|
+ "FROM Movie m "
|
||||||
|
+ "WHERE title = :title "
|
||||||
|
+ "AND deleted_at IS NULL")
|
||||||
|
Optional<Movie> findValidMovieWithTitle(String title);
|
||||||
|
|
||||||
@Query(value = "SELECT * "
|
@Query(value = "SELECT * "
|
||||||
+ "FROM movie "
|
+ "FROM movie "
|
||||||
+ "WHERE deleted_at IS NULL", nativeQuery = true)
|
+ "WHERE deleted_at IS NULL", nativeQuery = true)
|
||||||
|
|||||||
@@ -2,8 +2,10 @@ package com.ticketing.server.movie.domain.repository;
|
|||||||
|
|
||||||
import com.ticketing.server.movie.domain.Movie;
|
import com.ticketing.server.movie.domain.Movie;
|
||||||
import com.ticketing.server.movie.domain.MovieTime;
|
import com.ticketing.server.movie.domain.MovieTime;
|
||||||
|
import com.ticketing.server.movie.domain.Theater;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import org.springframework.data.jpa.repository.Query;
|
import org.springframework.data.jpa.repository.Query;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
@@ -11,11 +13,13 @@ import org.springframework.stereotype.Repository;
|
|||||||
@Repository
|
@Repository
|
||||||
public interface MovieTimeRepository extends JpaRepository<MovieTime, Long> {
|
public interface MovieTimeRepository extends JpaRepository<MovieTime, Long> {
|
||||||
|
|
||||||
@Query(value = "SELECT mt "
|
Optional<MovieTime> findByMovieAndTheaterAndRoundAndDeletedAtNull(Movie movie, Theater theater, Integer round);
|
||||||
+ "FROM MovieTime mt "
|
|
||||||
+ "JOIN FETCH mt.movie "
|
@Query(value = "SELECT mt "
|
||||||
+ "WHERE mt.movie = :movie "
|
+ "FROM MovieTime mt "
|
||||||
+ "AND mt.startAt BETWEEN :startOfDay AND :endOfDay ")
|
+ "JOIN FETCH mt.movie "
|
||||||
List<MovieTime> findValidMovieTimes(Movie movie, LocalDateTime startOfDay, LocalDateTime endOfDay);
|
+ "WHERE mt.movie = :movie "
|
||||||
|
+ "AND mt.startAt BETWEEN :startOfDay AND :endOfDay ")
|
||||||
|
List<MovieTime> findValidMovieTimes(Movie movie, LocalDateTime startOfDay, LocalDateTime endOfDay);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,24 @@
|
|||||||
package com.ticketing.server.movie.domain.repository;
|
package com.ticketing.server.movie.domain.repository;
|
||||||
|
|
||||||
import com.ticketing.server.movie.domain.Ticket;
|
import com.ticketing.server.movie.domain.Ticket;
|
||||||
|
import java.util.List;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.data.jpa.repository.Query;
|
||||||
|
import org.springframework.data.repository.query.Param;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
public interface TicketRepository extends JpaRepository<Ticket, Long> {
|
public interface TicketRepository extends JpaRepository<Ticket, Long> {
|
||||||
|
|
||||||
|
@Query(
|
||||||
|
value =
|
||||||
|
"SELECT t "
|
||||||
|
+ "FROM Ticket t "
|
||||||
|
+ "JOIN FETCH t.movieTime mt "
|
||||||
|
+ "JOIN FETCH t.seat s "
|
||||||
|
+ "JOIN FETCH s.theater th "
|
||||||
|
+ "WHERE t.paymentId = :paymentId "
|
||||||
|
)
|
||||||
|
List<Ticket> findTicketFetchJoinByPaymentId(@Param("paymentId") Long paymentId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,17 @@
|
|||||||
package com.ticketing.server.movie.service;
|
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.Movie;
|
||||||
import com.ticketing.server.movie.domain.repository.MovieRepository;
|
import com.ticketing.server.movie.domain.repository.MovieRepository;
|
||||||
import com.ticketing.server.movie.service.dto.MovieDto;
|
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 com.ticketing.server.movie.service.interfaces.MovieService;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
import javax.transaction.Transactional;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -15,15 +21,42 @@ import org.springframework.stereotype.Service;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
public class MovieServiceImpl implements MovieService {
|
public class MovieServiceImpl implements MovieService {
|
||||||
|
|
||||||
private final MovieRepository movieRepository;
|
private final MovieRepository movieRepository;
|
||||||
|
|
||||||
public List<MovieDto> getMovies() {
|
@Override
|
||||||
List<Movie> movies = movieRepository.findValidMovies();
|
public RegisteredMovieDTO registerMovie(String title, Long runningTime) {
|
||||||
|
Optional<Movie> movie = movieRepository.findValidMovieWithTitle(title);
|
||||||
|
|
||||||
return movies.stream()
|
if(movie.isEmpty()) {
|
||||||
.map(MovieDto::from)
|
Movie newMovie = movieRepository.save(
|
||||||
.collect(Collectors.toList());
|
new Movie(title, runningTime)
|
||||||
|
);
|
||||||
|
|
||||||
}
|
return new RegisteredMovieDTO(newMovie);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw ErrorCode.throwDuplicateMovie();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public MovieListDTO getMovies() {
|
||||||
|
List<Movie> movies = movieRepository.findValidMovies();
|
||||||
|
|
||||||
|
List<MovieDTO> movieDtos = movies.stream()
|
||||||
|
.map(movie -> movie.toMovieDTO())
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
return new MovieListDTO(movieDtos);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Transactional
|
||||||
|
public DeletedMovieDTO deleteMovie(Long id) {
|
||||||
|
Movie movie = movieRepository.findByIdAndDeletedAtNull(id)
|
||||||
|
.orElseThrow(ErrorCode::throwMovieNotFound);
|
||||||
|
|
||||||
|
Movie deletedMovie = movie.delete();
|
||||||
|
|
||||||
|
return new DeletedMovieDTO(deletedMovie);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,24 @@
|
|||||||
package com.ticketing.server.movie.service;
|
package com.ticketing.server.movie.service;
|
||||||
|
|
||||||
import static com.ticketing.server.global.exception.ErrorCode.MOVIE_NOT_FOUND;
|
import com.ticketing.server.global.exception.ErrorCode;
|
||||||
|
|
||||||
import com.ticketing.server.global.exception.TicketingException;
|
|
||||||
import com.ticketing.server.movie.domain.Movie;
|
import com.ticketing.server.movie.domain.Movie;
|
||||||
import com.ticketing.server.movie.domain.MovieTime;
|
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.MovieRepository;
|
||||||
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
|
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
|
||||||
import com.ticketing.server.movie.service.dto.MovieTimeDto;
|
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 com.ticketing.server.movie.service.interfaces.MovieTimeService;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
import javax.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -22,28 +28,62 @@ import org.springframework.stereotype.Service;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
public class MovieTimeServiceImpl implements MovieTimeService {
|
public class MovieTimeServiceImpl implements MovieTimeService {
|
||||||
|
|
||||||
private final MovieRepository movieRepository;
|
private final MovieRepository movieRepository;
|
||||||
|
|
||||||
private final MovieTimeRepository movieTimeRepository;
|
private final TheaterRepository theaterRepository;
|
||||||
|
|
||||||
@Override
|
private final MovieTimeRepository movieTimeRepository;
|
||||||
public List<MovieTimeDto> getMovieTimes(String title, LocalDate runningDate) {
|
|
||||||
Movie movie = movieRepository.findByTitle(title)
|
|
||||||
.orElseThrow(MovieTimeServiceImpl::throwMovieNotFound);
|
|
||||||
|
|
||||||
LocalDateTime startOfDay = runningDate.atStartOfDay().plusHours(6);
|
@Override
|
||||||
LocalDateTime endOfDay = startOfDay.plusDays(1);
|
public RegisteredMovieTimeDTO registerMovieTime(@Valid MovieTimeRegisterDTO movieTimeRegisterDto) {
|
||||||
|
Movie movie = findMovieById(movieTimeRegisterDto.getMovieId());
|
||||||
|
Theater theater = findTheaterByNumber(movieTimeRegisterDto.getTheaterNumber());
|
||||||
|
int round = movieTimeRegisterDto.getRound();
|
||||||
|
|
||||||
List<MovieTime> movieTimes = movieTimeRepository.findValidMovieTimes(movie, startOfDay, endOfDay);
|
Optional<MovieTime> movieTime =
|
||||||
|
movieTimeRepository.findByMovieAndTheaterAndRoundAndDeletedAtNull(movie, theater, round);
|
||||||
|
|
||||||
return movieTimes.stream()
|
if(movieTime.isEmpty()) {
|
||||||
.map(MovieTimeDto::from)
|
MovieTime newMovieTime = movieTimeRepository.save(
|
||||||
.collect(Collectors.toList());
|
new MovieTime(movie, theater, round, movieTimeRegisterDto.getStartAt())
|
||||||
|
);
|
||||||
|
|
||||||
}
|
return new RegisteredMovieTimeDTO(newMovieTime);
|
||||||
|
}
|
||||||
|
|
||||||
private static RuntimeException throwMovieNotFound() {
|
throw ErrorCode.throwDuplicateMovieTime();
|
||||||
throw new TicketingException(MOVIE_NOT_FOUND);
|
}
|
||||||
}
|
|
||||||
|
@Override
|
||||||
|
public MovieTimeListDTO getMovieTimes(Long movieId, LocalDate runningDate) {
|
||||||
|
Movie movie = findMovieById(movieId);
|
||||||
|
|
||||||
|
LocalDateTime startOfDay = runningDate.atStartOfDay().plusHours(6);
|
||||||
|
LocalDateTime endOfDay = startOfDay.plusDays(1);
|
||||||
|
|
||||||
|
List<MovieTime> movieTimes = movieTimeRepository.findValidMovieTimes(movie, startOfDay, endOfDay);
|
||||||
|
|
||||||
|
List<MovieTimeDTO> movieTimeDtos = movieTimes.stream()
|
||||||
|
.map(movieTime -> movieTime.toMovieTimeDTO())
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
return new MovieTimeListDTO(movieTimeDtos);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Movie findMovieById(Long movieId) {
|
||||||
|
Movie movie = movieRepository.findByIdAndDeletedAtNull(movieId)
|
||||||
|
.orElseThrow(ErrorCode::throwMovieNotFound);
|
||||||
|
|
||||||
|
return movie;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Theater findTheaterByNumber(Integer theaterNumber) {
|
||||||
|
Theater theater = theaterRepository.findByTheaterNumber(theaterNumber)
|
||||||
|
.orElseThrow(ErrorCode::throwTheaterNotFound);
|
||||||
|
|
||||||
|
return theater;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,40 @@
|
|||||||
package com.ticketing.server.movie.service;
|
package com.ticketing.server.movie.service;
|
||||||
|
|
||||||
|
import com.ticketing.server.global.exception.ErrorCode;
|
||||||
|
import com.ticketing.server.movie.domain.repository.TicketRepository;
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
|
||||||
import com.ticketing.server.movie.service.interfaces.TicketService;
|
import com.ticketing.server.movie.service.interfaces.TicketService;
|
||||||
|
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
@Validated
|
||||||
|
@Slf4j
|
||||||
public class TicketServiceImpl implements TicketService {
|
public class TicketServiceImpl implements TicketService {
|
||||||
|
|
||||||
|
private final TicketRepository ticketRepository;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TicketDetailsDTO findTicketsByPaymentId(@NotNull Long paymentId) {
|
||||||
|
List<TicketDetailDTO> ticketDetails = ticketRepository.findTicketFetchJoinByPaymentId(paymentId)
|
||||||
|
.stream()
|
||||||
|
.map(TicketDetailDTO::new)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
|
if (ticketDetails.isEmpty()) {
|
||||||
|
throw ErrorCode.throwPaymentIdNotFound();
|
||||||
|
}
|
||||||
|
|
||||||
|
return new TicketDetailsDTO(ticketDetails);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package com.ticketing.server.movie.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.application.response.MovieDeleteResponse;
|
||||||
|
import com.ticketing.server.movie.domain.Movie;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public class DeletedMovieDTO {
|
||||||
|
|
||||||
|
private final Long id;
|
||||||
|
|
||||||
|
private final String title;
|
||||||
|
|
||||||
|
private final LocalDateTime deletedAt;
|
||||||
|
|
||||||
|
public DeletedMovieDTO(Movie movie) {
|
||||||
|
this(
|
||||||
|
movie.getId(),
|
||||||
|
movie.getTitle(),
|
||||||
|
movie.getDeletedAt()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public MovieDeleteResponse toResponse() {
|
||||||
|
return new MovieDeleteResponse(id, title, deletedAt);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
package com.ticketing.server.movie.service.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class MovieDTO {
|
||||||
|
|
||||||
|
private Long movieId;
|
||||||
|
|
||||||
|
private String title;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
package com.ticketing.server.movie.service.dto;
|
|
||||||
|
|
||||||
import com.ticketing.server.movie.domain.Movie;
|
|
||||||
import lombok.AccessLevel;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
|
|
||||||
@Getter
|
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
|
||||||
public class MovieDto {
|
|
||||||
|
|
||||||
private String title;
|
|
||||||
|
|
||||||
public static MovieDto from(Movie movie) {
|
|
||||||
return new MovieDto(movie.getTitle());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package com.ticketing.server.movie.service.dto;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class MovieTimeDTO {
|
||||||
|
|
||||||
|
private Long movieTimeId;
|
||||||
|
|
||||||
|
private Integer theaterNumber;
|
||||||
|
|
||||||
|
private Integer round;
|
||||||
|
|
||||||
|
private LocalDateTime startAt;
|
||||||
|
|
||||||
|
private LocalDateTime endAt;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
package com.ticketing.server.movie.service.dto;
|
|
||||||
|
|
||||||
import com.ticketing.server.movie.domain.MovieTime;
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import lombok.AccessLevel;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
|
|
||||||
@Getter
|
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
|
||||||
public class MovieTimeDto {
|
|
||||||
|
|
||||||
private Long movieTimeId;
|
|
||||||
|
|
||||||
private Integer theaterNumber;
|
|
||||||
|
|
||||||
private Integer round;
|
|
||||||
|
|
||||||
private LocalDateTime startAt;
|
|
||||||
|
|
||||||
private LocalDateTime endAt;
|
|
||||||
|
|
||||||
public static MovieTimeDto from(MovieTime movieTime) {
|
|
||||||
return new MovieTimeDto(movieTime.getId(), movieTime.getTheater().getTheaterNumber(),
|
|
||||||
movieTime.getRound(), movieTime.getStartAt(), movieTime.getEndAt());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package com.ticketing.server.movie.service.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class MovieTimeRegisterDTO {
|
||||||
|
|
||||||
|
@NotNull(message = "{validation.not.null.movieId}")
|
||||||
|
private Long movieId;
|
||||||
|
|
||||||
|
@NotNull(message = "{validation.not.null.theaterNumber}")
|
||||||
|
private Integer theaterNumber;
|
||||||
|
|
||||||
|
@NotNull(message = "{validation.not.null.round}")
|
||||||
|
private Integer round;
|
||||||
|
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul")
|
||||||
|
private LocalDateTime startAt;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package com.ticketing.server.movie.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.application.response.MovieInfoResponse;
|
||||||
|
import com.ticketing.server.movie.domain.Movie;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public class RegisteredMovieDTO {
|
||||||
|
|
||||||
|
private final Long id;
|
||||||
|
|
||||||
|
private final String title;
|
||||||
|
|
||||||
|
public RegisteredMovieDTO(Movie movie) {
|
||||||
|
this(
|
||||||
|
movie.getId(),
|
||||||
|
movie.getTitle()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public MovieInfoResponse toResponse() {
|
||||||
|
return new MovieInfoResponse(id, title);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
package com.ticketing.server.movie.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.application.response.MovieTimeInfoResponse;
|
||||||
|
import com.ticketing.server.movie.domain.MovieTime;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public class RegisteredMovieTimeDTO {
|
||||||
|
|
||||||
|
private final Long movieTimeId;
|
||||||
|
|
||||||
|
private final Integer theaterNumber;
|
||||||
|
|
||||||
|
private final Integer round;
|
||||||
|
|
||||||
|
private final LocalDateTime startAt;
|
||||||
|
|
||||||
|
private final LocalDateTime endAt;
|
||||||
|
|
||||||
|
public RegisteredMovieTimeDTO(MovieTime movieTime) {
|
||||||
|
this(
|
||||||
|
movieTime.getId(),
|
||||||
|
movieTime.getTheater().getTheaterNumber(),
|
||||||
|
movieTime.getRound(),
|
||||||
|
movieTime.getStartAt(),
|
||||||
|
movieTime.getEndAt()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public MovieTimeInfoResponse toResponse() {
|
||||||
|
return new MovieTimeInfoResponse(movieTimeId, theaterNumber, round, startAt, endAt);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
package com.ticketing.server.movie.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
|
||||||
|
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class TicketDetailsDTO {
|
||||||
|
|
||||||
|
private final List<TicketDetailDTO> ticketDetails;
|
||||||
|
|
||||||
|
public TicketDetailsResponse toResponse() {
|
||||||
|
return new TicketDetailsResponse(ticketDetails);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,10 +1,14 @@
|
|||||||
package com.ticketing.server.movie.service.interfaces;
|
package com.ticketing.server.movie.service.interfaces;
|
||||||
|
|
||||||
import com.ticketing.server.movie.service.dto.MovieDto;
|
import com.ticketing.server.movie.service.dto.DeletedMovieDTO;
|
||||||
import java.util.List;
|
import com.ticketing.server.movie.service.dto.MovieListDTO;
|
||||||
|
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
|
||||||
|
|
||||||
public interface MovieService {
|
public interface MovieService {
|
||||||
|
|
||||||
List<MovieDto> getMovies();
|
RegisteredMovieDTO registerMovie(String title, Long runningTime);
|
||||||
|
|
||||||
|
MovieListDTO getMovies();
|
||||||
|
|
||||||
|
DeletedMovieDTO deleteMovie(Long id);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,21 @@
|
|||||||
package com.ticketing.server.movie.service.interfaces;
|
package com.ticketing.server.movie.service.interfaces;
|
||||||
|
|
||||||
import com.ticketing.server.movie.service.dto.MovieTimeDto;
|
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.MovieTimeRegisterDTO;
|
||||||
|
import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.List;
|
import javax.validation.Valid;
|
||||||
|
|
||||||
public interface MovieTimeService {
|
public interface MovieTimeService {
|
||||||
|
|
||||||
List<MovieTimeDto> getMovieTimes(String title, LocalDate runningDate);
|
RegisteredMovieTimeDTO registerMovieTime(@Valid MovieTimeRegisterDTO movieTimeRegisterDto);
|
||||||
|
|
||||||
|
MovieTimeListDTO getMovieTimes(Long movieId, LocalDate runningDate);
|
||||||
|
|
||||||
|
Movie findMovieById(Long movieId);
|
||||||
|
|
||||||
|
Theater findTheaterByNumber(Integer theaterNumber);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
package com.ticketing.server.movie.service.interfaces;
|
package com.ticketing.server.movie.service.interfaces;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
public interface TicketService {
|
public interface TicketService {
|
||||||
|
|
||||||
|
TicketDetailsDTO findTicketsByPaymentId(@NotNull Long paymentId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,22 +9,36 @@ import com.ticketing.server.movie.domain.repository.MovieRepository;
|
|||||||
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
|
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
|
||||||
import com.ticketing.server.movie.domain.repository.TheaterRepository;
|
import com.ticketing.server.movie.domain.repository.TheaterRepository;
|
||||||
import com.ticketing.server.movie.domain.repository.TicketRepository;
|
import com.ticketing.server.movie.domain.repository.TicketRepository;
|
||||||
|
import com.ticketing.server.payment.domain.Payment;
|
||||||
|
import com.ticketing.server.payment.domain.PaymentStatus;
|
||||||
|
import com.ticketing.server.payment.domain.PaymentType;
|
||||||
|
import com.ticketing.server.payment.domain.repository.PaymentRepository;
|
||||||
|
import com.ticketing.server.payment.service.dto.CreatePaymentDTO;
|
||||||
|
import com.ticketing.server.user.domain.User;
|
||||||
|
import com.ticketing.server.user.domain.UserGrade;
|
||||||
|
import com.ticketing.server.user.domain.repository.UserRepository;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class MovieSetupService {
|
public class
|
||||||
|
MovieSetupService {
|
||||||
|
|
||||||
|
private final UserRepository userRepository;
|
||||||
private final MovieRepository movieRepository;
|
private final MovieRepository movieRepository;
|
||||||
private final MovieTimeRepository movieTimeRepository;
|
private final MovieTimeRepository movieTimeRepository;
|
||||||
private final TheaterRepository theaterRepository;
|
private final TheaterRepository theaterRepository;
|
||||||
private final TicketRepository ticketRepository;
|
private final TicketRepository ticketRepository;
|
||||||
|
private final PaymentRepository paymentRepository;
|
||||||
|
|
||||||
|
private final PasswordEncoder passwordEncoder;
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public void init() {
|
public void init() {
|
||||||
@@ -32,6 +46,7 @@ public class MovieSetupService {
|
|||||||
initTheater();
|
initTheater();
|
||||||
initMovieTime();
|
initMovieTime();
|
||||||
initTicket();
|
initTicket();
|
||||||
|
initPayment();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void initMovie() {
|
private void initMovie() {
|
||||||
@@ -53,9 +68,9 @@ public class MovieSetupService {
|
|||||||
);
|
);
|
||||||
|
|
||||||
for (Theater theater : theaters) {
|
for (Theater theater : theaters) {
|
||||||
for (int i = 1; i <= 2; i++) {
|
for (int col = 1; col <= 2; col++) {
|
||||||
for (int j = 1; j <= 10; j++) {
|
for (int row = 1; row <= 10; row++) {
|
||||||
new Seat(i, j, theater);
|
new Seat(col, row, theater);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -71,14 +86,14 @@ public class MovieSetupService {
|
|||||||
|
|
||||||
List<MovieTime> movieTimes = new ArrayList<>();
|
List<MovieTime> movieTimes = new ArrayList<>();
|
||||||
for (Theater theater : theaters) {
|
for (Theater theater : theaters) {
|
||||||
movieTimes.add(MovieTime.of(movies.get(0), theater, 1, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 8, 0)));
|
movieTimes.add(new MovieTime(movies.get(0), theater, 1, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 8, 0)));
|
||||||
movieTimes.add(MovieTime.of(movies.get(0), theater, 3, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 12, 0)));
|
movieTimes.add(new MovieTime(movies.get(0), theater, 3, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 12, 0)));
|
||||||
movieTimes.add(MovieTime.of(movies.get(1), theater, 2, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 10, 0)));
|
movieTimes.add(new MovieTime(movies.get(1), theater, 2, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 10, 0)));
|
||||||
movieTimes.add(MovieTime.of(movies.get(2), theater, 4, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 14, 0)));
|
movieTimes.add(new MovieTime(movies.get(2), theater, 4, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 14, 0)));
|
||||||
movieTimes.add(MovieTime.of(movies.get(0), theater, 5, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 16, 0)));
|
movieTimes.add(new MovieTime(movies.get(0), theater, 5, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 16, 0)));
|
||||||
movieTimes.add(MovieTime.of(movies.get(3), theater, 6, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 18, 0)));
|
movieTimes.add(new MovieTime(movies.get(3), theater, 6, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 18, 0)));
|
||||||
movieTimes.add(MovieTime.of(movies.get(0), theater, 7, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 21, 0)));
|
movieTimes.add(new MovieTime(movies.get(0), theater, 7, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 21, 0)));
|
||||||
movieTimes.add(MovieTime.of(movies.get(4), theater, 8, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 23, 0)));
|
movieTimes.add(new MovieTime(movies.get(4), theater, 8, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 23, 0)));
|
||||||
}
|
}
|
||||||
|
|
||||||
movieTimeRepository.saveAll(movieTimes);
|
movieTimeRepository.saveAll(movieTimes);
|
||||||
@@ -91,11 +106,26 @@ public class MovieSetupService {
|
|||||||
Integer ticketPrice = 15_000;
|
Integer ticketPrice = 15_000;
|
||||||
for (MovieTime movieTime : movieTimes) {
|
for (MovieTime movieTime : movieTimes) {
|
||||||
for (Seat seat : movieTime.getSeats()) {
|
for (Seat seat : movieTime.getSeats()) {
|
||||||
tickets.add(Ticket.of(seat, movieTime, ticketPrice));
|
tickets.add(new Ticket(seat, movieTime, ticketPrice));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ticketRepository.saveAll(tickets);
|
ticketRepository.saveAll(tickets);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void initPayment() {
|
||||||
|
User user = userRepository.save(new User(123L, "김동효", "kdhyo98@gmail.com", passwordEncoder.encode("123123"), UserGrade.USER, "010-1234-5678"));
|
||||||
|
|
||||||
|
List<Ticket> tickets = ticketRepository.findAll();
|
||||||
|
Ticket ticket = tickets.get(0);
|
||||||
|
String title = ticket.getMovieTime().getMovie().getTitle();
|
||||||
|
CreatePaymentDTO createPaymentDto = new CreatePaymentDTO(user.getAlternateId(), title, PaymentType.KAKAO_PAY, PaymentStatus.COMPLETED, "2022-0710-4142", 30_000);
|
||||||
|
Payment payment = createPaymentDto.toEntity();
|
||||||
|
|
||||||
|
paymentRepository.save(payment);
|
||||||
|
|
||||||
|
ticket.registerPayment(payment.getId());
|
||||||
|
tickets.get(1).registerPayment(payment.getId());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package com.ticketing.server.payment.api;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
|
public interface MovieClient {
|
||||||
|
|
||||||
|
TicketDetailsResponse getTicketsByPaymentId(@NotNull Long paymentId);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
package com.ticketing.server.payment.api;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.api.dto.response.UserDetailResponse;
|
||||||
|
|
||||||
|
public interface UserClient {
|
||||||
|
|
||||||
|
UserDetailResponse detail();
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package com.ticketing.server.payment.api.dto.response;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.domain.Payment;
|
||||||
|
import com.ticketing.server.user.domain.UserGrade;
|
||||||
|
import com.ticketing.server.user.service.dto.UserDetailDTO;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public class UserDetailResponse {
|
||||||
|
|
||||||
|
private final Long userAlternateId;
|
||||||
|
private final String name;
|
||||||
|
private final String email;
|
||||||
|
private final UserGrade grade;
|
||||||
|
private final String phone;
|
||||||
|
|
||||||
|
public UserDetailResponse(UserDetailDTO userDetailDto) {
|
||||||
|
this(
|
||||||
|
userDetailDto.getAlternateId(),
|
||||||
|
userDetailDto.getName(),
|
||||||
|
userDetailDto.getEmail(),
|
||||||
|
userDetailDto.getGrade(),
|
||||||
|
userDetailDto.getPhone()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasUserAlternateId(Payment payment) {
|
||||||
|
return userAlternateId.equals(payment.getUserAlternateId());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package com.ticketing.server.payment.api.impl;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
|
||||||
|
import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
|
||||||
|
import com.ticketing.server.movie.service.interfaces.TicketService;
|
||||||
|
import com.ticketing.server.payment.api.MovieClient;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@Validated
|
||||||
|
public class MovieClientImpl implements MovieClient {
|
||||||
|
|
||||||
|
private final TicketService ticketService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TicketDetailsResponse getTicketsByPaymentId(@NotNull Long paymentId) {
|
||||||
|
TicketDetailsDTO ticketDetails = ticketService.findTicketsByPaymentId(paymentId);
|
||||||
|
return ticketDetails.toResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package com.ticketing.server.payment.api.impl;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.api.UserClient;
|
||||||
|
import com.ticketing.server.payment.api.dto.response.UserDetailResponse;
|
||||||
|
import com.ticketing.server.user.service.dto.UserDetailDTO;
|
||||||
|
import com.ticketing.server.user.service.interfaces.UserService;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.security.core.Authentication;
|
||||||
|
import org.springframework.security.core.context.SecurityContextHolder;
|
||||||
|
import org.springframework.security.core.userdetails.UserDetails;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class UserClientImpl implements UserClient {
|
||||||
|
|
||||||
|
private final UserService userService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public UserDetailResponse detail() {
|
||||||
|
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
|
||||||
|
UserDetails details = (UserDetails) authentication.getPrincipal();
|
||||||
|
|
||||||
|
UserDetailDTO userDetail = userService.findDetailByEmail(details.getUsername());
|
||||||
|
return new UserDetailResponse(userDetail);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,8 +1,47 @@
|
|||||||
package com.ticketing.server.payment.application;
|
package com.ticketing.server.payment.application;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.application.response.PaymentDetailResponse;
|
||||||
|
import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
|
||||||
|
import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
|
||||||
|
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.constraints.NotNull;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.security.access.annotation.Secured;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@RequestMapping("/api/payments")
|
||||||
|
@Validated
|
||||||
public class PaymentController {
|
public class PaymentController {
|
||||||
|
|
||||||
|
private final PaymentApisService paymentApisService;
|
||||||
|
private final PaymentService paymentService;
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
@Secured(UserGrade.ROLES.USER)
|
||||||
|
public ResponseEntity<SimplePaymentsResponse> simplePayments(@NotNull Long userAlternateId) {
|
||||||
|
SimplePaymentsDTO simplePayments = paymentService.findSimplePayments(userAlternateId);
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(simplePayments.toResponse());
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/detail")
|
||||||
|
@Secured(UserGrade.ROLES.USER)
|
||||||
|
public ResponseEntity<PaymentDetailResponse> detail(@NotNull Long paymentId) {
|
||||||
|
PaymentDetailDTO paymentDetail = paymentApisService.findPaymentDetail(paymentId);
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(paymentDetail.toResponse());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package com.ticketing.server.payment.application.response;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class PaymentDetailResponse {
|
||||||
|
|
||||||
|
private Long paymentId;
|
||||||
|
private String movieTitle;
|
||||||
|
private String paymentNumber;
|
||||||
|
private Integer totalPrice;
|
||||||
|
private LocalDateTime createdAt;
|
||||||
|
private List<TicketDetailDTO> tickets;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package com.ticketing.server.payment.application.response;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.service.dto.SimplePaymentDTO;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class SimplePaymentsResponse {
|
||||||
|
|
||||||
|
private final Long userAlternateId;
|
||||||
|
private final List<SimplePaymentDTO> payments;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,38 +1,67 @@
|
|||||||
package com.ticketing.server.payment.domain;
|
package com.ticketing.server.payment.domain;
|
||||||
|
|
||||||
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
||||||
import com.ticketing.server.user.domain.User;
|
import javax.persistence.Column;
|
||||||
import javax.persistence.Entity;
|
import javax.persistence.Entity;
|
||||||
import javax.persistence.EnumType;
|
import javax.persistence.EnumType;
|
||||||
import javax.persistence.Enumerated;
|
import javax.persistence.Enumerated;
|
||||||
import javax.persistence.JoinColumn;
|
import javax.validation.constraints.NotEmpty;
|
||||||
import javax.persistence.ManyToOne;
|
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.AccessLevel;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Getter
|
@Getter
|
||||||
|
@NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||||
public class Payment extends AbstractEntity {
|
public class Payment extends AbstractEntity {
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@ManyToOne
|
@Column(name = "user_alternate_id", nullable = false)
|
||||||
@JoinColumn(name = "user_id", referencedColumnName = "id", updatable = false)
|
private Long userAlternateId;
|
||||||
private User user;
|
|
||||||
|
@NotEmpty
|
||||||
|
@Column(name = "movie_title", nullable = false)
|
||||||
|
private String movieTitle;
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
|
@Column(name = "type", nullable = false)
|
||||||
@Enumerated(value = EnumType.STRING)
|
@Enumerated(value = EnumType.STRING)
|
||||||
private PaymentType type;
|
private PaymentType type;
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
|
@Column(name = "status", nullable = false)
|
||||||
@Enumerated(value = EnumType.STRING)
|
@Enumerated(value = EnumType.STRING)
|
||||||
private PaymentStatus status;
|
private PaymentStatus status;
|
||||||
|
|
||||||
|
@Column(name = "failed_message")
|
||||||
private String failedMessage;
|
private String failedMessage;
|
||||||
|
|
||||||
@NotNull
|
@NotEmpty
|
||||||
|
@Column(name = "payment_number", nullable = false)
|
||||||
private String paymentNumber;
|
private String paymentNumber;
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
|
@Column(name = "total_price", nullable = false)
|
||||||
private Integer totalPrice;
|
private Integer totalPrice;
|
||||||
|
|
||||||
|
public Payment(Long userAlternateId, String movieTitle, PaymentType type, PaymentStatus status, String paymentNumber, Integer totalPrice) {
|
||||||
|
this.userAlternateId = userAlternateId;
|
||||||
|
this.movieTitle = movieTitle;
|
||||||
|
this.type = type;
|
||||||
|
this.status = status;
|
||||||
|
this.paymentNumber = paymentNumber;
|
||||||
|
this.totalPrice = totalPrice;
|
||||||
|
}
|
||||||
|
|
||||||
|
Payment(Long id, Long userAlternateId, String movieTitle, PaymentType type, PaymentStatus status, String paymentNumber, Integer totalPrice) {
|
||||||
|
this.id = id;
|
||||||
|
this.userAlternateId = userAlternateId;
|
||||||
|
this.movieTitle = movieTitle;
|
||||||
|
this.type = type;
|
||||||
|
this.status = status;
|
||||||
|
this.paymentNumber = paymentNumber;
|
||||||
|
this.totalPrice = totalPrice;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,13 @@
|
|||||||
package com.ticketing.server.payment.domain.repository;
|
package com.ticketing.server.payment.domain.repository;
|
||||||
|
|
||||||
import com.ticketing.server.payment.domain.Payment;
|
import com.ticketing.server.payment.domain.Payment;
|
||||||
|
import java.util.List;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import org.springframework.stereotype.Repository;
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
@Repository
|
@Repository
|
||||||
public interface PaymentRepository extends JpaRepository<Payment, Long> {
|
public interface PaymentRepository extends JpaRepository<Payment, Long> {
|
||||||
|
|
||||||
|
List<Payment> findByUserAlternateId(Long userId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
package com.ticketing.server.payment.service;
|
||||||
|
|
||||||
|
import com.ticketing.server.global.exception.ErrorCode;
|
||||||
|
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
|
||||||
|
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.domain.Payment;
|
||||||
|
import com.ticketing.server.payment.domain.repository.PaymentRepository;
|
||||||
|
import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
|
||||||
|
import com.ticketing.server.payment.service.interfaces.PaymentApisService;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
@Validated
|
||||||
|
@Slf4j
|
||||||
|
public class PaymentApisServiceImpl implements PaymentApisService {
|
||||||
|
|
||||||
|
private final PaymentRepository paymentRepository;
|
||||||
|
private final MovieClient movieClient;
|
||||||
|
private final UserClient userClient;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PaymentDetailDTO findPaymentDetail(@NotNull Long paymentId) {
|
||||||
|
Payment payment = paymentRepository.findById(paymentId)
|
||||||
|
.orElseThrow(ErrorCode::throwPaymentIdNotFound);
|
||||||
|
|
||||||
|
UserDetailResponse userDetail = userClient.detail();
|
||||||
|
if (!userDetail.hasUserAlternateId(payment)) {
|
||||||
|
throw ErrorCode.throwValidUserId();
|
||||||
|
}
|
||||||
|
|
||||||
|
TicketDetailsResponse tickets = movieClient.getTicketsByPaymentId(payment.getId());
|
||||||
|
return new PaymentDetailDTO(payment, tickets);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,9 +1,37 @@
|
|||||||
package com.ticketing.server.payment.service;
|
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.dto.SimplePaymentsDTO;
|
||||||
import com.ticketing.server.payment.service.interfaces.PaymentService;
|
import com.ticketing.server.payment.service.interfaces.PaymentService;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
@Validated
|
||||||
|
@Slf4j
|
||||||
public class PaymentServiceImpl implements PaymentService {
|
public class PaymentServiceImpl implements PaymentService {
|
||||||
|
|
||||||
|
private final PaymentRepository paymentRepository;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SimplePaymentsDTO findSimplePayments(@NotNull Long userAlternateId) {
|
||||||
|
return paymentRepository.findByUserAlternateId(userAlternateId)
|
||||||
|
.stream()
|
||||||
|
.map(SimplePaymentDTO::new)
|
||||||
|
.collect(Collectors
|
||||||
|
.collectingAndThen(
|
||||||
|
Collectors.toList()
|
||||||
|
, payments -> new SimplePaymentsDTO(userAlternateId, payments)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package com.ticketing.server.payment.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.domain.Payment;
|
||||||
|
import com.ticketing.server.payment.domain.PaymentStatus;
|
||||||
|
import com.ticketing.server.payment.domain.PaymentType;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class CreatePaymentDTO {
|
||||||
|
|
||||||
|
private final Long userAlternateId;
|
||||||
|
private final String movieTitle;
|
||||||
|
private final PaymentType type;
|
||||||
|
private final PaymentStatus status;
|
||||||
|
private final String paymentNumber;
|
||||||
|
private final Integer totalPrice;
|
||||||
|
|
||||||
|
public Payment toEntity() {
|
||||||
|
return new Payment
|
||||||
|
(
|
||||||
|
this.getUserAlternateId(),
|
||||||
|
this.getMovieTitle(),
|
||||||
|
this.getType(),
|
||||||
|
this.getStatus(),
|
||||||
|
this.getPaymentNumber(),
|
||||||
|
this.getTotalPrice()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package com.ticketing.server.payment.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
|
||||||
|
import com.ticketing.server.payment.application.response.PaymentDetailResponse;
|
||||||
|
import com.ticketing.server.payment.domain.Payment;
|
||||||
|
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public class PaymentDetailDTO {
|
||||||
|
|
||||||
|
private final Long paymentId;
|
||||||
|
private final String movieTitle;
|
||||||
|
private final String paymentNumber;
|
||||||
|
private final Integer totalPrice;
|
||||||
|
private final LocalDateTime createdAt;
|
||||||
|
private final List<TicketDetailDTO> tickets;
|
||||||
|
|
||||||
|
public PaymentDetailDTO(Payment payment, TicketDetailsResponse ticketDetails) {
|
||||||
|
this(
|
||||||
|
payment.getId(),
|
||||||
|
payment.getMovieTitle(),
|
||||||
|
payment.getPaymentNumber(),
|
||||||
|
payment.getTotalPrice(),
|
||||||
|
payment.getCreatedAt(),
|
||||||
|
ticketDetails.getTicketDetails()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public PaymentDetailResponse toResponse() {
|
||||||
|
return new PaymentDetailResponse(paymentId, movieTitle, paymentNumber, totalPrice, createdAt, tickets);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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 final Long paymentId;
|
||||||
|
private final String movieTitle;
|
||||||
|
private final String paymentNumber;
|
||||||
|
private final Integer totalPrice;
|
||||||
|
|
||||||
|
public SimplePaymentDTO(Payment payment) {
|
||||||
|
this(
|
||||||
|
payment.getId(),
|
||||||
|
payment.getMovieTitle(),
|
||||||
|
payment.getPaymentNumber(),
|
||||||
|
payment.getTotalPrice()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package com.ticketing.server.payment.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class SimplePaymentsDTO {
|
||||||
|
|
||||||
|
private final Long userAlternateId;
|
||||||
|
private final List<SimplePaymentDTO> payments;
|
||||||
|
|
||||||
|
public SimplePaymentsResponse toResponse() {
|
||||||
|
return new SimplePaymentsResponse(userAlternateId, payments);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package com.ticketing.server.payment.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.movie.domain.Ticket;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public class TicketDetailDTO {
|
||||||
|
|
||||||
|
private final Integer price;
|
||||||
|
private final Integer theaterNumber;
|
||||||
|
private final Integer column;
|
||||||
|
private final Integer row;
|
||||||
|
private final LocalDateTime startAt;
|
||||||
|
private final LocalDateTime endAt;
|
||||||
|
|
||||||
|
public TicketDetailDTO(Ticket ticket) {
|
||||||
|
this(
|
||||||
|
ticket.getTicketPrice(),
|
||||||
|
ticket.getTheaterNumber(),
|
||||||
|
ticket.getColumn(),
|
||||||
|
ticket.getRow(),
|
||||||
|
ticket.getStartAt(),
|
||||||
|
ticket.getEndAt()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package com.ticketing.server.payment.service.interfaces;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
|
public interface PaymentApisService {
|
||||||
|
|
||||||
|
PaymentDetailDTO findPaymentDetail(@NotNull Long paymentId);
|
||||||
|
}
|
||||||
@@ -1,5 +1,10 @@
|
|||||||
package com.ticketing.server.payment.service.interfaces;
|
package com.ticketing.server.payment.service.interfaces;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.service.dto.SimplePaymentsDTO;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
public interface PaymentService {
|
public interface PaymentService {
|
||||||
|
|
||||||
|
SimplePaymentsDTO findSimplePayments(@NotNull Long userAlternateId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package com.ticketing.server.user.api;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
|
public interface PaymentClient {
|
||||||
|
|
||||||
|
SimplePaymentsResponse getPayments(@NotNull Long alternateId);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package com.ticketing.server.user.api.impl;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
|
||||||
|
import com.ticketing.server.payment.service.dto.SimplePaymentsDTO;
|
||||||
|
import com.ticketing.server.payment.service.interfaces.PaymentService;
|
||||||
|
import com.ticketing.server.user.api.PaymentClient;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class PaymentClientImpl implements PaymentClient {
|
||||||
|
|
||||||
|
private final PaymentService paymentService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SimplePaymentsResponse getPayments(@NotNull Long alternateId) {
|
||||||
|
SimplePaymentsDTO payments = paymentService.findSimplePayments(alternateId);
|
||||||
|
return payments.toResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -2,7 +2,9 @@ package com.ticketing.server.user.application;
|
|||||||
|
|
||||||
import com.ticketing.server.user.application.request.LoginRequest;
|
import com.ticketing.server.user.application.request.LoginRequest;
|
||||||
import com.ticketing.server.user.application.response.LogoutResponse;
|
import com.ticketing.server.user.application.response.LogoutResponse;
|
||||||
import com.ticketing.server.user.application.response.TokenDto;
|
import com.ticketing.server.user.service.dto.TokenDTO;
|
||||||
|
import com.ticketing.server.user.application.response.TokenResponse;
|
||||||
|
import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
|
||||||
import com.ticketing.server.user.service.interfaces.AuthenticationService;
|
import com.ticketing.server.user.service.interfaces.AuthenticationService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -26,29 +28,29 @@ public class AuthController {
|
|||||||
private final AuthenticationService authenticationService;
|
private final AuthenticationService authenticationService;
|
||||||
|
|
||||||
@PostMapping("/token")
|
@PostMapping("/token")
|
||||||
public ResponseEntity<TokenDto> login(@RequestBody LoginRequest loginRequest) {
|
public ResponseEntity<TokenResponse> login(@RequestBody LoginRequest loginRequest) {
|
||||||
TokenDto tokenDto = authenticationService.generateTokenDto(loginRequest.toAuthentication());
|
TokenDTO tokenDto = authenticationService.generateTokenDto(loginRequest.toAuthentication());
|
||||||
|
|
||||||
return ResponseEntity.status(HttpStatus.OK)
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
.headers(getHttpHeaders())
|
.headers(getHttpHeaders())
|
||||||
.body(tokenDto);
|
.body(tokenDto.toResponse());
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/refresh")
|
@PostMapping("/refresh")
|
||||||
public ResponseEntity<TokenDto> refreshToken(@RequestParam("refreshToken") String refreshToken) {
|
public ResponseEntity<TokenResponse> refreshToken(@RequestParam("refreshToken") String refreshToken) {
|
||||||
TokenDto tokenDto = authenticationService.reissueTokenDto(refreshToken);
|
TokenDTO tokenDto = authenticationService.reissueTokenDto(refreshToken);
|
||||||
|
|
||||||
return ResponseEntity.status(HttpStatus.OK)
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
.headers(getHttpHeaders())
|
.headers(getHttpHeaders())
|
||||||
.body(tokenDto);
|
.body(tokenDto.toResponse());
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/logout")
|
@PostMapping("/logout")
|
||||||
public ResponseEntity<LogoutResponse> logout(@AuthenticationPrincipal UserDetails userRequest) {
|
public ResponseEntity<LogoutResponse> logout(@AuthenticationPrincipal UserDetails userRequest) {
|
||||||
LogoutResponse logoutResponse = authenticationService.deleteRefreshToken(userRequest.getUsername());
|
DeleteRefreshTokenDTO refreshToken = authenticationService.deleteRefreshToken(userRequest.getUsername());
|
||||||
|
|
||||||
return ResponseEntity.status(HttpStatus.OK)
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
.body(logoutResponse);
|
.body(refreshToken.toResponse());
|
||||||
}
|
}
|
||||||
|
|
||||||
private HttpHeaders getHttpHeaders() {
|
private HttpHeaders getHttpHeaders() {
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package com.ticketing.server.user.application;
|
||||||
|
|
||||||
|
import com.ticketing.server.user.domain.UserGrade;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class UserChangeGradeResponse {
|
||||||
|
|
||||||
|
private String email;
|
||||||
|
|
||||||
|
private UserGrade beforeGrade;
|
||||||
|
|
||||||
|
private UserGrade afterGrade;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,15 +1,26 @@
|
|||||||
package com.ticketing.server.user.application;
|
package com.ticketing.server.user.application;
|
||||||
|
|
||||||
|
import static com.ticketing.server.user.domain.UserGrade.ROLES.ADMIN;
|
||||||
|
import static com.ticketing.server.user.domain.UserGrade.ROLES.USER;
|
||||||
|
|
||||||
import com.ticketing.server.user.application.request.SignUpRequest;
|
import com.ticketing.server.user.application.request.SignUpRequest;
|
||||||
|
import com.ticketing.server.user.application.request.UserChangeGradeRequest;
|
||||||
import com.ticketing.server.user.application.request.UserChangePasswordRequest;
|
import com.ticketing.server.user.application.request.UserChangePasswordRequest;
|
||||||
import com.ticketing.server.user.application.request.UserDeleteRequest;
|
import com.ticketing.server.user.application.request.UserDeleteRequest;
|
||||||
|
import com.ticketing.server.user.application.response.PaymentsResponse;
|
||||||
import com.ticketing.server.user.application.response.SignUpResponse;
|
import com.ticketing.server.user.application.response.SignUpResponse;
|
||||||
import com.ticketing.server.user.application.response.UserChangePasswordResponse;
|
import com.ticketing.server.user.application.response.UserChangePasswordResponse;
|
||||||
import com.ticketing.server.user.application.response.UserDeleteResponse;
|
import com.ticketing.server.user.application.response.UserDeleteResponse;
|
||||||
import com.ticketing.server.user.application.response.UserDetailResponse;
|
import com.ticketing.server.user.application.response.UserDetailResponse;
|
||||||
import com.ticketing.server.user.domain.User;
|
import com.ticketing.server.user.domain.ChangeGradeDTO;
|
||||||
import com.ticketing.server.user.domain.UserGrade;
|
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
|
||||||
import com.ticketing.server.user.service.UserServiceImpl;
|
import com.ticketing.server.user.service.dto.ChangedPasswordUserDTO;
|
||||||
|
import com.ticketing.server.user.service.dto.CreatedUserDTO;
|
||||||
|
import com.ticketing.server.user.service.dto.DeletedUserDTO;
|
||||||
|
import com.ticketing.server.user.service.dto.PaymentsDTO;
|
||||||
|
import com.ticketing.server.user.service.dto.UserDetailDTO;
|
||||||
|
import com.ticketing.server.user.service.interfaces.UserApisService;
|
||||||
|
import com.ticketing.server.user.service.interfaces.UserService;
|
||||||
import javax.validation.Valid;
|
import javax.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -33,36 +44,64 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
public class UserController {
|
public class UserController {
|
||||||
|
|
||||||
private final UserServiceImpl userService;
|
private final UserService userService;
|
||||||
|
private final UserApisService userApisService;
|
||||||
private final PasswordEncoder passwordEncoder;
|
private final PasswordEncoder passwordEncoder;
|
||||||
|
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public ResponseEntity<SignUpResponse> register(@RequestBody @Valid SignUpRequest request) {
|
public ResponseEntity<SignUpResponse> register(@RequestBody @Valid SignUpRequest request) {
|
||||||
User user = userService.register(request.toSignUpDto(passwordEncoder));
|
CreatedUserDTO createdUserDto = userService.register(request.toSignUpDto(passwordEncoder));
|
||||||
return ResponseEntity.status(HttpStatus.CREATED).body(SignUpResponse.from(user));
|
|
||||||
|
return ResponseEntity.status(HttpStatus.CREATED)
|
||||||
|
.body(createdUserDto.toResponse());
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/details")
|
@GetMapping("/details")
|
||||||
@Secured("ROLE_GUEST")
|
@Secured(USER)
|
||||||
public ResponseEntity<UserDetailResponse> details(@AuthenticationPrincipal UserDetails userRequest) {
|
public ResponseEntity<UserDetailResponse> details(@AuthenticationPrincipal UserDetails userRequest) {
|
||||||
User user = userService.findByEmail(userRequest.getUsername());
|
UserDetailDTO userDetail = userService.findDetailByEmail(userRequest.getUsername());
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(UserDetailResponse.from(user));
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(userDetail.toResponse());
|
||||||
}
|
}
|
||||||
|
|
||||||
@DeleteMapping
|
@DeleteMapping
|
||||||
@Secured(UserGrade.ROLES.GUEST)
|
@Secured(USER)
|
||||||
public ResponseEntity<UserDeleteResponse> deleteUser(@RequestBody @Valid UserDeleteRequest request) {
|
public ResponseEntity<UserDeleteResponse> deleteUser(@RequestBody @Valid UserDeleteRequest request) {
|
||||||
User user = userService.delete(request.toDeleteUserDto(passwordEncoder));
|
DeletedUserDTO deletedUserDto = userService.delete(request.toDeleteUserDto(passwordEncoder));
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.from(user));
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(deletedUserDto.toResponse());
|
||||||
}
|
}
|
||||||
|
|
||||||
@PutMapping("/password")
|
@PutMapping("/password")
|
||||||
@Secured(UserGrade.ROLES.GUEST)
|
@Secured(USER)
|
||||||
public ResponseEntity<UserChangePasswordResponse> changePassword(
|
public ResponseEntity<UserChangePasswordResponse> changePassword(
|
||||||
@AuthenticationPrincipal UserDetails userRequest,
|
@AuthenticationPrincipal UserDetails userRequest,
|
||||||
@RequestBody @Valid UserChangePasswordRequest request) {
|
@RequestBody @Valid UserChangePasswordRequest request) {
|
||||||
User user = userService.changePassword(request.toChangePasswordDto(userRequest.getUsername(), passwordEncoder));
|
ChangePasswordDTO changePasswordDto = request.toChangePasswordDto(userRequest.getUsername(), passwordEncoder);
|
||||||
return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.from(user));
|
ChangedPasswordUserDTO changedUserDto = userService.changePassword(changePasswordDto);
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(changedUserDto.toResponse());
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/grade")
|
||||||
|
@Secured(ADMIN)
|
||||||
|
public ResponseEntity<UserChangeGradeResponse> changeGrade(@RequestBody @Valid UserChangeGradeRequest request) {
|
||||||
|
ChangeGradeDTO changeGradeDto = userService.changeGrade(request.getEmail(), request.getAfterGrade());
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(changeGradeDto.toResponse());
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/payments")
|
||||||
|
@Secured(USER)
|
||||||
|
public ResponseEntity<PaymentsResponse> getPayments(@AuthenticationPrincipal UserDetails userRequest) {
|
||||||
|
PaymentsDTO paymentsDto = userApisService.findPaymentsByEmail(userRequest.getUsername());
|
||||||
|
|
||||||
|
return ResponseEntity.status(HttpStatus.OK)
|
||||||
|
.body(paymentsDto.toResponse());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package com.ticketing.server.user.application.request;
|
||||||
|
|
||||||
|
import com.ticketing.server.user.domain.UserGrade;
|
||||||
|
import javax.validation.constraints.Email;
|
||||||
|
import javax.validation.constraints.NotEmpty;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class UserChangeGradeRequest {
|
||||||
|
|
||||||
|
@NotEmpty(message = "{validation.not.empty.email}")
|
||||||
|
@Email(message = "{validation.email}")
|
||||||
|
private String email;
|
||||||
|
|
||||||
|
@NotNull(message = "{validation.not.null.grade}")
|
||||||
|
private UserGrade afterGrade;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,28 +1,14 @@
|
|||||||
package com.ticketing.server.user.application.response;
|
package com.ticketing.server.user.application.response;
|
||||||
|
|
||||||
import com.ticketing.server.global.redis.RefreshToken;
|
|
||||||
import lombok.AccessLevel;
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor
|
||||||
public class LogoutResponse {
|
public class LogoutResponse {
|
||||||
|
|
||||||
private Long refreshTokenId;
|
private final Long refreshTokenId;
|
||||||
private String email;
|
private final String email;
|
||||||
private String refreshToken;
|
private final String refreshToken;
|
||||||
|
|
||||||
private LogoutResponse(String email) {
|
|
||||||
this.email = email;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static LogoutResponse from(String email) {
|
|
||||||
return new LogoutResponse(email);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static LogoutResponse from(RefreshToken refreshToken) {
|
|
||||||
return new LogoutResponse(refreshToken.getId(), refreshToken.getEmail(), refreshToken.getToken());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package com.ticketing.server.user.application.response;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.service.dto.SimplePaymentDTO;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class PaymentsResponse {
|
||||||
|
|
||||||
|
private final String email;
|
||||||
|
private final List<SimplePaymentDTO> payments;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,20 +1,13 @@
|
|||||||
package com.ticketing.server.user.application.response;
|
package com.ticketing.server.user.application.response;
|
||||||
|
|
||||||
import com.ticketing.server.user.domain.User;
|
|
||||||
import lombok.AccessLevel;
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor
|
||||||
public class SignUpResponse {
|
public class SignUpResponse {
|
||||||
|
|
||||||
private String name;
|
private final String name;
|
||||||
|
private final String email;
|
||||||
private String email;
|
|
||||||
|
|
||||||
public static SignUpResponse from(User user) {
|
|
||||||
return new SignUpResponse(user.getName(), user.getEmail());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
package com.ticketing.server.user.application.response;
|
|
||||||
|
|
||||||
import lombok.AccessLevel;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
|
|
||||||
@Getter
|
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
|
||||||
public class TokenDto {
|
|
||||||
|
|
||||||
private final String accessToken;
|
|
||||||
private final String refreshToken;
|
|
||||||
private final String tokenType;
|
|
||||||
private final long expiresIn;
|
|
||||||
|
|
||||||
public static TokenDto of(String accessToken, String refreshToken, String tokenType, long expiresIn) {
|
|
||||||
return new TokenDto(accessToken, refreshToken, tokenType, expiresIn);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package com.ticketing.server.user.application.response;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class TokenResponse {
|
||||||
|
|
||||||
|
private final String accessToken;
|
||||||
|
private final String refreshToken;
|
||||||
|
private final String tokenType;
|
||||||
|
private final long expiresIn;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,20 +1,15 @@
|
|||||||
package com.ticketing.server.user.application.response;
|
package com.ticketing.server.user.application.response;
|
||||||
|
|
||||||
import com.ticketing.server.user.domain.User;
|
import java.time.LocalDateTime;
|
||||||
import lombok.AccessLevel;
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor
|
||||||
public class UserChangePasswordResponse {
|
public class UserChangePasswordResponse {
|
||||||
|
|
||||||
private String name;
|
private final String name;
|
||||||
|
private final String email;
|
||||||
private String email;
|
private final LocalDateTime updatedAt;
|
||||||
|
|
||||||
public static UserChangePasswordResponse from(User user) {
|
|
||||||
return new UserChangePasswordResponse(user.getName(), user.getEmail());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +1,15 @@
|
|||||||
package com.ticketing.server.user.application.response;
|
package com.ticketing.server.user.application.response;
|
||||||
|
|
||||||
import com.ticketing.server.user.domain.User;
|
import java.time.LocalDateTime;
|
||||||
import lombok.AccessLevel;
|
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
@AllArgsConstructor
|
||||||
public class UserDeleteResponse {
|
public class UserDeleteResponse {
|
||||||
|
|
||||||
private String name;
|
private final String name;
|
||||||
|
private final String email;
|
||||||
private String email;
|
private final LocalDateTime deletedAt;
|
||||||
|
|
||||||
public static UserDeleteResponse from(User user) {
|
|
||||||
return new UserDeleteResponse(user.getName(), user.getEmail());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
package com.ticketing.server.user.application.response;
|
package com.ticketing.server.user.application.response;
|
||||||
|
|
||||||
import com.ticketing.server.user.domain.User;
|
|
||||||
import com.ticketing.server.user.domain.UserGrade;
|
import com.ticketing.server.user.domain.UserGrade;
|
||||||
|
import com.ticketing.server.user.service.dto.UserDetailDTO;
|
||||||
|
import lombok.AccessLevel;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@@ -9,13 +10,9 @@ import lombok.Getter;
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class UserDetailResponse {
|
public class UserDetailResponse {
|
||||||
|
|
||||||
private String name;
|
private final String name;
|
||||||
private String email;
|
private final String email;
|
||||||
private UserGrade grade;
|
private final UserGrade grade;
|
||||||
private String phone;
|
private final String phone;
|
||||||
|
|
||||||
public static UserDetailResponse from(User user) {
|
|
||||||
return new UserDetailResponse(user.getName(), user.getEmail(), user.getGrade(), user.getPhone());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package com.ticketing.server.user.domain;
|
||||||
|
|
||||||
|
import com.ticketing.server.user.application.UserChangeGradeResponse;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class ChangeGradeDTO {
|
||||||
|
|
||||||
|
private final String email;
|
||||||
|
private final UserGrade beforeGrade;
|
||||||
|
private final UserGrade afterGrade;
|
||||||
|
|
||||||
|
public UserChangeGradeResponse toResponse() {
|
||||||
|
return new UserChangeGradeResponse(email, beforeGrade, afterGrade);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package com.ticketing.server.user.domain;
|
||||||
|
|
||||||
|
public interface SequenceGenerator {
|
||||||
|
|
||||||
|
Long generateId();
|
||||||
|
|
||||||
|
long[] parse(long id);
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
package com.ticketing.server.user.domain;
|
||||||
|
|
||||||
|
import java.net.NetworkInterface;
|
||||||
|
import java.security.SecureRandom;
|
||||||
|
import java.time.Instant;
|
||||||
|
import java.util.Enumeration;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Twitter Snowflake Custom.
|
||||||
|
* https://github.com/callicoder/java-snowflake
|
||||||
|
*/
|
||||||
|
@Component
|
||||||
|
public class Snowflake implements SequenceGenerator {
|
||||||
|
|
||||||
|
private static final int EPOCH_BITS = 41;
|
||||||
|
private static final int NODE_ID_BITS = 10;
|
||||||
|
private static final int SEQUENCE_BITS = 12;
|
||||||
|
|
||||||
|
private static final long MAX_NODE_ID = (1L << NODE_ID_BITS) - 1;
|
||||||
|
private static final long MAX_SEQUENCE = (1L << SEQUENCE_BITS) - 1;
|
||||||
|
|
||||||
|
// Custom Epoch (January 1, 2015 Midnight UTC = 2015-01-01T00:00:00Z)
|
||||||
|
private static final long DEFAULT_CUSTOM_EPOCH = 1420070400000L;
|
||||||
|
|
||||||
|
private final long nodeId;
|
||||||
|
private final long customEpoch;
|
||||||
|
|
||||||
|
private volatile long lastTimestamp = -1L;
|
||||||
|
private volatile long sequence = 0L;
|
||||||
|
|
||||||
|
// Let Snowflake generate a nodeId
|
||||||
|
public Snowflake() {
|
||||||
|
this.nodeId = createNodeId();
|
||||||
|
this.customEpoch = DEFAULT_CUSTOM_EPOCH;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Long generateId() {
|
||||||
|
return nextId();
|
||||||
|
}
|
||||||
|
|
||||||
|
private synchronized long nextId() {
|
||||||
|
long currentTimestamp = timestamp();
|
||||||
|
|
||||||
|
if(currentTimestamp < lastTimestamp) {
|
||||||
|
throw new IllegalStateException("Invalid System Clock!");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (currentTimestamp == lastTimestamp) {
|
||||||
|
sequence = (sequence + 1) & MAX_SEQUENCE;
|
||||||
|
if(sequence == 0) {
|
||||||
|
// 동일 밀리초 시퀀스가 소진됐을 경우 대기.
|
||||||
|
currentTimestamp = waitNextMillis(currentTimestamp);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 다음 밀리초 시퀀스 초기화.
|
||||||
|
sequence = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
lastTimestamp = currentTimestamp;
|
||||||
|
return currentTimestamp << (NODE_ID_BITS + SEQUENCE_BITS)
|
||||||
|
| (nodeId << SEQUENCE_BITS)
|
||||||
|
| sequence;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long[] parse(long id) {
|
||||||
|
long maskNodeId = ((1L << NODE_ID_BITS) - 1) << SEQUENCE_BITS;
|
||||||
|
long maskSequence = (1L << SEQUENCE_BITS) - 1;
|
||||||
|
|
||||||
|
long timestamp = (id >> (NODE_ID_BITS + SEQUENCE_BITS)) + customEpoch;
|
||||||
|
long nodeId = (id & maskNodeId) >> SEQUENCE_BITS;
|
||||||
|
long sequence = id & maskSequence;
|
||||||
|
|
||||||
|
return new long[]{timestamp, nodeId, sequence};
|
||||||
|
}
|
||||||
|
|
||||||
|
private long timestamp() {
|
||||||
|
return Instant.now().toEpochMilli() - customEpoch;
|
||||||
|
}
|
||||||
|
|
||||||
|
private long waitNextMillis(long currentTimestamp) {
|
||||||
|
while (currentTimestamp == lastTimestamp) {
|
||||||
|
currentTimestamp = timestamp();
|
||||||
|
}
|
||||||
|
return currentTimestamp;
|
||||||
|
}
|
||||||
|
|
||||||
|
private long createNodeId() {
|
||||||
|
long nodeId;
|
||||||
|
try {
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
|
||||||
|
while (networkInterfaces.hasMoreElements()) {
|
||||||
|
NetworkInterface networkInterface = networkInterfaces.nextElement();
|
||||||
|
byte[] mac = networkInterface.getHardwareAddress();
|
||||||
|
if (mac != null) {
|
||||||
|
for(byte macPort: mac) {
|
||||||
|
sb.append(String.format("%02X", macPort));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
nodeId = sb.toString().hashCode();
|
||||||
|
} catch (Exception ex) {
|
||||||
|
nodeId = (new SecureRandom().nextInt());
|
||||||
|
}
|
||||||
|
nodeId = nodeId & MAX_NODE_ID;
|
||||||
|
return nodeId;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "Snowflake Settings [EPOCH_BITS=" + EPOCH_BITS + ", NODE_ID_BITS=" + NODE_ID_BITS
|
||||||
|
+ ", SEQUENCE_BITS=" + SEQUENCE_BITS + ", CUSTOM_EPOCH=" + customEpoch
|
||||||
|
+ ", NodeId=" + nodeId + "]";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,10 +1,7 @@
|
|||||||
package com.ticketing.server.user.domain;
|
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.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.global.validator.constraints.Phone;
|
||||||
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
|
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
|
||||||
import com.ticketing.server.user.service.dto.DeleteUserDTO;
|
import com.ticketing.server.user.service.dto.DeleteUserDTO;
|
||||||
@@ -17,42 +14,54 @@ import javax.persistence.Enumerated;
|
|||||||
import javax.validation.constraints.Email;
|
import javax.validation.constraints.Email;
|
||||||
import javax.validation.constraints.NotEmpty;
|
import javax.validation.constraints.NotEmpty;
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.AccessLevel;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Getter
|
@Getter
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||||
public class User extends AbstractEntity {
|
public class User extends AbstractEntity {
|
||||||
|
|
||||||
@Column(name = "name")
|
@Column(name = "alternate_key", unique = true, nullable = false)
|
||||||
|
@NotNull(message = "{validation.not.null.alternate.key}")
|
||||||
|
private Long alternateId;
|
||||||
|
|
||||||
|
@Column(name = "name", nullable = false)
|
||||||
@NotEmpty(message = "{validation.not.empty.name}")
|
@NotEmpty(message = "{validation.not.empty.name}")
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
@Column(name = "email")
|
@Column(name = "email", unique = true, nullable = false)
|
||||||
@NotEmpty(message = "{validation.not.empty.email}")
|
@NotEmpty(message = "{validation.not.empty.email}")
|
||||||
@Email(message = "{validation.email}")
|
@Email(message = "{validation.email}")
|
||||||
private String email;
|
private String email;
|
||||||
|
|
||||||
@Column(name = "password")
|
@Column(name = "password", nullable = false)
|
||||||
@NotEmpty(message = "{validation.not.empty.password}")
|
@NotEmpty(message = "{validation.not.empty.password}")
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
@Column(name = "grade")
|
@Column(name = "grade", nullable = false)
|
||||||
@NotNull(message = "{validation.not.empty.grade}")
|
@NotNull(message = "{validation.not.null.grade}")
|
||||||
@Enumerated(value = EnumType.STRING)
|
@Enumerated(value = EnumType.STRING)
|
||||||
private UserGrade grade = UserGrade.GUEST;
|
private UserGrade grade = UserGrade.USER;
|
||||||
|
|
||||||
@Column(name = "phone")
|
@Column(name = "phone", nullable = false)
|
||||||
@NotEmpty(message = "{validation.not.empty.phone}")
|
@NotEmpty(message = "{validation.not.empty.phone}")
|
||||||
@Phone
|
@Phone
|
||||||
private String phone;
|
private String phone;
|
||||||
|
|
||||||
private boolean isDeleted = false;
|
public User(Long alternateId, String name, String email, String password, UserGrade grade, String phone) {
|
||||||
|
this.alternateId = alternateId;
|
||||||
|
this.name = name;
|
||||||
|
this.email = email;
|
||||||
|
this.password = password;
|
||||||
|
this.grade = grade;
|
||||||
|
this.phone = phone;
|
||||||
|
}
|
||||||
|
|
||||||
private LocalDateTime deletedAt;
|
User(Long id, Long alternateId, String name, String email, String password, UserGrade grade, String phone) {
|
||||||
|
this.id = id;
|
||||||
public User(String name, String email, String password, UserGrade grade, String phone) {
|
this.alternateId = alternateId;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.email = email;
|
this.email = email;
|
||||||
this.password = password;
|
this.password = password;
|
||||||
@@ -61,13 +70,12 @@ public class User extends AbstractEntity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public User delete(DeleteUserDTO deleteUser) {
|
public User delete(DeleteUserDTO deleteUser) {
|
||||||
if (isDeleted) {
|
if (deletedAt != null) {
|
||||||
throw new TicketingException(DELETED_EMAIL);
|
throw ErrorCode.throwDeletedEmail();
|
||||||
}
|
}
|
||||||
|
|
||||||
checkPassword(deleteUser);
|
checkPassword(deleteUser);
|
||||||
|
|
||||||
isDeleted = true;
|
|
||||||
deletedAt = LocalDateTime.now();
|
deletedAt = LocalDateTime.now();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -81,8 +89,18 @@ public class User extends AbstractEntity {
|
|||||||
|
|
||||||
public void checkPassword(PasswordMatches passwordMatches) {
|
public void checkPassword(PasswordMatches passwordMatches) {
|
||||||
if (!passwordMatches.passwordMatches(password)) {
|
if (!passwordMatches.passwordMatches(password)) {
|
||||||
throw new TicketingException(MISMATCH_PASSWORD);
|
throw ErrorCode.throwMismatchPassword();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ChangeGradeDTO changeGrade(UserGrade afterGrade) {
|
||||||
|
if (grade.equals(afterGrade)) {
|
||||||
|
throw ErrorCode.throwUnableChangeGrade();
|
||||||
|
}
|
||||||
|
final UserGrade beforeGrade = this.grade;
|
||||||
|
|
||||||
|
this.grade = afterGrade;
|
||||||
|
return new ChangeGradeDTO(email, beforeGrade, afterGrade);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor;
|
|||||||
public enum UserGrade {
|
public enum UserGrade {
|
||||||
ADMIN(ROLES.ADMIN, null),
|
ADMIN(ROLES.ADMIN, null),
|
||||||
STAFF(ROLES.STAFF, ROLES.ADMIN),
|
STAFF(ROLES.STAFF, ROLES.ADMIN),
|
||||||
GUEST(ROLES.GUEST, ROLES.STAFF);
|
USER(ROLES.USER, ROLES.STAFF);
|
||||||
|
|
||||||
private final String roleName;
|
private final String roleName;
|
||||||
private final String parentName;
|
private final String parentName;
|
||||||
@@ -15,7 +15,7 @@ public enum UserGrade {
|
|||||||
|
|
||||||
public static final String ADMIN = "ROLE_ADMIN";
|
public static final String ADMIN = "ROLE_ADMIN";
|
||||||
public static final String STAFF = "ROLE_STAFF";
|
public static final String STAFF = "ROLE_STAFF";
|
||||||
public static final String GUEST = "ROLE_GUEST";
|
public static final String USER = "ROLE_USER";
|
||||||
|
|
||||||
private ROLES() {
|
private ROLES() {
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,6 @@ public interface UserRepository extends JpaRepository<User, Long> {
|
|||||||
|
|
||||||
Optional<User> findByEmail(String email);
|
Optional<User> findByEmail(String email);
|
||||||
|
|
||||||
Optional<User> findByEmailAndIsDeletedFalse(String email);
|
Optional<User> findByEmailAndDeletedAtNull(String email);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,12 @@
|
|||||||
package com.ticketing.server.user.service;
|
package com.ticketing.server.user.service;
|
||||||
|
|
||||||
import static com.ticketing.server.global.exception.ErrorCode.REFRESH_TOKEN_NOT_FOUND;
|
import com.ticketing.server.global.exception.ErrorCode;
|
||||||
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.RefreshRedisRepository;
|
||||||
import com.ticketing.server.global.redis.RefreshToken;
|
import com.ticketing.server.global.redis.RefreshToken;
|
||||||
import com.ticketing.server.global.security.jwt.JwtProperties;
|
import com.ticketing.server.global.security.jwt.JwtProperties;
|
||||||
import com.ticketing.server.global.security.jwt.JwtProvider;
|
import com.ticketing.server.global.security.jwt.JwtProvider;
|
||||||
import com.ticketing.server.user.application.response.LogoutResponse;
|
import com.ticketing.server.user.service.dto.TokenDTO;
|
||||||
import com.ticketing.server.user.application.response.TokenDto;
|
import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
|
||||||
import com.ticketing.server.user.service.interfaces.AuthenticationService;
|
import com.ticketing.server.user.service.interfaces.AuthenticationService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||||
@@ -32,14 +28,14 @@ public class AuthenticationServiceImpl implements AuthenticationService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public TokenDto generateTokenDto(UsernamePasswordAuthenticationToken authenticationToken) {
|
public TokenDTO generateTokenDto(UsernamePasswordAuthenticationToken authenticationToken) {
|
||||||
// 회원인증
|
// 회원인증
|
||||||
Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);
|
Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);
|
||||||
|
|
||||||
String email = authenticationToken.getName();
|
String email = authenticationToken.getName();
|
||||||
|
|
||||||
// 토큰 발급
|
// 토큰 발급
|
||||||
TokenDto tokenDto = jwtProvider.generateTokenDto(authentication);
|
TokenDTO tokenDto = jwtProvider.generateTokenDto(authentication);
|
||||||
|
|
||||||
// refresh 토큰이 있으면 수정, 없으면 생성
|
// refresh 토큰이 있으면 수정, 없으면 생성
|
||||||
refreshRedisRepository.findByEmail(email)
|
refreshRedisRepository.findByEmail(email)
|
||||||
@@ -53,7 +49,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public TokenDto reissueTokenDto(String bearerRefreshToken) {
|
public TokenDTO reissueTokenDto(String bearerRefreshToken) {
|
||||||
String refreshToken = resolveToken(bearerRefreshToken);
|
String refreshToken = resolveToken(bearerRefreshToken);
|
||||||
|
|
||||||
// 토큰 검증
|
// 토큰 검증
|
||||||
@@ -63,15 +59,15 @@ public class AuthenticationServiceImpl implements AuthenticationService {
|
|||||||
|
|
||||||
// Redis 에 토큰이 있는지 검증
|
// Redis 에 토큰이 있는지 검증
|
||||||
RefreshToken findTokenEntity = refreshRedisRepository.findByEmail(authentication.getName())
|
RefreshToken findTokenEntity = refreshRedisRepository.findByEmail(authentication.getName())
|
||||||
.orElseThrow(() -> new TicketingException(REFRESH_TOKEN_NOT_FOUND));
|
.orElseThrow(ErrorCode::throwRefreshTokenNotFound);
|
||||||
|
|
||||||
// redis 토큰과 input 토큰이 일치한지 확인
|
// redis 토큰과 input 토큰이 일치한지 확인
|
||||||
if (!refreshToken.equals(findTokenEntity.getToken())) {
|
if (!refreshToken.equals(findTokenEntity.getToken())) {
|
||||||
throw new TicketingException(UNAVAILABLE_REFRESH_TOKEN);
|
throw ErrorCode.throwUnavailableRefreshToken();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 토큰 발급
|
// 토큰 발급
|
||||||
TokenDto tokenDto = jwtProvider.generateTokenDto(authentication);
|
TokenDTO tokenDto = jwtProvider.generateTokenDto(authentication);
|
||||||
|
|
||||||
// 토큰 최신화
|
// 토큰 최신화
|
||||||
findTokenEntity.changeToken(tokenDto.getRefreshToken());
|
findTokenEntity.changeToken(tokenDto.getRefreshToken());
|
||||||
@@ -82,19 +78,21 @@ public class AuthenticationServiceImpl implements AuthenticationService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public LogoutResponse deleteRefreshToken(String email) {
|
public DeleteRefreshTokenDTO deleteRefreshToken(String email) {
|
||||||
return refreshRedisRepository.findByEmail(email)
|
return refreshRedisRepository.findByEmail(email)
|
||||||
.map(tokenDto -> {
|
.map(tokenDto -> {
|
||||||
refreshRedisRepository.delete(tokenDto);
|
refreshRedisRepository.delete(tokenDto);
|
||||||
return LogoutResponse.from(tokenDto);
|
return new DeleteRefreshTokenDTO(tokenDto);
|
||||||
}).orElseGet(() -> LogoutResponse.from(email));
|
}).orElseGet(
|
||||||
|
() -> new DeleteRefreshTokenDTO(email)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private String resolveToken(String bearerToken) {
|
private String resolveToken(String bearerToken) {
|
||||||
if (StringUtils.hasText(bearerToken) && jwtProperties.hasTokenStartsWith(bearerToken)) {
|
if (StringUtils.hasText(bearerToken) && jwtProperties.hasTokenStartsWith(bearerToken)) {
|
||||||
return bearerToken.substring(7);
|
return bearerToken.substring(7);
|
||||||
}
|
}
|
||||||
throw new TicketingException(TOKEN_TYPE);
|
throw ErrorCode.throwTokenType();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package com.ticketing.server.user.service;
|
package com.ticketing.server.user.service;
|
||||||
|
|
||||||
import static com.ticketing.server.global.exception.ErrorCode.EMAIL_NOT_FOUND;
|
import com.ticketing.server.global.exception.ErrorCode;
|
||||||
|
|
||||||
import com.ticketing.server.global.exception.TicketingException;
|
|
||||||
import com.ticketing.server.user.domain.User;
|
import com.ticketing.server.user.domain.User;
|
||||||
import com.ticketing.server.user.domain.repository.UserRepository;
|
import com.ticketing.server.user.domain.repository.UserRepository;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@@ -21,9 +19,9 @@ public class CustomUserDetailsService implements UserDetailsService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
|
public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
|
||||||
return userRepository.findByEmailAndIsDeletedFalse(email)
|
return userRepository.findByEmailAndDeletedAtNull(email)
|
||||||
.map(this::createUserDetails)
|
.map(this::createUserDetails)
|
||||||
.orElseThrow(() -> new TicketingException(EMAIL_NOT_FOUND));
|
.orElseThrow(ErrorCode::throwEmailNotFound);
|
||||||
}
|
}
|
||||||
|
|
||||||
private UserDetails createUserDetails(User user) {
|
private UserDetails createUserDetails(User user) {
|
||||||
@@ -35,4 +33,5 @@ public class CustomUserDetailsService implements UserDetailsService {
|
|||||||
, Collections.singleton(grantedAuthority)
|
, Collections.singleton(grantedAuthority)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package com.ticketing.server.user.service;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
|
||||||
|
import com.ticketing.server.user.api.PaymentClient;
|
||||||
|
import com.ticketing.server.user.domain.User;
|
||||||
|
import com.ticketing.server.user.service.dto.PaymentsDTO;
|
||||||
|
import com.ticketing.server.user.service.interfaces.UserApisService;
|
||||||
|
import com.ticketing.server.user.service.interfaces.UserService;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
@Transactional(readOnly = true)
|
||||||
|
@Validated
|
||||||
|
@Slf4j
|
||||||
|
public class UserApisServiceImpl implements UserApisService {
|
||||||
|
|
||||||
|
private final PaymentClient paymentClient;
|
||||||
|
private final UserService userService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PaymentsDTO findPaymentsByEmail(@NotNull String email) {
|
||||||
|
User user = userService.findNotDeletedUserByEmail(email);
|
||||||
|
SimplePaymentsResponse simplePayments = paymentClient.getPayments(user.getAlternateId());
|
||||||
|
|
||||||
|
return new PaymentsDTO(user, simplePayments);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,17 +1,22 @@
|
|||||||
package com.ticketing.server.user.service;
|
package com.ticketing.server.user.service;
|
||||||
|
|
||||||
import static com.ticketing.server.global.exception.ErrorCode.DUPLICATE_EMAIL;
|
import com.ticketing.server.global.exception.ErrorCode;
|
||||||
import static com.ticketing.server.global.exception.ErrorCode.EMAIL_NOT_FOUND;
|
import com.ticketing.server.user.domain.ChangeGradeDTO;
|
||||||
|
import com.ticketing.server.user.domain.SequenceGenerator;
|
||||||
import com.ticketing.server.global.exception.TicketingException;
|
|
||||||
import com.ticketing.server.user.domain.User;
|
import com.ticketing.server.user.domain.User;
|
||||||
|
import com.ticketing.server.user.domain.UserGrade;
|
||||||
import com.ticketing.server.user.domain.repository.UserRepository;
|
import com.ticketing.server.user.domain.repository.UserRepository;
|
||||||
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
|
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
|
||||||
|
import com.ticketing.server.user.service.dto.ChangedPasswordUserDTO;
|
||||||
|
import com.ticketing.server.user.service.dto.CreatedUserDTO;
|
||||||
import com.ticketing.server.user.service.dto.DeleteUserDTO;
|
import com.ticketing.server.user.service.dto.DeleteUserDTO;
|
||||||
|
import com.ticketing.server.user.service.dto.DeletedUserDTO;
|
||||||
import com.ticketing.server.user.service.dto.SignUpDTO;
|
import com.ticketing.server.user.service.dto.SignUpDTO;
|
||||||
|
import com.ticketing.server.user.service.dto.UserDetailDTO;
|
||||||
import com.ticketing.server.user.service.interfaces.UserService;
|
import com.ticketing.server.user.service.interfaces.UserService;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import javax.validation.Valid;
|
import javax.validation.Valid;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -26,45 +31,57 @@ import org.springframework.validation.annotation.Validated;
|
|||||||
public class UserServiceImpl implements UserService {
|
public class UserServiceImpl implements UserService {
|
||||||
|
|
||||||
private final UserRepository userRepository;
|
private final UserRepository userRepository;
|
||||||
|
private final SequenceGenerator sequenceGenerator;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public User register(@Valid SignUpDTO signUpDto) {
|
public CreatedUserDTO register(@Valid SignUpDTO signUpDto) {
|
||||||
Optional<User> user = userRepository.findByEmail(signUpDto.getEmail());
|
Optional<User> optionalUser = userRepository.findByEmail(signUpDto.getEmail());
|
||||||
if (user.isEmpty()) {
|
if (optionalUser.isEmpty()) {
|
||||||
return userRepository.save(signUpDto.toUser());
|
User user = userRepository.save(signUpDto.toUser(sequenceGenerator.generateId()));
|
||||||
|
return new CreatedUserDTO(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new TicketingException(DUPLICATE_EMAIL);
|
throw ErrorCode.throwDuplicateEmail();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public User delete(@Valid DeleteUserDTO deleteUserDto) {
|
public DeletedUserDTO delete(@Valid DeleteUserDTO deleteUserDto) {
|
||||||
User user = findNotDeletedUserByEmail(deleteUserDto.getEmail());
|
User user = findNotDeletedUserByEmail(deleteUserDto.getEmail())
|
||||||
return user.delete(deleteUserDto);
|
.delete(deleteUserDto);
|
||||||
|
|
||||||
|
return new DeletedUserDTO(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public User changePassword(@Valid ChangePasswordDTO changePasswordDto) {
|
public ChangedPasswordUserDTO changePassword(@Valid ChangePasswordDTO changePasswordDto) {
|
||||||
User user = findNotDeletedUserByEmail(changePasswordDto.getEmail());
|
User user = findNotDeletedUserByEmail(changePasswordDto.getEmail())
|
||||||
return user.changePassword(changePasswordDto);
|
.changePassword(changePasswordDto);
|
||||||
|
|
||||||
|
return new ChangedPasswordUserDTO(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public User findByEmail(String email) {
|
@Transactional
|
||||||
return userRepository.findByEmail(email)
|
public ChangeGradeDTO changeGrade(@NotNull String email, @NotNull UserGrade grade) {
|
||||||
.orElseThrow(UserServiceImpl::throwEmailNotFound);
|
User user = findNotDeletedUserByEmail(email);
|
||||||
|
return user.changeGrade(grade);
|
||||||
}
|
}
|
||||||
|
|
||||||
private User findNotDeletedUserByEmail(String email) {
|
@Override
|
||||||
return userRepository.findByEmailAndIsDeletedFalse(email)
|
public UserDetailDTO findDetailByEmail(@NotNull String email) {
|
||||||
.orElseThrow(UserServiceImpl::throwEmailNotFound);
|
User user = userRepository.findByEmail(email)
|
||||||
|
.orElseThrow(ErrorCode::throwEmailNotFound);
|
||||||
|
|
||||||
|
return new UserDetailDTO(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static RuntimeException throwEmailNotFound() {
|
@Override
|
||||||
throw new TicketingException(EMAIL_NOT_FOUND);
|
public User findNotDeletedUserByEmail(@NotNull String email) {
|
||||||
|
return userRepository.findByEmailAndDeletedAtNull(email)
|
||||||
|
.orElseThrow(ErrorCode::throwEmailNotFound);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,28 +2,23 @@ package com.ticketing.server.user.service.dto;
|
|||||||
|
|
||||||
import javax.validation.constraints.Email;
|
import javax.validation.constraints.Email;
|
||||||
import javax.validation.constraints.NotEmpty;
|
import javax.validation.constraints.NotEmpty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
|
|
||||||
|
@AllArgsConstructor
|
||||||
public class ChangePasswordDTO implements PasswordMatches {
|
public class ChangePasswordDTO implements PasswordMatches {
|
||||||
|
|
||||||
@NotEmpty(message = "{validation.not.empty.email}")
|
@NotEmpty(message = "{validation.not.empty.email}")
|
||||||
@Email(message = "{validation.email}")
|
@Email(message = "{validation.email}")
|
||||||
private String email;
|
private final String email;
|
||||||
|
|
||||||
@NotEmpty(message = "{validation.not.empty.oldpassword}")
|
@NotEmpty(message = "{validation.not.empty.oldpassword}")
|
||||||
private String oldPassword;
|
private final String oldPassword;
|
||||||
|
|
||||||
@NotEmpty(message = "{validation.not.empty.newpassword}")
|
@NotEmpty(message = "{validation.not.empty.newpassword}")
|
||||||
private String newPassword;
|
private final String newPassword;
|
||||||
|
|
||||||
private PasswordEncoder passwordEncoder;
|
private final PasswordEncoder passwordEncoder;
|
||||||
|
|
||||||
public ChangePasswordDTO(String email, String oldPassword, String newPassword, PasswordEncoder passwordEncoder) {
|
|
||||||
this.email = email;
|
|
||||||
this.oldPassword = oldPassword;
|
|
||||||
this.newPassword = newPassword;
|
|
||||||
this.passwordEncoder = passwordEncoder;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getEmail() {
|
public String getEmail() {
|
||||||
return email;
|
return email;
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package com.ticketing.server.user.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.user.application.response.UserChangePasswordResponse;
|
||||||
|
import com.ticketing.server.user.domain.User;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public class ChangedPasswordUserDTO {
|
||||||
|
|
||||||
|
private final String name;
|
||||||
|
private final String email;
|
||||||
|
private final LocalDateTime updatedAt;
|
||||||
|
|
||||||
|
public ChangedPasswordUserDTO(User user) {
|
||||||
|
this(user.getName(), user.getEmail(), user.getUpdatedAt());
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserChangePasswordResponse toResponse() {
|
||||||
|
return new UserChangePasswordResponse(name, email, updatedAt);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package com.ticketing.server.user.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.user.application.response.SignUpResponse;
|
||||||
|
import com.ticketing.server.user.domain.User;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public class CreatedUserDTO {
|
||||||
|
|
||||||
|
private final String name;
|
||||||
|
private final String email;
|
||||||
|
|
||||||
|
public CreatedUserDTO(User user) {
|
||||||
|
this(
|
||||||
|
user.getName(),
|
||||||
|
user.getEmail()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public SignUpResponse toResponse() {
|
||||||
|
return new SignUpResponse(name, email);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package com.ticketing.server.user.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.global.redis.RefreshToken;
|
||||||
|
import com.ticketing.server.user.application.response.LogoutResponse;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public class DeleteRefreshTokenDTO {
|
||||||
|
|
||||||
|
private final Long refreshTokenId;
|
||||||
|
private final String email;
|
||||||
|
private final String refreshToken;
|
||||||
|
|
||||||
|
public DeleteRefreshTokenDTO(String email) {
|
||||||
|
this(null, email, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DeleteRefreshTokenDTO(RefreshToken refreshToken) {
|
||||||
|
this(refreshToken.getId(), refreshToken.getEmail(), refreshToken.getToken());
|
||||||
|
}
|
||||||
|
|
||||||
|
public LogoutResponse toResponse() {
|
||||||
|
return new LogoutResponse(refreshTokenId, email, refreshToken);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,24 +2,20 @@ package com.ticketing.server.user.service.dto;
|
|||||||
|
|
||||||
import javax.validation.constraints.Email;
|
import javax.validation.constraints.Email;
|
||||||
import javax.validation.constraints.NotEmpty;
|
import javax.validation.constraints.NotEmpty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
|
|
||||||
|
@AllArgsConstructor
|
||||||
public class DeleteUserDTO implements PasswordMatches {
|
public class DeleteUserDTO implements PasswordMatches {
|
||||||
|
|
||||||
@NotEmpty(message = "{validation.not.empty.email}")
|
@NotEmpty(message = "{validation.not.empty.email}")
|
||||||
@Email(message = "{validation.email}")
|
@Email(message = "{validation.email}")
|
||||||
private String email;
|
private final String email;
|
||||||
|
|
||||||
@NotEmpty(message = "{validation.not.empty.password}")
|
@NotEmpty(message = "{validation.not.empty.password}")
|
||||||
private String inputPassword;
|
private final String inputPassword;
|
||||||
|
|
||||||
private PasswordEncoder passwordEncoder;
|
private final PasswordEncoder passwordEncoder;
|
||||||
|
|
||||||
public DeleteUserDTO(String email, String inputPassword, PasswordEncoder passwordEncoder) {
|
|
||||||
this.email = email;
|
|
||||||
this.inputPassword = inputPassword;
|
|
||||||
this.passwordEncoder = passwordEncoder;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean passwordMatches(String password) {
|
public boolean passwordMatches(String password) {
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package com.ticketing.server.user.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.user.application.response.UserDeleteResponse;
|
||||||
|
import com.ticketing.server.user.domain.User;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public class DeletedUserDTO {
|
||||||
|
|
||||||
|
private final String name;
|
||||||
|
private final String email;
|
||||||
|
private final LocalDateTime deletedAt;
|
||||||
|
|
||||||
|
public DeletedUserDTO(User user) {
|
||||||
|
this(user.getName(), user.getEmail(), user.getDeletedAt());
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserDeleteResponse toResponse() {
|
||||||
|
return new UserDeleteResponse(name, email, deletedAt);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package com.ticketing.server.user.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
|
||||||
|
import com.ticketing.server.payment.service.dto.SimplePaymentDTO;
|
||||||
|
import com.ticketing.server.user.application.response.PaymentsResponse;
|
||||||
|
import com.ticketing.server.user.domain.User;
|
||||||
|
import java.util.List;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public class PaymentsDTO {
|
||||||
|
|
||||||
|
private final String email;
|
||||||
|
private final List<SimplePaymentDTO> payments;
|
||||||
|
|
||||||
|
public PaymentsDTO(User user, SimplePaymentsResponse simplePayments) {
|
||||||
|
this(user.getEmail(), simplePayments.getPayments());
|
||||||
|
}
|
||||||
|
|
||||||
|
public PaymentsResponse toResponse() {
|
||||||
|
return new PaymentsResponse(email, payments);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -5,34 +5,29 @@ import com.ticketing.server.user.domain.User;
|
|||||||
import com.ticketing.server.user.domain.UserGrade;
|
import com.ticketing.server.user.domain.UserGrade;
|
||||||
import javax.validation.constraints.Email;
|
import javax.validation.constraints.Email;
|
||||||
import javax.validation.constraints.NotEmpty;
|
import javax.validation.constraints.NotEmpty;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
public class SignUpDTO {
|
public class SignUpDTO {
|
||||||
|
|
||||||
@NotEmpty(message = "{validation.not.empty.name}")
|
@NotEmpty(message = "{validation.not.empty.name}")
|
||||||
private String name;
|
private final String name;
|
||||||
|
|
||||||
@NotEmpty(message = "{validation.not.empty.email}")
|
@NotEmpty(message = "{validation.not.empty.email}")
|
||||||
@Email(message = "{validation.email}")
|
@Email(message = "{validation.email}")
|
||||||
private String email;
|
private final String email;
|
||||||
|
|
||||||
@NotEmpty(message = "{validation.not.empty.password}")
|
@NotEmpty(message = "{validation.not.empty.password}")
|
||||||
private String password;
|
private final String password;
|
||||||
|
|
||||||
@NotEmpty(message = "{validation.not.empty.phone}")
|
@NotEmpty(message = "{validation.not.empty.phone}")
|
||||||
@Phone
|
@Phone
|
||||||
private String phone;
|
private final String phone;
|
||||||
|
|
||||||
public SignUpDTO(String name, String email, String password, String phone) {
|
public User toUser(long alternateId) {
|
||||||
this.name = name;
|
return new User(alternateId, this.name, this.email, password, UserGrade.USER, this.phone);
|
||||||
this.email = email;
|
|
||||||
this.password = password;
|
|
||||||
this.phone = phone;
|
|
||||||
}
|
|
||||||
|
|
||||||
public User toUser() {
|
|
||||||
return new User(this.name, this.email, password, UserGrade.GUEST, this.phone);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package com.ticketing.server.user.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.user.application.response.TokenResponse;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class TokenDTO {
|
||||||
|
|
||||||
|
private final String accessToken;
|
||||||
|
private final String refreshToken;
|
||||||
|
private final String tokenType;
|
||||||
|
private final long expiresIn;
|
||||||
|
|
||||||
|
public TokenResponse toResponse() {
|
||||||
|
return new TokenResponse(accessToken, refreshToken, tokenType, expiresIn);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package com.ticketing.server.user.service.dto;
|
||||||
|
|
||||||
|
import com.ticketing.server.user.application.response.UserDetailResponse;
|
||||||
|
import com.ticketing.server.user.domain.User;
|
||||||
|
import com.ticketing.server.user.domain.UserGrade;
|
||||||
|
import lombok.AccessLevel;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||||
|
public class UserDetailDTO {
|
||||||
|
|
||||||
|
private final Long alternateId;
|
||||||
|
private final String name;
|
||||||
|
private final String email;
|
||||||
|
private final UserGrade grade;
|
||||||
|
private final String phone;
|
||||||
|
|
||||||
|
public UserDetailDTO(User user) {
|
||||||
|
this(
|
||||||
|
user.getAlternateId(),
|
||||||
|
user.getName(),
|
||||||
|
user.getEmail(),
|
||||||
|
user.getGrade(),
|
||||||
|
user.getPhone()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserDetailResponse toResponse() {
|
||||||
|
return new UserDetailResponse(name, email, grade, phone);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user