Compare commits

...

39 Commits

Author SHA1 Message Date
changhyuns
7606a65413 refactor: set ddl-auto: validate 2022-07-26 20:56:09 +09:00
changhyuns
2d0832b7b2 fix: 하단 공백 추가 2022-07-26 12:55:11 +09:00
changhyuns
f5555000bd add: redis host, port 2022-07-26 02:31:16 +09:00
changhyuns
f59402b8b1 add: Dockerfile 2022-07-26 02:26:34 +09:00
changhyuns
d2a1cecd1a add: application-prod.yml 2022-07-26 02:23:59 +09:00
changhyuns
3136ffa6fe add: pkcs12 ssl key 2022-07-26 01:23:46 +09:00
손창현
42a00d20d0 feat: MovieTimeServiceTest - test registering movie time (#83) 2022-07-20 01:16:28 +09:00
Kim DongHyo
b3842d93b4 [User] 유저 컨트롤러 API 통합테스트 작성 (#84)
* test: 유저 통합테스트 추가

* test: JwtFilter 테스트케이스 추가

* refactor: 매직넘버 제거

* refactor: 회원탈퇴 / 패스워드 변경 검증 로직 수정
2022-07-20 01:06:22 +09:00
손창현
58bed5565f Feature/delete movie test (#79)
* feat: MovieServiceImplTest - test registering movie

* feat: MovieServiceImplTest - test deleteing movie

* feat: MovieServiceImplTest - test code for checking if exceptions occur

* refactor: MovieRepository NativeQuery -> JPQL
2022-07-19 02:13:13 +09:00
dongHyo
28874b1b1c Merge remote-tracking branch 'origin/develop' into feature/removeCollectionDTO 2022-07-18 17:57:02 +09:00
dongHyo
656e5e25e8 refactor: Ticket removed ListDTO 2022-07-18 17:56:53 +09:00
손창현
f1382597de Refactor/list dto (#78)
* refactor: removed MovieListDTO:

* refactor: removed MovieTimeListDTO

* refactor: MovieTimeServiceImplTest - removed MovieTimeListDto
2022-07-18 17:16:00 +09:00
Kim DongHyo
a2cfd7ab15 [Payment] 환불 구현 (#76)
* feat: 본인결제내역 환불 구현

* feat: 관리자 환불 구현

* refactor: 피드백 반영
2022-07-17 23:40:28 +09:00
Kim DongHyo
61f6636653 Update README.md 2022-07-15 17:54:03 +09:00
손창현
a1579cfe13 Feature/get ticket list (#75)
* add: TicketListDTO

* add: TicketDTO

* add: TicketListResponse

* add: findValidTickets(Long movieTimeId) in ticket repository

* add: MOVIE_TIME_NOT_FOUND exception

* feat: get ticket list API

* add: secured USER for ticket APIs

* refactor: 코드 정렬
2022-07-15 13:22:32 +09:00
Kim DongHyo
c760d66cf6 feat: 영화티켓 예매 구현 (카카오페이API 연동) (#74)
* feat: 영화티켓 예매 구현 (카카오페이API 연동)

* fix: 테스트 값 제거
2022-07-15 04:32:20 +09:00
손창현
68ad0ce910 Feature/register movie time (#72)
* refactor: get movie times API

* refactor: get movie times test

* fix: removed unnecessary import

* add: RegisteredMovieTimeDTO

* add: MovieTimeRegisterRequest

* add: THEATER_NOT_FOUND exception

* add: DUPLICATE_MOVIE_TIME exception

* feat: register movie time API

* fix: 공백 탭으로 변경
2022-07-15 02:47:39 +09:00
손창현
d80a370232 Feature/delete movie (#71)
* refactor: set movie title unique -> not unique

* add: findValidMovieWithTitle() in MovieRepository

* refactor: changed MovieTitleResponse -> MovieInfoResponse

* refactor: register Movie API

* add: throwDeletedMovie() exception

* add: deleteMovie() in movieService

* refactor: get movie list API

* refactor: movieService test code

* feat: delete movie API
2022-07-14 12:25:52 +09:00
Kim DongHyo
12f1d6b9be fix: 브런치 merge 중 import 가 잘못되서 수정 (#70) 2022-07-13 14:13:48 +09:00
Kim DongHyo
db5e8272b6 Update README.md 2022-07-12 23:18:47 +09:00
Kim DongHyo
9780a84609 refactor: 정적팩토리 -> 생성자 변경 (#69)
Co-authored-by: 손창현 <gganzii1215@gmail.com>
2022-07-12 18:51:44 +09:00
Kim DongHyo
7283eeb5d3 feat: 권한변경 API 구현 (#67) 2022-07-12 18:31:18 +09:00
Kim DongHyo
0521b85dd9 Update README.md 2022-07-12 13:43:40 +09:00
Kim DongHyo
b836598be3 Update README.md 2022-07-12 13:42:32 +09:00
Kim DongHyo
0173fc92ed [User] 결제내역 상세 조회 구현 및 전반적인 코드 수정 (#66)
* feat: 결제내역 상세 조회

alternatedId 컬럼추가
GUEST -> USER 권한명칭변경
User Entity: isDeleted, deletedAt
closed #53, #61, #62, #63

* refactor: 프로퍼티 권한 private -> protected 변경

closed #60

* refactor: access Token 시간 변경

closed #65

* refactor: 에러코드 부분 수정

* feat: id 포함 생성자 추가
2022-07-12 01:57:30 +09:00
손창현
73cc0241d3 Feature/add movie (#59)
* add: MovieTitleResponse

* add: MovieRegisterDTO

* add: DUPLICATE MOVIE exception

* add: registerMovie() in MovieService

* feat: add movie information - STAFF

* refactor: variable DTO -> Dto
2022-07-11 16:02:40 +09:00
Kim DongHyo
720c495b51 Update README.md 2022-07-09 13:47:25 +09:00
Kim DongHyo
bd7b761636 Update README.md 2022-07-09 13:46:27 +09:00
Kim DongHyo
c9c4201920 Update README.md 2022-07-09 13:46:11 +09:00
Kim DongHyo
16eed0cbed [User] 회원 결제목록 조회 및 Exception Method 한 곳으로 이동 (#50)
* feat: findPayments

* refactor: Exception Method 한 곳으로 이동
2022-07-08 11:33:21 +09:00
Kim DongHyo
8d5f179647 Update README.md 2022-07-06 04:28:09 +09:00
Kim DongHyo
fca765e9c3 feat: movie test data setup (#48)
feat: 영화 테스트 데이터 setup 구현
2022-07-05 19:03:01 +09:00
손창현
3ea3b88b1f Feature/get movie time list (#46)
* refactor: MovieTimeRepository - findValidMovieTimes 네이티브 쿼리 -> JPQL 변경

* refactor: MovieTimeServiceImpl JPQL 적용 - movie.getId() -> movie

* feat: MovieTimeServiceImplTest - get movie times 케이스 작성

* refactor: MovieServiceImplTest - static factory method 적용

* feat: MovieTimeServiceImplTest - get movie time list 케이스 작성
2022-07-04 18:35:01 +09:00
Kim DongHyo
09cb4a3767 refactor: 통합테스트, 유닛테스트 환경 분리 (#45)
* refactor: 통합테스트, 유닛테스트 환경 분리

* refactor: testImplementation 와 다른 게 없어서 통합
2022-07-04 00:36:15 +09:00
손창현
648638860c Feature/get movie times list (#42)
* refactor: 영화 시작, 종료 시간 LocalTime 적용

* refactor: 영화 시간표 테이블 이름 변경 movie_times -> movie_time

* feat: getMovieTimes API

* refactor: 영화 시간표 조회 runningDate ApiParam 상영 날짜로 변경

* fix: MovieTimeRepositoryTest 오타 수정

* refactor: MovieTime start_at, end_at LocalDateTime으로 변경

* refactor: find List<MovieTime> with native query

* add: comment for endOfDay variable

* add: MovieTimeDto - AccessLevel.PRIVATE for static factory method

* refactor: startOfDay 06:00 설정

* refactor: removed tmdb settings

* refactor: removed unnecessary comments

* refactor: removed unnecessary comments

* refactor: removed unnecessary imports

* add: MovieDto - AcessLevel.PRIVATE for static factory method
2022-07-04 00:36:07 +09:00
Kim DongHyo
6f14c96931 Update README.md 2022-07-03 21:35:38 +09:00
Kim DongHyo
e009c2786c Update README.md 2022-07-03 19:32:01 +09:00
Kim DongHyo
cb79ec5e57 Update README.md 2022-07-03 19:30:38 +09:00
Kim DongHyo
d0af7e4444 feat: 로그아웃 시 refreshToken 제거 (#44)
* feat: 로그아웃 시 refreshToken 제거

* refactor: deleteRefreshToken 메서드 람다활용 문법으로 변경
2022-06-30 16:31:54 +09:00
203 changed files with 6193 additions and 552 deletions

View File

@@ -1,5 +1,5 @@
# 🍿 Ticketing
영화 예매 서비스
영화 예매 사이트를 대용량 트래픽에 대응할 수 있도록 설계.
<br/>
@@ -8,32 +8,59 @@
- 기획 및 설계 : 22.04.13 ~
- 프로젝트 구현 :
<br/>
<br/><br/>
## 🎯 프로젝트 주요 관심사
- OOP(객체 지향 프로그래밍)의 장점을 최대한 활용
- 테스트 코드를 통한 믿을 수 있는 코드 작성
- 대용량 트래픽을 고려한 확장 가능한 설계 및 성능 튜닝
- 코드리뷰를 통해 코드 품질 향상
- 코드 컨벤션 준수하여 코드 통일성 유지
## 🎯 프로젝트 목표
<br/>
## 🛠 기술스택
- Java 11
- Spring Boot 2.6.7 (당시 최신 GA 버전)
- Gradle Kotlin DSL
- Spring Security
- Junit 5
- Hibernate / SpringJPA
- MySQL 8.0
- Redis
<br/><br/>
<br/>
## Wiki
- [Git Branch 전략](https://github.com/f-lab-edu/Ticketing/wiki#-git-branch-%EC%A0%84%EB%9E%B5)
- [Code Convention](https://github.com/f-lab-edu/Ticketing/wiki#-code-convention)
- [패키지 구조](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)
- [Prototype](https://github.com/f-lab-edu/Ticketing/wiki/Prototype)
- [Issue Posting](https://github.com/f-lab-edu/Ticketing/wiki/Issue-Posting)
<br/>
## 🧩 ERD
``` mermaid
erDiagram
MOVIE ||--o{ MOVIE_TIMES : ""
MOVIE ||--o{ MOVIE_TIME : ""
MOVIE {
bigint id PK "영화 ID"
varchar title "영화제목"
int running_time "러닝타임"
datetime deleted_at "삭제일시"
datetime created_at "등록일시"
datetime updated_at "수정일시"
}
THEATER ||--o{ MOVIE_TIMES : ""
THEATER ||--o{ MOVIE_TIME : ""
THEATER ||--|{ SEAT : ""
THEATER {
bigint id PK "상영관 ID"
int theater_number "상영관 번호"
int seat_count "좌석수"
datetime deleted_at "삭제일시"
datetime created_at "등록일시"
datetime updated_at "수정일시"
}
@@ -43,56 +70,59 @@ erDiagram
bigint theater_id FK "상영관 ID"
int column "열"
int row "행"
datetime deleted_at "삭제일시"
datetime created_at "등록일시"
datetime updated_at "수정일시"
}
MOVIE_TIMES ||--o{ TICKET : ""
MOVIE_TIMES {
MOVIE_TIME ||--o{ TICKET : ""
MOVIE_TIME {
bigint id PK "상영시간표 ID"
bigint movie_id FK "영화 ID"
bigint theater_id FK "상영관 ID"
date running_date "상영 날짜"
int round "회차"
time start_at "시작 시간"
time end_at "종료 시간"
datetime deleted_at "삭제일시"
datetime created_at "등록일시"
datetime updated_at "수정일시"
}
TICKET {
bigint id PK "티켓 ID"
bigint seat_id FK "좌석 ID"
bigint movie_times_id FK "상영시간표 ID"
bigint payment_id FK "결제 ID"
varchar status "상태 - 매가능/예약진행중/판매완료"
bigint movie_time_id FK "상영시간표 ID"
bigint payment_id "결제 ID"
varchar status "상태 - 매가능/예약/"
int ticket_price "가격"
datetime deleted_at "삭제일시"
datetime created_at "등록일시"
datetime updated_at "수정일시"
}
TICKET }|--|| PAYMENT : ""
PAYMENT {
bigint id PK "결제 ID"
bigint user_id FK "유저ID"
bigint user_alternate_id "유저 대체ID"
varchar tid "카카오페이 결제고유번호"
varchar movie_title "영화제목"
varchar type "결제 타입 - 예) 네이버페이, 카카오페이"
varchar status "상태 - 완료/환불/실패"
varchar failed_message "실패사유 - 컬럼명을 알아보기 쉬운가?"
varchar status "상태 - 완료/환불"
varchar failed_message "실패사유"
varchar payment_number "예매번호"
int total_price "결제 금액"
datetime deleted_at "삭제일시"
datetime created_at "결제일시"
datetime updated_at "수정일시"
}
USER ||--o{ PAYMENT : ""
USER {
bigint id "회원"
bigint alternate_id "대체ID"
varchar name "이름"
varchar email "이메일"
varchar password "비밀번호"
varchar grade "등급 - 고객/임직원"
varchar phone "휴대폰 번호"
boolean is_deleted "탈퇴여부"
datetime deleted_at "탈퇴일시"
datetime created_at "가입일시"
datetime updated_at "수정일시"
}
```
<br/><br/>

12
server/Dockerfile Normal file
View File

@@ -0,0 +1,12 @@
FROM openjdk:11-jre-slim
ENV APP_HOME=/usr/app/
WORKDIR $APP_HOME
COPY build/libs/server-0.0.1-SNAPSHOT.jar application.jar
EXPOSE 8443
EXPOSE 8080
CMD ["java", "-jar", "application.jar"]

View File

@@ -23,7 +23,7 @@ repositories {
mavenCentral()
}
extra["springCloudVersion"] = "2021.0.3"
dependencies {
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
@@ -32,14 +32,17 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-actuator")
implementation("org.springframework.boot:spring-boot-starter-log4j2")
implementation("org.projectlombok:lombok:1.18.20")
implementation("org.projectlombok:lombok:1.18.24")
implementation("io.springfox:springfox-boot-starter:3.0.0")
implementation("io.springfox:springfox-swagger-ui:3.0.0")
implementation("com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.4")
implementation("com.lmax:disruptor:3.4.2")
implementation("io.jsonwebtoken:jjwt-api:0.11.2")
implementation("com.lmax:disruptor:3.4.4")
implementation("io.jsonwebtoken:jjwt-api:0.11.5")
implementation("com.googlecode.json-simple:json-simple:1.1.1")
implementation("org.springframework.boot:spring-boot-starter-data-redis")
implementation("com.google.code.findbugs:jsr305:3.0.2")
implementation ("org.springframework.cloud:spring-cloud-starter-config")
implementation("org.springframework.cloud:spring-cloud-starter-openfeign")
modules {
module("org.springframework.boot:spring-boot-starter-logging") {
@@ -47,22 +50,49 @@ dependencies {
}
}
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.springframework.security:spring-security-test")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
compileOnly("org.projectlombok:lombok")
runtimeOnly("mysql:mysql-connector-java")
runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.2")
runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.2")
runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.5")
runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.5")
annotationProcessor("org.projectlombok:lombok")
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.springframework.security:spring-security-test")
}
dependencyManagement {
imports {
mavenBom("org.springframework.cloud:spring-cloud-dependencies:${property("springCloudVersion")}")
}
}
tasks.withType<Test> {
useJUnitPlatform()
}
sourceSets {
create("intTest") {
compileClasspath += sourceSets.main.get().output
runtimeClasspath += sourceSets.main.get().output
}
}
val intTestImplementation by configurations.getting {
extendsFrom(configurations.implementation.get())
}
configurations["intTestRuntimeOnly"].extendsFrom(configurations.runtimeOnly.get())
configurations["intTestImplementation"].extendsFrom(configurations.testImplementation.get())
val integrationTest = task<Test>("integrationTest") {
description = "Runs integration tests."
group = "verification"
testClassesDirs = sourceSets["intTest"].output.classesDirs
classpath = sourceSets["intTest"].runtimeClasspath
shouldRunAfter("test")
}
tasks.check { dependsOn(integrationTest) }

View File

@@ -0,0 +1,15 @@
package com.ticketing.server.global.config;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import org.springframework.security.test.context.support.WithSecurityContext;
@Retention(RetentionPolicy.RUNTIME)
@WithSecurityContext(factory = WithAuthUserSecurityContextFactory.class)
public @interface WithAuthUser {
String email();
String role();
}

View File

@@ -0,0 +1,27 @@
package com.ticketing.server.global.config;
import java.util.List;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.test.context.support.WithSecurityContextFactory;
public class WithAuthUserSecurityContextFactory implements WithSecurityContextFactory<WithAuthUser> {
@Override
public SecurityContext createSecurityContext(WithAuthUser annotation) {
String email = annotation.email();
String role = annotation.role();
List<SimpleGrantedAuthority> authorities = List.of(new SimpleGrantedAuthority(role));
User authUser = new User(email, "", authorities);
UsernamePasswordAuthenticationToken token =
new UsernamePasswordAuthenticationToken(authUser, "", authorities);
SecurityContext context = SecurityContextHolder.getContext();
context.setAuthentication(token);
return context;
}
}

View File

@@ -0,0 +1,5 @@
package com.ticketing.server.movie.domain;
public class MovieTest {
}

View File

@@ -30,7 +30,7 @@ public class MovieRepositoryTest {
@DisplayName("Movie Repository Test - saving movie")
void shouldAbleToSaveMovie() {
// given
Movie movie = new Movie("범죄도시 2", 106);
Movie movie = new Movie("범죄도시 2", 106L);
// when
Movie savedMovie = movieRepository.save(movie);

View File

@@ -20,7 +20,7 @@ public class TheaterRepositoryTest {
@DisplayName("Theater Repository Test - saving theater")
void ShouldAbleToSaveTheater() {
// given
Theater theater = new Theater(1, 100);
Theater theater = new Theater(1);
// when
Theater savedTheater = theaterRepository.save(theater);

View File

@@ -31,6 +31,7 @@ class AuthControllerTest {
private static final String LOGIN_URL = "/api/auth/token";
private static final String REGISTER_URL = "/api/users";
private static final String USER_EMAIL = "ticketing@gmail.com";
@Autowired
WebApplicationContext context;
@@ -53,7 +54,7 @@ class AuthControllerTest {
@DisplayName("로그인 인증 성공")
void loginSuccess() throws Exception {
// given
LoginRequest request = new LoginRequest("ticketing@gmail.com", "qwe123");
LoginRequest request = new LoginRequest(USER_EMAIL, "qwe123");
// when
ResultActions actions = mvc.perform(post(LOGIN_URL)
@@ -69,7 +70,7 @@ class AuthControllerTest {
@DisplayName("로그인 패스워드 인증 실패")
void loginPasswordFail() throws Exception {
// given
LoginRequest request = new LoginRequest("ticketing@gmail.com", "qwe1234");
LoginRequest request = new LoginRequest(USER_EMAIL, "qwe1234");
// when
ResultActions actions = mvc.perform(post(LOGIN_URL)
@@ -81,10 +82,6 @@ class AuthControllerTest {
.andExpect(status().isUnauthorized());
}
private String asJsonString(Object object) throws JsonProcessingException {
return objectMapper.writeValueAsString(object);
}
@BeforeEach
void init() throws Exception {
mvc = MockMvcBuilders
@@ -92,7 +89,7 @@ class AuthControllerTest {
.apply(springSecurity())
.build();
SignUpRequest signUpRequest = new SignUpRequest("ticketing", "ticketing@gmail.com", "qwe123", "010-2240-7920");
SignUpRequest signUpRequest = new SignUpRequest("ticketing", USER_EMAIL, "qwe123", "010-1234-5678");
mvc.perform(post(REGISTER_URL)
.content(asJsonString(signUpRequest))
@@ -104,4 +101,8 @@ class AuthControllerTest {
refreshRedisRepository.deleteAll();
}
private String asJsonString(Object object) throws JsonProcessingException {
return objectMapper.writeValueAsString(object);
}
}

View File

@@ -0,0 +1,242 @@
package com.ticketing.server.user.application;
import static org.springframework.http.MediaType.APPLICATION_JSON;
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ticketing.server.global.config.WithAuthUser;
import com.ticketing.server.user.application.request.LoginRequest;
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.UserDeleteRequest;
import com.ticketing.server.user.domain.UserGrade;
import com.ticketing.server.user.domain.UserGrade.ROLES;
import com.ticketing.server.user.domain.repository.UserRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.context.WebApplicationContext;
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@Transactional
class UserControllerTest {
private static final String LOGIN_URL = "/api/auth/token";
private static final String BASICS_URL = "/api/users";
private static final String DETAILS_URL = "/api/users/details";
private static final String CHANGE_PASSWORD_URL = "/api/users/password";
private static final String CHANGE_GRADE_URL = "/api/users/grade";
private static final String NAME = "$.name";
private static final String EMAIL = "$.email";
private static final String GRADE = "$.grade";
private static final String PHONE = "$.phone";
private static final String BEFORE_GRADE = "$.beforeGrade";
private static final String AFTER_GRADE = "$.afterGrade";
private static final String USER_EMAIL = "testemail@ticketing.com";
private static final String USER_PW = "qwe123";
private static final String USER_NAME = "김철수";
private static final String USER_PHONE = "010-1234-5678";
@Autowired
UserRepository userRepository;
@Autowired
ObjectMapper mapper;
@Autowired
WebApplicationContext context;
MockMvc mvc;
SignUpRequest signUpRequest;
@Test
@DisplayName("회원가입 성공")
void registerSuccess() throws Exception {
// given
// when
ResultActions resultActions = mvc.perform(
post(BASICS_URL)
.content(mapper.writeValueAsString(signUpRequest))
.contentType(APPLICATION_JSON)
);
// then
resultActions
.andExpect(status().isCreated())
.andExpect(content().contentType(APPLICATION_JSON))
.andExpect(jsonPath(NAME).value(USER_NAME))
.andExpect(jsonPath(EMAIL).value(USER_EMAIL));
}
@Test
@DisplayName("유저 정보 조회")
@WithAuthUser(email = USER_EMAIL, role = ROLES.USER)
void detailsSuccess() throws Exception {
// given
mvc.perform(
post(BASICS_URL)
.content(mapper.writeValueAsString(signUpRequest))
.contentType(APPLICATION_JSON)
);
// when
ResultActions resultActions = mvc.perform(
get(DETAILS_URL)
.content(mapper.writeValueAsString(signUpRequest))
.contentType(APPLICATION_JSON)
);
// then
resultActions
.andExpect(status().isOk())
.andExpect(content().contentType(APPLICATION_JSON))
.andExpect(jsonPath(NAME).value(USER_NAME))
.andExpect(jsonPath(EMAIL).value(USER_EMAIL))
.andExpect(jsonPath(GRADE).value(UserGrade.USER.name()))
.andExpect(jsonPath(PHONE).value(USER_PHONE));
}
@Test
@DisplayName("유저 탈퇴 성공")
@WithAuthUser(email = USER_EMAIL, role = ROLES.USER)
void deleteUserSuccess() throws Exception {
// given
UserDeleteRequest deleteRequest = new UserDeleteRequest(USER_EMAIL, USER_PW);
LoginRequest loginRequest = new LoginRequest(USER_EMAIL, USER_PW);
mvc.perform(
post(BASICS_URL)
.content(mapper.writeValueAsString(signUpRequest))
.contentType(APPLICATION_JSON)
);
// when
// 1. 회원 탈퇴 진행
mvc.perform(
delete(BASICS_URL)
.content(mapper.writeValueAsString(deleteRequest))
.contentType(APPLICATION_JSON)
);
// 2. 탈퇴된 계정 로그인
ResultActions resultActions = mvc.perform(post(LOGIN_URL)
.content(mapper.writeValueAsString(loginRequest))
.contentType(MediaType.APPLICATION_JSON));
// then
resultActions
.andExpect(status().isUnauthorized());
}
@Test
@DisplayName("비밀번호 변경 성공")
@WithAuthUser(email = USER_EMAIL, role = ROLES.USER)
void changePasswordSuccess() throws Exception {
// given
UserChangePasswordRequest changePasswordRequest = new UserChangePasswordRequest(USER_PW, "qwe1234");
LoginRequest loginRequest = new LoginRequest(USER_EMAIL, USER_PW);
mvc.perform(
post(BASICS_URL)
.content(mapper.writeValueAsString(this.signUpRequest))
.contentType(APPLICATION_JSON)
);
// when
// 1. 패스워드 변경
mvc.perform(
put(CHANGE_PASSWORD_URL)
.content(mapper.writeValueAsString(changePasswordRequest))
.contentType(APPLICATION_JSON)
)
.andExpect(status().isOk());
// 2. 변경 전 계정으로 로그인
ResultActions resultActions = mvc.perform(post(LOGIN_URL)
.content(mapper.writeValueAsString(loginRequest))
.contentType(MediaType.APPLICATION_JSON));
// then
resultActions
.andExpect(status().isUnauthorized());
}
@Test
@DisplayName("유저 등급 변경")
@WithAuthUser(email = "admin@ticketing.com", role = ROLES.ADMIN)
void changeGradeSuccess() throws Exception {
// given
UserChangeGradeRequest changeGradeRequest = new UserChangeGradeRequest(USER_EMAIL, UserGrade.STAFF);
mvc.perform(
post(BASICS_URL)
.content(mapper.writeValueAsString(signUpRequest))
.contentType(APPLICATION_JSON)
);
// when
ResultActions resultActions = mvc.perform(
post(CHANGE_GRADE_URL)
.content(mapper.writeValueAsString(changeGradeRequest))
.contentType(APPLICATION_JSON)
);
// then
resultActions
.andExpect(status().isOk())
.andExpect(content().contentType(APPLICATION_JSON))
.andExpect(jsonPath(EMAIL).value(USER_EMAIL))
.andExpect(jsonPath(BEFORE_GRADE).value(UserGrade.USER.name()))
.andExpect(jsonPath(AFTER_GRADE).value(UserGrade.STAFF.name()));
}
@Test
@DisplayName("유저 등급 변경 실패 - 권한 등급이 낮을 경우")
@WithAuthUser(email = "staff@ticketing.com", role = ROLES.STAFF)
void changeGradeFail() throws Exception {
// given
UserChangeGradeRequest changeGradeRequest = new UserChangeGradeRequest(USER_EMAIL, UserGrade.STAFF);
// when
ResultActions resultActions = mvc.perform(
post(CHANGE_GRADE_URL)
.content(mapper.writeValueAsString(changeGradeRequest))
.contentType(APPLICATION_JSON)
);
// then
resultActions
.andExpect(status().isForbidden());
}
@BeforeEach
void init() {
mvc = MockMvcBuilders
.webAppContextSetup(context)
.apply(springSecurity())
.build();
signUpRequest = new SignUpRequest(USER_NAME, USER_EMAIL, USER_PW, USER_PHONE);
}
}

View File

@@ -0,0 +1,40 @@
spring:
datasource:
url: jdbc:mysql://localhost:3306/ticketing_test?serverTimezone=Asia/Seoul&characterEncoding=UTF-8
username: ENC(LowN1n4w0Ep/DqLD8+q5Bq6AXM4b8e3V)
password: ENC(OMvGcpZLpggFTiGNkqNe66Zq/SmJXF6o)
driver-class-name: com.mysql.cj.jdbc.Driver
redis:
host: localhost
port: 6379
jpa:
properties:
hibernate:
show_sql: true
format_sql: true
hibernate:
ddl-auto: create
mvc:
pathmatch:
matching-strategy: ant_path_matcher
config:
import: "optional:configserver:"
jasypt:
encryptor:
bean: jasyptStringEncryptor
jwt:
access-header: Authorization
refresh-header: REFRESH_TOKEN
prefix: Bearer
secret-key: Zi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXktZi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXkK
access-token-validity-in-seconds: 60
refresh-token-validity-in-seconds: 259200
tmdb:
api-key: 0d1503b6dcbfe1c514299b5564c649b8
read-access-token: eyJhbGciOiJIUzI1NiJ9.eyJhdWQiOiIwZDE1MDNiNmRjYmZlMWM1MTQyOTliNTU2NGM2NDliOCIsInN1YiI6IjYyOWYwODRlNzI2ZmIxMTA2NDA4MjI2NCIsInNjb3BlcyI6WyJhcGlfcmVhZCJdLCJ2ZXJzaW9uIjoxfQ.rs8KZea8QLyashILiggWFx2s46lgUtzo-xSWoDgE58A

View File

@@ -1,14 +1,17 @@
package com.ticketing.server;
import com.ticketing.server.global.security.jwt.JwtProperties;
import com.ticketing.server.payment.api.KakaoPayProperties;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
@EnableJpaAuditing
@EnableFeignClients
@SpringBootApplication
@EnableConfigurationProperties(JwtProperties.class)
@EnableConfigurationProperties({JwtProperties.class, KakaoPayProperties.class})
public class ServerApplication {
public static void main(String[] args) {

View File

@@ -0,0 +1,9 @@
package com.ticketing.server.global.dto;
public interface SequenceGenerator {
Long generateId();
long[] parse(long id);
}

View File

@@ -0,0 +1,118 @@
package com.ticketing.server.global.dto;
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 + "]";
}
}

View File

@@ -19,15 +19,15 @@ public abstract class AbstractEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
protected Long id;
@Column(nullable = false, updatable = false)
@CreatedDate
private LocalDateTime createdAt;
protected LocalDateTime createdAt;
@LastModifiedDate
private LocalDateTime updatedAt;
protected LocalDateTime updatedAt;
private LocalDateTime deletedAt;
protected LocalDateTime deletedAt;
}

View File

@@ -2,8 +2,10 @@ package com.ticketing.server.global.exception;
import static org.springframework.http.HttpStatus.BAD_REQUEST;
import static org.springframework.http.HttpStatus.CONFLICT;
import static org.springframework.http.HttpStatus.FORBIDDEN;
import static org.springframework.http.HttpStatus.NOT_FOUND;
import com.ticketing.server.global.redis.PaymentCache;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.springframework.http.HttpStatus;
@@ -16,16 +18,141 @@ public enum ErrorCode {
MISMATCH_PASSWORD(BAD_REQUEST, "비밀번호가 일치하지 않습니다."),
TOKEN_TYPE(BAD_REQUEST, "토큰 타입이 올바르지 않습니다."),
UNAVAILABLE_REFRESH_TOKEN(BAD_REQUEST, "사용할 수 없는 토큰 입니다."),
UNABLE_CHANGE_GRADE(BAD_REQUEST, "동일한 등급으로 변경할 수 없습니다."),
INVALID_TICKET_ID(BAD_REQUEST, "잘못된 티켓 ID가 존재합니다."),
BAD_REQUEST_MOVIE_TIME(BAD_REQUEST, "동일한 상영시간만 결제 가능합니다."),
BAD_REQUEST_PAYMENT_COMPLETE(BAD_REQUEST, "처리할 결제 정보가 존재하지 않습니다."),
BAD_REQUEST_PAYMENT_READY(BAD_REQUEST, "이미 진행 중인 결제가 존재합니다."),
BAD_REQUEST_PAYMENT_CANCEL(BAD_REQUEST, "취소할 티켓이 존재하지 않습니다."),
NOT_REFUNDABLE_TIME(BAD_REQUEST, "환불이 가능한 시간이 지났습니다."),
NOT_REFUNDABLE_SEAT(BAD_REQUEST, "환불할 수 있는 좌석이 아닙니다."),
/* 403 FORBIDDEN : 접근 권한 제한 */
VALID_USER_ID(FORBIDDEN, "해당 정보에 접근 권한이 존재하지 않습니다."),
/* 404 NOT_FOUND : Resource 를 찾을 수 없음 */
USER_NOT_FOUND(NOT_FOUND, "해당 유저 정보를 찾을 수 없습니다."),
EMAIL_NOT_FOUND(NOT_FOUND, "해당 이메일을 찾을 수 없습니다."),
MOVIE_NOT_FOUND(NOT_FOUND, "해당 제목의 영화를 찾을 수 없습니다."),
MOVIE_TIME_NOT_FOUND(NOT_FOUND, "해당 영화 시간표 정보를 찾을 수 없습니다"),
REFRESH_TOKEN_NOT_FOUND(NOT_FOUND, "리프레쉬 토큰을 찾을 수 없습니다."),
PAYMENT_ID_NOT_FOUND(NOT_FOUND, "결제정보를 찾을 수 없습니다."),
THEATER_NOT_FOUND(NOT_FOUND, "상영관 정보를 찾을 수 없습니다."),
/* 409 CONFLICT : Resource 의 현재 상태와 충돌. 보통 중복된 데이터 존재 */
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 String detail;
private 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);
}
public static TicketingException throwInvalidTicketId() {
throw new TicketingException(INVALID_TICKET_ID);
}
public static TicketingException throwBadRequestMovieTime() {
throw new TicketingException(BAD_REQUEST_MOVIE_TIME);
}
public static TicketingException throwBadRequestPaymentComplete() {
throw new TicketingException(BAD_REQUEST_PAYMENT_COMPLETE);
}
public static TicketingException throwBadRequestPaymentReady() {
throw new TicketingException(BAD_REQUEST_PAYMENT_READY);
}
public static TicketingException throwBadRequestPaymentCancel() {
throw new TicketingException(BAD_REQUEST_PAYMENT_CANCEL);
}
public static TicketingException throwNotRefundableTime() {
throw new TicketingException(NOT_REFUNDABLE_TIME);
}
public static TicketingException throwNotRefundableSeat() {
throw new TicketingException(NOT_REFUNDABLE_SEAT);
}
/* 403 FORBIDDEN : 접근 권한 제한 */
public static TicketingException throwValidUserId() {
throw new TicketingException(VALID_USER_ID);
}
/* 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 throwMovieTimeNotFound() {
throw new TicketingException(MOVIE_TIME_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);
}
}

View File

@@ -21,9 +21,9 @@ import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.core.AuthenticationException;
import org.springframework.validation.BindException;
import org.springframework.validation.FieldError;
import org.springframework.validation.ObjectError;
import org.springframework.web.HttpMediaTypeNotSupportedException;
import org.springframework.web.HttpRequestMethodNotSupportedException;
@@ -53,7 +53,8 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
List<String> errors = generateErrors(ex);
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 +67,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
List<String> errors = generateErrors(ex);
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);
}
/**
@@ -211,6 +212,17 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
}
/**
* 이메일이 존재하지 않을 경우
*/
@ExceptionHandler(value = BadCredentialsException.class)
protected ResponseEntity<ErrorResponse> handleBadCredentialsException(BadCredentialsException ex) {
log.error("BadCredentialsException :: ", ex);
ErrorResponse response = new ErrorResponse(UNAUTHORIZED, ex.getLocalizedMessage(), "아이디 혹은 패스워드가 일치하지 않습니다.");
return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
}
/**
* 인증 정보가 없을 때
*/
@@ -238,7 +250,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
List<ObjectError> allErrors = ex.getBindingResult().getAllErrors();
for (ObjectError error : allErrors) {
errors.add(((FieldError) error).getField() + ": " + error.getDefaultMessage());
errors.add(error.getDefaultMessage());
}
return errors;
}

View File

@@ -0,0 +1,47 @@
package com.ticketing.server.global.redis;
import java.util.List;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.springframework.data.redis.core.RedisHash;
import org.springframework.data.redis.core.index.Indexed;
@Getter
@RedisHash("Payment")
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class PaymentCache {
@Id
@GeneratedValue
@Column(name = "payment_ready_id")
private Long id;
@Indexed
private String email;
private String movieTitle;
private String tid;
private List<Long> ticketIds;
private Long userAlternateId;
private Long paymentNumber;
private Integer totalAmount;
public PaymentCache(String email, String movieTitle, String tid, List<Long> ticketIds, Long userAlternateId, Long paymentNumber, Integer totalAmount) {
this.email = email;
this.movieTitle = movieTitle;
this.tid = tid;
this.ticketIds = ticketIds;
this.userAlternateId = userAlternateId;
this.paymentNumber = paymentNumber;
this.totalAmount = totalAmount;
}
}

View File

@@ -0,0 +1,10 @@
package com.ticketing.server.global.redis;
import java.util.Optional;
import org.springframework.data.repository.CrudRepository;
public interface PaymentCacheRepository extends CrudRepository<PaymentCache, Long> {
Optional<PaymentCache> findByEmail(String email);
}

View File

@@ -3,10 +3,14 @@ package com.ticketing.server.global.redis;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.cache.RedisCacheConfiguration;
import org.springframework.data.redis.cache.RedisCacheManager;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
import org.springframework.data.redis.serializer.RedisSerializationContext;
import org.springframework.data.redis.serializer.StringRedisSerializer;
import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.transaction.PlatformTransactionManager;
@@ -41,4 +45,21 @@ public class RedisConfig {
return new JpaTransactionManager();
}
@Bean
public RedisCacheManager redisCacheManager() {
RedisCacheConfiguration redisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig()
.serializeKeysWith(
RedisSerializationContext.SerializationPair.fromSerializer(
new StringRedisSerializer()))
.serializeValuesWith(
RedisSerializationContext.SerializationPair.fromSerializer(
new GenericJackson2JsonRedisSerializer()));
return RedisCacheManager.RedisCacheManagerBuilder
.fromConnectionFactory(redisConnectionFactory())
.cacheDefaults(redisCacheConfiguration)
.build();
}
}

View File

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

View File

@@ -1,6 +1,6 @@
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.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
@@ -42,12 +42,12 @@ public class JwtProvider {
this.refreshTokenValidityInMilliseconds = jwtProperties.getRefreshTokenValidityInSeconds() * 1000L;
}
public TokenDto generateTokenDto(Authentication authentication) {
public TokenDTO generateTokenDto(Authentication authentication) {
String accessToken = createAccessToken(authentication);
String refreshToken = createRefreshToken(authentication);
long expiresIn = accessTokenValidityInMilliseconds / 1000L;
return TokenDto.of(accessToken, refreshToken, prefix, expiresIn);
return new TokenDTO(accessToken, refreshToken, prefix, expiresIn);
}
private String createAccessToken(Authentication authentication) {

View File

@@ -3,7 +3,6 @@ package com.ticketing.server.global.security.jwt.handle;
import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.core.AuthenticationException;
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 {
resolver.resolveException(request, response, null, authException);
}
}

View File

@@ -15,7 +15,7 @@ import javax.validation.Payload;
@Documented
public @interface FieldsValueNotMatch {
String message();
String message() default "validation.password.not.change";
String field();

View File

@@ -0,0 +1,22 @@
package com.ticketing.server.global.validator.constraints;
import com.ticketing.server.global.validator.constraintvalidators.NotEmptyCollectionValidator;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
@Target({ElementType.FIELD, ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = NotEmptyCollectionValidator.class)
public @interface NotEmptyCollection {
String message() default "목록이 존재하지 않습니다.";
Class<?>[] groups() default {};
Class<? extends Payload>[] payload() default {};
}

View File

@@ -0,0 +1,20 @@
package com.ticketing.server.global.validator.constraintvalidators;
import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
import java.util.Collection;
import java.util.Objects;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
public class NotEmptyCollectionValidator implements ConstraintValidator<NotEmptyCollection, Collection<Long>> {
@Override
public boolean isValid(Collection<Long> objects, ConstraintValidatorContext context) {
if (objects.isEmpty()) {
return false;
}
return objects.stream().allMatch(Objects::nonNull);
}
}

View File

@@ -1,14 +1,29 @@
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.MovieInfoResponse;
import com.ticketing.server.movie.service.dto.DeletedMovieDTO;
import com.ticketing.server.movie.service.dto.MovieDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
import com.ticketing.server.movie.service.interfaces.MovieService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -19,12 +34,41 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j
public class MovieController {
private final MovieService movieService;
private final MovieService movieService;
@GetMapping()
@ApiOperation(value = "영화 목록 조회")
public ResponseEntity<MovieListResponse> getMovies() {
return ResponseEntity.status(HttpStatus.OK).body(MovieListResponse.from(movieService.getMovies()));
}
@PostMapping()
@ApiOperation(value = "영화 정보 등록")
@Secured(STAFF)
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() {
List<MovieDTO> movieDtos = movieService.getMovies();
return ResponseEntity.status(HttpStatus.OK)
.body(
new MovieListResponse(movieDtos)
);
}
@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()
);
}
}

View File

@@ -0,0 +1,70 @@
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.service.dto.MovieTimeDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
import com.ticketing.server.movie.service.interfaces.MovieTimeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import java.time.LocalDate;
import java.util.List;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.format.annotation.DateTimeFormat;
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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/api/movieTimes")
@Api(value = "MovieTime API", tags = {"Movie Time"})
@RequiredArgsConstructor
@Slf4j
public class MovieTimeController {
private final MovieTimeService movieTimeService;
@PostMapping
@ApiOperation(value = "영화 시간표 등록")
@Secured(STAFF)
public ResponseEntity<MovieTimeInfoResponse> registerMovieTime(
@RequestBody @Valid MovieTimeRegisterRequest movieTimeRegisterRequest) {
RegisteredMovieTimeDTO registeredMovieTimeDto = movieTimeService.registerMovieTime(
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) {
List<MovieTimeDTO> movieTimeDtos = movieTimeService.getMovieTimes(movieId, runningDate);
return ResponseEntity.status(HttpStatus.OK)
.body(
new MovieTimeListResponse(movieTimeDtos)
);
}
}

View File

@@ -1,8 +0,0 @@
package com.ticketing.server.movie.application;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class MovieTimesController {
}

View File

@@ -1,8 +1,56 @@
package com.ticketing.server.movie.application;
import static com.ticketing.server.user.domain.UserGrade.ROLES.USER;
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
import com.ticketing.server.movie.application.response.TicketListResponse;
import com.ticketing.server.movie.service.dto.TicketDTO;
import com.ticketing.server.movie.service.interfaces.TicketService;
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
import io.swagger.annotations.ApiParam;
import java.util.List;
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.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/tickets")
@Validated
public class TicketController {
private final TicketService ticketService;
@GetMapping
@Secured(USER)
public ResponseEntity<TicketListResponse> getTickets(
@ApiParam(value = "영화 시간표 ID", required = true) @RequestParam @NotNull Long movieTimeId) {
List<TicketDTO> tickets = ticketService.getTickets(movieTimeId);
return ResponseEntity.status(HttpStatus.OK)
.body(
new TicketListResponse(tickets)
);
}
@GetMapping("/payments/{paymentId}")
@Secured(USER)
public ResponseEntity<TicketDetailsResponse> findTicketsByPaymentId(
@PathVariable("paymentId") @NotNull Long paymentId) {
List<TicketDetailDTO> tickets = ticketService.findTicketsByPaymentId(paymentId);
return ResponseEntity.status(HttpStatus.OK)
.body(
new TicketDetailsResponse(tickets)
);
}
}

View File

@@ -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;
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -0,0 +1,13 @@
package com.ticketing.server.movie.application.request;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class TicketCancelRequest {
private final List<Long> ticketIds;
}

View File

@@ -0,0 +1,15 @@
package com.ticketing.server.movie.application.request;
import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class TicketReservationRequest {
@NotEmptyCollection
private List<Long> ticketIds;
}

View File

@@ -0,0 +1,19 @@
package com.ticketing.server.movie.application.request;
import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
import java.util.List;
import javax.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class TicketSoldRequest {
@NotNull
private Long paymentId;
@NotEmptyCollection
private List<Long> ticketIds;
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -1,23 +1,16 @@
package com.ticketing.server.movie.application.response;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ticketing.server.movie.service.dto.MovieDto;
import com.ticketing.server.movie.service.dto.MovieDTO;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
@AllArgsConstructor
public class MovieListResponse {
@ApiModelProperty(value = "영화 ")
@JsonProperty
private List<MovieDto> movieDtos;
public static MovieListResponse from(List<MovieDto> movieDtos) {
return new MovieListResponse(movieDtos);
}
@ApiModelProperty(value = "영화 목")
private List<MovieDTO> movieDtos;
}

View File

@@ -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;
}

View File

@@ -0,0 +1,17 @@
package com.ticketing.server.movie.application.response;
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class MovieTimeListResponse {
@ApiModelProperty(value = "영화 시간표 목록")
private List<MovieTimeDTO> movieTimeDtos;
}

View File

@@ -0,0 +1,13 @@
package com.ticketing.server.movie.application.response;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class TicketCancelResponse {
private final List<Long> ticketIds;
}

View File

@@ -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;
}
}

View File

@@ -0,0 +1,16 @@
package com.ticketing.server.movie.application.response;
import com.ticketing.server.movie.service.dto.TicketDTO;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class TicketListResponse {
@ApiModelProperty(value = "티켓 목록")
private List<TicketDTO> ticketDtos;
}

View File

@@ -0,0 +1,25 @@
package com.ticketing.server.movie.application.response;
import com.ticketing.server.movie.service.dto.TicketReservationDTO;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class TicketReservationResponse {
private final String movieTitle;
private final List<TicketReservationDTO> tickets;
public int getTicketQuantity() {
return tickets.size();
}
public int getTotalPrice() {
return tickets.stream()
.mapToInt(TicketReservationDTO::getTicketPrice)
.sum();
}
}

View File

@@ -0,0 +1,15 @@
package com.ticketing.server.movie.application.response;
import com.ticketing.server.movie.service.dto.TicketSoldDTO;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class TicketSoldResponse {
private final Long paymentId;
private final List<TicketSoldDTO> soldDtoList;
}

View File

@@ -1,29 +1,46 @@
package com.ticketing.server.movie.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import com.ticketing.server.movie.service.dto.MovieDto;
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.validation.constraints.NotNull;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Entity
@Getter
@NoArgsConstructor
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
public class Movie extends AbstractEntity {
@NotNull
@Column(unique = true)
private String title;
@NotNull
private String title;
@NotNull
private Integer runningTime;
@NotNull
private Long runningTime;
public MovieDto toDto() {
return new MovieDto(this.title);
}
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);
}
}

View File

@@ -0,0 +1,82 @@
package com.ticketing.server.movie.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.validation.constraints.NotNull;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Entity
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class MovieTime extends AbstractEntity {
@NotNull
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "movie_id", referencedColumnName = "id", updatable = false)
private Movie movie;
@NotNull
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "theater_id", referencedColumnName = "id", updatable = false)
private Theater theater;
@NotNull
private Integer round;
@NotNull
private LocalDateTime startAt;
@NotNull
private LocalDateTime endAt;
@OneToMany(mappedBy = "movieTime", cascade = CascadeType.ALL)
private List<Ticket> tickets = new ArrayList<>();
public MovieTime(Movie movie, Theater theater, int round, LocalDateTime startAt) {
this.movie = movie;
this.theater = theater;
this.round = round;
this.startAt = startAt;
this.endAt = generateEndAt(startAt);
}
MovieTime(Long id, Movie movie, Theater theater, int round, LocalDateTime startAt) {
this.id = id;
this.movie = movie;
this.theater = theater;
this.round = round;
this.startAt = startAt;
this.endAt = generateEndAt(startAt);
}
private LocalDateTime generateEndAt(LocalDateTime startAt) {
Long runningTime = movie.getRunningTime();
return startAt.plusMinutes(runningTime);
}
public String getMovieTitle() {
return this.movie.getTitle();
}
public List<Seat> getSeats() {
return this.theater.getSeats();
}
public MovieTimeDTO toMovieTimeDTO() {
return new MovieTimeDTO(
this.id, this.theater.getTheaterNumber(), this.round, this.startAt, this.endAt);
}
}

View File

@@ -1,38 +0,0 @@
package com.ticketing.server.movie.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import java.time.LocalDate;
import java.time.LocalDateTime;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
import lombok.Getter;
@Entity
@Getter
public class MovieTimes extends AbstractEntity {
@NotNull
@ManyToOne
@JoinColumn(name = "movie_id", referencedColumnName = "id", updatable = false)
private Movie movie;
@NotNull
@ManyToOne
@JoinColumn(name = "theater_id", referencedColumnName = "id", updatable = false)
private Theater theater;
@NotNull
private LocalDate runningDate;
@NotNull
private Integer round;
@NotNull
private LocalDateTime startAt;
@NotNull
private LocalDateTime endAt;
}

View File

@@ -2,17 +2,21 @@ package com.ticketing.server.movie.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Entity
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Seat extends AbstractEntity {
@NotNull
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "theater_id", referencedColumnName = "id", updatable = false)
private Theater theater;
@@ -22,4 +26,26 @@ public class Seat extends AbstractEntity {
@NotNull
private Integer seatRow;
public Seat(Integer seatColumn, Integer seatRow, Theater theater) {
this.seatColumn = seatColumn;
this.seatRow = seatRow;
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) {
this.theater = theater;
theater.addSeat(this);
}
public Integer getTheaterNumber() {
return this.theater.getTheaterNumber();
}
}

View File

@@ -1,21 +1,38 @@
package com.ticketing.server.movie.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.OneToMany;
import javax.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Entity
@Getter
@NoArgsConstructor
@AllArgsConstructor
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Theater extends AbstractEntity {
@NotNull
private Integer theaterNumber;
private Integer seatCount;
@OneToMany(mappedBy = "theater", cascade = CascadeType.ALL)
private List<Seat> seats = new ArrayList<>();
Theater(Long id, Integer theaterNumber) {
this.id = id;
this.theaterNumber = theaterNumber;
}
public Theater(Integer theaterNumber) {
this.theaterNumber = theaterNumber;
}
public void addSeat(Seat seat) {
seats.add(seat);
}
}

View File

@@ -1,35 +1,141 @@
package com.ticketing.server.movie.domain;
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 java.time.temporal.ChronoUnit;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Entity
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Ticket extends AbstractEntity {
@NotNull
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "seat_id", referencedColumnName = "id", updatable = false)
private Seat seat;
@NotNull
@ManyToOne
@JoinColumn(name = "movie_times_id", referencedColumnName = "id", updatable = false)
private MovieTimes movieTimes;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "movie_time_id", referencedColumnName = "id", updatable = false)
private MovieTime movieTime;
@ManyToOne
@JoinColumn(name = "payment_id", referencedColumnName = "id", updatable = false)
private Payment payment;
private Long paymentId;
@NotNull
@Enumerated(EnumType.STRING)
private TicketStatus status;
@NotNull
private Integer ticketPrice;
public Ticket(Seat seat, MovieTime movieTime, Integer ticketPrice) {
this.seat = seat;
this.movieTime = movieTime;
this.ticketPrice = ticketPrice;
this.status = TicketStatus.SALE;
}
Ticket(Long id, Seat seat, MovieTime movieTime, Integer ticketPrice) {
this.id = id;
this.seat = seat;
this.movieTime = movieTime;
this.ticketPrice = ticketPrice;
this.status = TicketStatus.SALE;
}
public Ticket makeReservation() {
if (!TicketStatus.SALE.equals(status)) {
throw ErrorCode.throwDuplicatePayment();
}
status = TicketStatus.RESERVATION;
return this;
}
public Ticket makeSold(Long paymentId) {
if (TicketStatus.SOLD.equals(status)) {
throw ErrorCode.throwDuplicatePayment();
}
status = TicketStatus.SOLD;
this.paymentId = paymentId;
return this;
}
public Ticket cancel() {
if (!TicketStatus.RESERVATION.equals(status)) {
throw ErrorCode.throwBadRequestPaymentCancel();
}
status = TicketStatus.SALE;
paymentId = null;
return this;
}
public Ticket refund(LocalDateTime dateTime) {
long seconds = ChronoUnit.SECONDS.between(dateTime, getStartAt());
if (600L > seconds) {
throw ErrorCode.throwNotRefundableTime();
}
return refund();
}
public Ticket refund() {
if (!TicketStatus.SOLD.equals(status)) {
throw ErrorCode.throwNotRefundableSeat();
}
status = TicketStatus.SALE;
paymentId = null;
return this;
}
public Long getMovieTimeId() {
return movieTime.getId();
}
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;
}
}

View File

@@ -2,14 +2,16 @@ package com.ticketing.server.movie.domain;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@Getter
@AllArgsConstructor
@RequiredArgsConstructor
public enum TicketStatus {
SALE("판매가능"),
SCHEDULED("환불"),
SOLD("판매완료");
private String name;
SALE("판매가능"),
RESERVATION("예약"),
SOLD("판매완료");
private final String name;
}

View File

@@ -1,7 +1,6 @@
package com.ticketing.server.movie.domain.repository;
import com.ticketing.server.movie.domain.Movie;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -13,6 +12,14 @@ public interface MovieRepository extends JpaRepository<Movie, Long> {
Optional<Movie> findByTitle(String title);
Optional<Movie> findByIdAndDeletedAtNull(Long id);
@Query(value = "SELECT m "
+ "FROM Movie m "
+ "WHERE m.title = :title "
+ "AND m.deletedAt IS NULL")
Optional<Movie> findValidMovieWithTitle(String title);
@Query(value = "SELECT * "
+ "FROM movie "
+ "WHERE deleted_at IS NULL", nativeQuery = true)

View File

@@ -0,0 +1,25 @@
package com.ticketing.server.movie.domain.repository;
import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.MovieTime;
import com.ticketing.server.movie.domain.Theater;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
@Repository
public interface MovieTimeRepository extends JpaRepository<MovieTime, Long> {
Optional<MovieTime> findByMovieAndTheaterAndRoundAndDeletedAtNull(Movie movie, Theater theater, Integer round);
@Query(value = "SELECT mt "
+ "FROM MovieTime mt "
+ "JOIN FETCH mt.movie "
+ "WHERE mt.movie = :movie "
+ "AND mt.startAt BETWEEN :startOfDay AND :endOfDay ")
List<MovieTime> findValidMovieTimes(Movie movie, LocalDateTime startOfDay, LocalDateTime endOfDay);
}

View File

@@ -1,10 +0,0 @@
package com.ticketing.server.movie.domain.repository;
import com.ticketing.server.movie.domain.MovieTimes;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface MovieTimesRepository extends JpaRepository<MovieTimes, Long> {
}

View File

@@ -1,10 +1,43 @@
package com.ticketing.server.movie.domain.repository;
import com.ticketing.server.movie.domain.MovieTime;
import com.ticketing.server.movie.domain.Ticket;
import java.util.List;
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;
@Repository
public interface TicketRepository extends JpaRepository<Ticket, Long> {
@Query(
value = "SELECT t "
+ "FROM Ticket t "
+ "JOIN FETCH t.seat s "
+ "WHERE t.movieTime = :movieTime "
+ "AND t.deletedAt IS NULL"
)
List<Ticket> findValidTickets(MovieTime movieTime);
@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);
@Query(
value = "SELECT t "
+ "FROM Ticket t "
+ "JOIN FETCH t.movieTime mt "
+ "JOIN FETCH t.seat s "
+ "JOIN FETCH s.theater th "
+ "WHERE t.id IN (:ticketIds) "
)
List<Ticket> findTicketFetchJoinByTicketIds(@Param("ticketIds") List<Long> ticketIds);
}

View File

@@ -1,11 +1,16 @@
package com.ticketing.server.movie.service;
import com.ticketing.server.global.exception.ErrorCode;
import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.service.dto.MovieDto;
import com.ticketing.server.movie.service.dto.DeletedMovieDTO;
import com.ticketing.server.movie.service.dto.MovieDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
import com.ticketing.server.movie.service.interfaces.MovieService;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import javax.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -15,15 +20,40 @@ import org.springframework.stereotype.Service;
@Slf4j
public class MovieServiceImpl implements MovieService {
private final MovieRepository movieRepository;
private final MovieRepository movieRepository;
public List<MovieDto> getMovies() {
List<Movie> movies = movieRepository.findValidMovies();
@Override
public RegisteredMovieDTO registerMovie(String title, Long runningTime) {
Optional<Movie> movie = movieRepository.findValidMovieWithTitle(title);
return movies.stream()
.map(movie -> movie.toDto())
.collect(Collectors.toList());
if(movie.isEmpty()) {
Movie newMovie = movieRepository.save(
new Movie(title, runningTime)
);
}
return new RegisteredMovieDTO(newMovie);
}
throw ErrorCode.throwDuplicateMovie();
}
@Override
public List<MovieDTO> getMovies() {
List<Movie> movies = movieRepository.findValidMovies();
return movies.stream()
.map(movie -> movie.toMovieDTO())
.collect(Collectors.toList());
}
@Override
@Transactional
public DeletedMovieDTO deleteMovie(Long id) {
Movie movie = movieRepository.findByIdAndDeletedAtNull(id)
.orElseThrow(ErrorCode::throwMovieNotFound);
Movie deletedMovie = movie.delete();
return new DeletedMovieDTO(deletedMovie);
}
}

View File

@@ -0,0 +1,86 @@
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.MovieTime;
import com.ticketing.server.movie.domain.Theater;
import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
import com.ticketing.server.movie.domain.repository.TheaterRepository;
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
import com.ticketing.server.movie.service.dto.MovieTimeRegisterDTO;
import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
import com.ticketing.server.movie.service.interfaces.MovieTimeService;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import javax.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
@Slf4j
public class MovieTimeServiceImpl implements MovieTimeService {
private final MovieRepository movieRepository;
private final TheaterRepository theaterRepository;
private final MovieTimeRepository movieTimeRepository;
@Override
public RegisteredMovieTimeDTO registerMovieTime(@Valid MovieTimeRegisterDTO movieTimeRegisterDto) {
Movie movie = findMovieById(movieTimeRegisterDto.getMovieId());
Theater theater = findTheaterByNumber(movieTimeRegisterDto.getTheaterNumber());
int round = movieTimeRegisterDto.getRound();
Optional<MovieTime> movieTime =
movieTimeRepository.findByMovieAndTheaterAndRoundAndDeletedAtNull(movie, theater, round);
if (movieTime.isEmpty()) {
MovieTime newMovieTime = movieTimeRepository.save(
new MovieTime(movie, theater, round, movieTimeRegisterDto.getStartAt())
);
return new RegisteredMovieTimeDTO(newMovieTime);
}
throw ErrorCode.throwDuplicateMovieTime();
}
@Override
public List<MovieTimeDTO> 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);
return movieTimes.stream()
.map(movieTime -> movieTime.toMovieTimeDTO())
.collect(Collectors.toList());
}
@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;
}
}

View File

@@ -1,9 +0,0 @@
package com.ticketing.server.movie.service;
import com.ticketing.server.movie.service.interfaces.MovieTimesService;
import org.springframework.stereotype.Service;
@Service
public class MovieTimesServiceImpl implements MovieTimesService {
}

View File

@@ -1,9 +0,0 @@
package com.ticketing.server.movie.service;
import com.ticketing.server.movie.service.interfaces.TMDBService;
import org.springframework.stereotype.Service;
@Service
public class TMBDServiceImpl implements TMDBService {
}

View File

@@ -1,9 +1,136 @@
package com.ticketing.server.movie.service;
import com.ticketing.server.global.exception.ErrorCode;
import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
import com.ticketing.server.movie.domain.MovieTime;
import com.ticketing.server.movie.domain.Ticket;
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
import com.ticketing.server.movie.domain.repository.TicketRepository;
import com.ticketing.server.movie.service.dto.TicketDTO;
import com.ticketing.server.movie.service.dto.TicketRefundDTO;
import com.ticketing.server.movie.service.dto.TicketReservationDTO;
import com.ticketing.server.movie.service.dto.TicketSoldDTO;
import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
import com.ticketing.server.movie.service.interfaces.TicketService;
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
import java.util.List;
import java.util.function.UnaryOperator;
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.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@Service
@RequiredArgsConstructor
@Transactional(readOnly = true)
@Validated
@Slf4j
public class TicketServiceImpl implements TicketService {
private final TicketRepository ticketRepository;
private final MovieTimeRepository movieTimeRepository;
@Override
public List<TicketDTO> getTickets(@NotNull Long movieTimeId) {
MovieTime movieTime = movieTimeRepository.findById(movieTimeId)
.orElseThrow(ErrorCode::throwMovieTimeNotFound);
return ticketRepository.findValidTickets(movieTime)
.stream()
.map(TicketDTO::new)
.collect(Collectors.toList());
}
@Override
public List<TicketDetailDTO> findTicketsByPaymentId(@NotNull Long paymentId) {
List<TicketDetailDTO> ticketDetails = ticketRepository.findTicketFetchJoinByPaymentId(paymentId)
.stream()
.map(TicketDetailDTO::new)
.collect(Collectors.toList());
if (ticketDetails.isEmpty()) {
throw ErrorCode.throwPaymentIdNotFound();
}
return ticketDetails;
}
@Override
@Transactional
public TicketsReservationDTO ticketReservation(@NotEmptyCollection List<Long> ticketIds) {
List<Ticket> tickets = getTicketsByInTicketIds(ticketIds);
Long firstMovieTimeId = firstMovieTimeId(tickets);
List<TicketReservationDTO> reservationDtoList = tickets.stream()
.map(Ticket::makeReservation)
.filter(ticket -> firstMovieTimeId.equals(ticket.getMovieTimeId()))
.map(TicketReservationDTO::new)
.collect(Collectors.toList());
if (ticketIds.size() != reservationDtoList.size()) {
throw ErrorCode.throwBadRequestMovieTime();
}
return new TicketsReservationDTO(firstMovieTitle(tickets), reservationDtoList);
}
@Override
@Transactional
public TicketsSoldDTO ticketSold(@NotNull Long paymentId, @NotEmptyCollection List<Long> ticketIds) {
List<Ticket> tickets = getTicketsByInTicketIds(ticketIds);
List<TicketSoldDTO> soldDtoList = tickets.stream()
.map(ticket -> ticket.makeSold(paymentId))
.map(TicketSoldDTO::new)
.collect(Collectors.toList());
return new TicketsSoldDTO(paymentId, soldDtoList);
}
@Override
@Transactional
public TicketsCancelDTO ticketCancel(@NotEmptyCollection List<Long> ticketIds) {
List<Ticket> tickets = getTicketsByInTicketIds(ticketIds);
tickets.forEach(Ticket::cancel);
return new TicketsCancelDTO(tickets);
}
@Override
@Transactional
public List<TicketRefundDTO> ticketsRefund(@NotNull Long paymentId, UnaryOperator<Ticket> refund) {
List<Ticket> tickets = ticketRepository.findTicketFetchJoinByPaymentId(paymentId);
return tickets.stream()
.map(refund)
.map(TicketRefundDTO::new)
.collect(Collectors.toList());
}
private List<Ticket> getTicketsByInTicketIds(List<Long> ticketIds) {
List<Ticket> tickets = ticketRepository.findTicketFetchJoinByTicketIds(ticketIds);
if (tickets.size() != ticketIds.size()) {
throw ErrorCode.throwInvalidTicketId();
}
return tickets;
}
private Long firstMovieTimeId(List<Ticket> tickets) {
Ticket ticket = tickets.get(0);
return ticket.getMovieTimeId();
}
private String firstMovieTitle(List<Ticket> tickets) {
Ticket ticket = tickets.get(0);
return ticket.getMovieTitle();
}
}

View File

@@ -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);
}
}

View File

@@ -1,12 +1,14 @@
package com.ticketing.server.movie.service.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class MovieDto {
public class MovieDTO {
private Long movieId;
@JsonProperty
private String title;
}

View File

@@ -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);
}
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -0,0 +1,33 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.domain.Ticket;
import com.ticketing.server.movie.domain.TicketStatus;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class TicketDTO {
private Long ticketId;
private Integer ticketPrice;
private Integer seatRow;
private Integer seatColumn;
private TicketStatus status;
public TicketDTO(Ticket ticket) {
this(
ticket.getId(),
ticket.getTicketPrice(),
ticket.getRow(),
ticket.getColumn(),
ticket.getStatus()
);
}
}

View File

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

View File

@@ -0,0 +1,19 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.domain.Ticket;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class TicketReservationDTO {
private final Long ticketId;
private final Integer ticketPrice;
public TicketReservationDTO(Ticket ticket) {
this(ticket.getId(), ticket.getTicketPrice());
}
}

View File

@@ -0,0 +1,19 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.domain.Ticket;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class TicketSoldDTO {
private final Long ticketId;
private final Integer ticketPrice;
public TicketSoldDTO(Ticket ticket) {
this(ticket.getId(), ticket.getTicketPrice());
}
}

View File

@@ -0,0 +1,24 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.application.response.TicketCancelResponse;
import com.ticketing.server.movie.domain.Ticket;
import java.util.List;
import java.util.stream.Collectors;
import lombok.Getter;
@Getter
public class TicketsCancelDTO {
private final List<Long> ticketIds;
public TicketsCancelDTO(List<Ticket> tickets) {
ticketIds = tickets.stream()
.map(Ticket::getId)
.collect(Collectors.toList());
}
public TicketCancelResponse toResponse() {
return new TicketCancelResponse(ticketIds);
}
}

View File

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

View File

@@ -0,0 +1,19 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.application.response.TicketReservationResponse;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class TicketsReservationDTO {
private final String movieTitle;
private final List<TicketReservationDTO> ticketReservationDtoList;
public TicketReservationResponse toResponse() {
return new TicketReservationResponse(movieTitle, ticketReservationDtoList);
}
}

View File

@@ -0,0 +1,19 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.application.response.TicketSoldResponse;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class TicketsSoldDTO {
private final Long paymentId;
private final List<TicketSoldDTO> soldDtoList;
public TicketSoldResponse toResponse() {
return new TicketSoldResponse(paymentId, soldDtoList);
}
}

View File

@@ -1,10 +1,15 @@
package com.ticketing.server.movie.service.interfaces;
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.RegisteredMovieDTO;
import java.util.List;
public interface MovieService {
List<MovieDto> getMovies();
RegisteredMovieDTO registerMovie(String title, Long runningTime);
List<MovieDTO> getMovies();
DeletedMovieDTO deleteMovie(Long id);
}

View File

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

View File

@@ -1,5 +0,0 @@
package com.ticketing.server.movie.service.interfaces;
public interface MovieTimesService {
}

View File

@@ -1,5 +0,0 @@
package com.ticketing.server.movie.service.interfaces;
public interface TMDBService {
}

View File

@@ -1,5 +1,29 @@
package com.ticketing.server.movie.service.interfaces;
import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
import com.ticketing.server.movie.domain.Ticket;
import com.ticketing.server.movie.service.dto.TicketDTO;
import com.ticketing.server.movie.service.dto.TicketRefundDTO;
import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
import java.util.List;
import java.util.function.UnaryOperator;
import javax.validation.constraints.NotNull;
public interface TicketService {
List<TicketDTO> getTickets(@NotNull Long movieTimeId);
List<TicketDetailDTO> findTicketsByPaymentId(@NotNull Long paymentId);
TicketsReservationDTO ticketReservation(@NotEmptyCollection List<Long> ticketIds);
TicketsSoldDTO ticketSold(@NotNull Long paymentId, @NotEmptyCollection List<Long> ticketIds);
TicketsCancelDTO ticketCancel(@NotEmptyCollection List<Long> ticketIds);
List<TicketRefundDTO> ticketsRefund(@NotNull Long paymentId, UnaryOperator<Ticket> refund);
}

View File

@@ -0,0 +1,20 @@
package com.ticketing.server.movie.setup;
import javax.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Profile;
import org.springframework.web.bind.annotation.RestController;
@Profile(value = {"local"})
@RestController
@RequiredArgsConstructor
public class MovieSetupController {
private final MovieSetupService movieSetupService;
@PostConstruct
public void setup() {
movieSetupService.init();
}
}

View File

@@ -0,0 +1,140 @@
package com.ticketing.server.movie.setup;
import com.ticketing.server.global.redis.PaymentCache;
import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.MovieTime;
import com.ticketing.server.movie.domain.Seat;
import com.ticketing.server.movie.domain.Theater;
import com.ticketing.server.movie.domain.Ticket;
import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
import com.ticketing.server.movie.domain.repository.TheaterRepository;
import com.ticketing.server.movie.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.user.domain.User;
import com.ticketing.server.user.domain.UserGrade;
import com.ticketing.server.user.domain.repository.UserRepository;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
@RequiredArgsConstructor
public class
MovieSetupService {
private final UserRepository userRepository;
private final MovieRepository movieRepository;
private final MovieTimeRepository movieTimeRepository;
private final TheaterRepository theaterRepository;
private final TicketRepository ticketRepository;
private final PaymentRepository paymentRepository;
private final PasswordEncoder passwordEncoder;
@Transactional
public void init() {
initMovie();
initTheater();
initMovieTime();
initTicket();
// initPayment();
}
private void initMovie() {
List<Movie> movies = Arrays.asList(
new Movie("탑건: 매버릭", 130L),
new Movie("헤어질 결심", 138L),
new Movie("마녀2", 137L),
new Movie("범죄도시2", 106L),
new Movie("버즈 라이트이어", 105L)
);
movieRepository.saveAll(movies);
}
private void initTheater() {
List<Theater> theaters = Arrays.asList(
new Theater(1),
new Theater(2)
);
for (Theater theater : theaters) {
for (int col = 1; col <= 2; col++) {
for (int row = 1; row <= 10; row++) {
new Seat(col, row, theater);
}
}
}
theaterRepository.saveAll(theaters);
}
private void initMovieTime() {
List<Movie> movies = movieRepository.findAll();
List<Theater> theaters = theaterRepository.findAll();
LocalDateTime now = LocalDateTime.now();
List<MovieTime> movieTimes = new ArrayList<>();
for (Theater theater : theaters) {
movieTimes.add(new MovieTime(movies.get(0), theater, 1, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 8, 0)));
movieTimes.add(new MovieTime(movies.get(0), theater, 3, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 12, 0)));
movieTimes.add(new MovieTime(movies.get(1), theater, 2, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 10, 0)));
movieTimes.add(new MovieTime(movies.get(2), theater, 4, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 14, 0)));
movieTimes.add(new MovieTime(movies.get(0), theater, 5, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 16, 0)));
movieTimes.add(new MovieTime(movies.get(3), theater, 6, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 18, 0)));
movieTimes.add(new MovieTime(movies.get(0), theater, 7, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 21, 0)));
movieTimes.add(new MovieTime(movies.get(4), theater, 8, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 23, 0)));
}
movieTimeRepository.saveAll(movieTimes);
}
private void initTicket() {
List<MovieTime> movieTimes = movieTimeRepository.findAll();
List<Ticket> tickets = new ArrayList<>();
Integer ticketPrice = 15_000;
for (MovieTime movieTime : movieTimes) {
for (Seat seat : movieTime.getSeats()) {
tickets.add(new Ticket(seat, movieTime, ticketPrice));
}
}
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();
PaymentCache paymentCache = new PaymentCache(
user.getEmail(),
title,
"T2d03c9130bf237a9700",
List.of(1L, 2L),
user.getAlternateId(),
124124231513245L,
30_000
);
Payment payment = new Payment(paymentCache, PaymentType.KAKAO_PAY, PaymentStatus.SOLD, 30_000);
paymentRepository.save(payment);
ticket.registerPayment(payment.getId());
tickets.get(1).registerPayment(payment.getId());
}
}

View File

@@ -0,0 +1,20 @@
package com.ticketing.server.payment.api;
import feign.Logger;
import feign.Logger.Level;
import feign.codec.Encoder;
import org.springframework.context.annotation.Bean;
public class CoreFeignConfiguration {
@Bean
Logger.Level feignLoggerLevel() {
return Level.FULL;
}
@Bean
Encoder formEncoder() {
return new feign.form.FormEncoder();
}
}

View File

@@ -0,0 +1,32 @@
package com.ticketing.server.payment.api;
import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE;
import com.ticketing.server.payment.api.dto.requset.KakaoPayApproveRequest;
import com.ticketing.server.payment.api.dto.requset.KakaoPayCancelRequest;
import com.ticketing.server.payment.api.dto.requset.KakaoPayReadyRequest;
import com.ticketing.server.payment.api.dto.response.KakaoPayApproveResponse;
import com.ticketing.server.payment.api.dto.response.KakaoPayCancelResponse;
import com.ticketing.server.payment.api.dto.response.KakaoPayReadyResponse;
import feign.Headers;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestHeader;
@FeignClient(name = "kakaoPay", url = "https://kapi.kakao.com/v1", path = "/payment",
configuration = CoreFeignConfiguration.class)
public interface KakaoPayClient {
@PostMapping(value = "/ready", consumes = APPLICATION_FORM_URLENCODED_VALUE)
@Headers("Content-Type: application/x-www-form-urlencoded;charset=utf-8")
KakaoPayReadyResponse ready(@RequestHeader(value = "Authorization") String authorization, KakaoPayReadyRequest request);
@PostMapping(value = "/approve", consumes = APPLICATION_FORM_URLENCODED_VALUE)
@Headers("Content-Type: application/x-www-form-urlencoded;charset=utf-8")
KakaoPayApproveResponse approve(@RequestHeader(value = "Authorization") String authorization, KakaoPayApproveRequest request);
@PostMapping(value = "/cancel", consumes = APPLICATION_FORM_URLENCODED_VALUE)
@Headers("Content-Type: application/x-www-form-urlencoded;charset=utf-8")
KakaoPayCancelResponse cancel(@RequestHeader(value = "Authorization") String authorization, KakaoPayCancelRequest request);
}

View File

@@ -0,0 +1,40 @@
package com.ticketing.server.payment.api;
import com.ticketing.server.global.factory.YamlPropertySourceFactory;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConstructorBinding;
import org.springframework.context.annotation.PropertySource;
@Getter
@RequiredArgsConstructor
@ConstructorBinding
@ConfigurationProperties(value = "api.kakao.pay")
@PropertySource(value = "classpath:application.yml", factory = YamlPropertySourceFactory.class)
public class KakaoPayProperties {
private final String url;
private final String approval;
private final String cancel;
private final String fail;
private final String prefix;
private final String key;
public String getApprovalUrl() {
return url + approval;
}
public String getCancelUrl() {
return url + cancel;
}
public String getFailUrl() {
return url + fail;
}
public String getAuthorization() {
return prefix + " " + key;
}
}

View File

@@ -0,0 +1,28 @@
package com.ticketing.server.payment.api;
import com.ticketing.server.movie.application.request.TicketCancelRequest;
import com.ticketing.server.movie.application.request.TicketReservationRequest;
import com.ticketing.server.movie.application.request.TicketSoldRequest;
import com.ticketing.server.movie.application.response.TicketCancelResponse;
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
import com.ticketing.server.movie.application.response.TicketReservationResponse;
import com.ticketing.server.movie.application.response.TicketSoldResponse;
import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
import com.ticketing.server.payment.api.impl.TicketsRefundRequest;
import java.time.LocalDateTime;
import javax.validation.constraints.NotNull;
public interface MovieClient {
TicketDetailsResponse getTicketsByPaymentId(@NotNull Long paymentId);
TicketReservationResponse ticketReservation(@NotNull TicketReservationRequest request);
TicketSoldResponse ticketSold(@NotNull TicketSoldRequest request);
TicketCancelResponse ticketCancel(@NotNull TicketCancelRequest request);
TicketsRefundResponse ticketRefundByDateTime(TicketsRefundRequest request, LocalDateTime dateTime);
TicketsRefundResponse ticketRefund(TicketsRefundRequest request);
}

View File

@@ -0,0 +1,8 @@
package com.ticketing.server.payment.api;
import com.ticketing.server.payment.api.dto.response.UserDetailResponse;
public interface UserClient {
UserDetailResponse detail();
}

View File

@@ -0,0 +1,12 @@
package com.ticketing.server.payment.api.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
@JsonNaming(value = PropertyNamingStrategies.SnakeCaseStrategy.class)
@JsonInclude(Include.NON_NULL)
public class SnakeCaseStrategy {
}

View File

@@ -0,0 +1,50 @@
package com.ticketing.server.payment.api.dto.requset;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import javax.validation.constraints.NotEmpty;
import lombok.Getter;
@Getter
@JsonInclude(Include.NON_NULL)
public class KakaoPayApproveRequest {
// 가맹점 코드 현재는 테스트 값
@NotEmpty
private String cid = "TC0ONETIME";
@feign.form.FormProperty("cid_secret")
private String cidSecret;
// 결제 고유 번호 ready res 에 포함
@NotEmpty
private String tid;
// 주문번호 - 결제 예매번호?
@NotEmpty
@feign.form.FormProperty("partner_order_id")
private String partnerOrderId;
// 가맹점 회원 id - user 대체 ID
@NotEmpty
@feign.form.FormProperty("partner_user_id")
private String partnerUserId;
// 결제승인 요청 인증 토큰
@NotEmpty
@feign.form.FormProperty("pg_token")
private String pgToken;
private String payload;
@feign.form.FormProperty("total_amount")
private Integer totalAmount;
public KakaoPayApproveRequest(String tid, String partnerOrderId, String partnerUserId, String pgToken) {
this.tid = tid;
this.partnerOrderId = partnerOrderId;
this.partnerUserId = partnerUserId;
this.pgToken = pgToken;
}
}

View File

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

View File

@@ -0,0 +1,92 @@
package com.ticketing.server.payment.api.dto.requset;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Getter
@NoArgsConstructor
@AllArgsConstructor
@JsonInclude(Include.NON_NULL)
public class KakaoPayReadyRequest {
// 가맹점 코드
@NotEmpty
private String cid = "TC0ONETIME";
// 가맹점 코드 인증키
@feign.form.FormProperty("cid_secret")
private String cidSecret;
// 가맹점 주문번호 - 결제 예매번호?
@NotEmpty
@feign.form.FormProperty("partner_order_id")
private String partnerOrderId;
// 가맹점 회원 id - user 대체 ID
@NotEmpty
@feign.form.FormProperty("partner_user_id")
private String partnerUserId;
// 상품명 - 영화제목
@NotEmpty
@feign.form.FormProperty("item_name")
private String itemName;
// 상품코드
@feign.form.FormProperty("item_code")
private String itemCode;
// 상품수량 - 티켓 수량
@NotNull
private Integer quantity;
// 상품 총액 - 티켓 금액 합계
@NotNull
@feign.form.FormProperty("total_amount")
private Integer totalAmount;
// 상품 비과세 - 0원으로 일단 일괄처리
@NotNull
@feign.form.FormProperty("tax_free_amount")
private Integer taxFreeAmount = 0;
// 상품 부가세 금액
@feign.form.FormProperty("vat_amount")
private Integer vatAmount;
// 컵 보증금
@feign.form.FormProperty("green_deposit")
private Integer greenDeposit;
// 결제 성공 시 redirect URL - json 반환 용 URL ?
@NotNull
@feign.form.FormProperty("approval_url")
private String approvalUrl;
// 결제 취소 시 redirect URL
@NotNull
@feign.form.FormProperty("cancel_url")
private String cancelUrl;
// 결제 실패 시 redirect URL
@NotNull
@feign.form.FormProperty("fail_url")
private String failUrl;
public KakaoPayReadyRequest(String partnerOrderId, String partnerUserId, String itemName, Integer quantity,
Integer totalAmount, String approvalUrl, String cancelUrl, String failUrl) {
this.partnerOrderId = partnerOrderId;
this.partnerUserId = partnerUserId;
this.itemName = itemName;
this.quantity = quantity;
this.totalAmount = totalAmount;
this.approvalUrl = approvalUrl;
this.cancelUrl = cancelUrl;
this.failUrl = failUrl;
}
}

View File

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

Some files were not shown because too many files have changed in this diff Show More