Compare commits
16 Commits
feature/pa
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
220d43f5fd | ||
|
|
fd5b443d48 | ||
|
|
975e03b7bd | ||
|
|
657c9e7f7d | ||
|
|
c5b779fda7 | ||
|
|
b7057cfc73 | ||
|
|
42a00d20d0 | ||
|
|
b3842d93b4 | ||
|
|
58bed5565f | ||
|
|
28874b1b1c | ||
|
|
656e5e25e8 | ||
|
|
f1382597de | ||
|
|
a2cfd7ab15 | ||
|
|
61f6636653 | ||
|
|
a1579cfe13 | ||
|
|
c760d66cf6 |
@@ -91,7 +91,7 @@ erDiagram
|
||||
bigint seat_id FK "좌석 ID"
|
||||
bigint movie_time_id FK "상영시간표 ID"
|
||||
bigint payment_id "결제 ID"
|
||||
varchar status "상태 - 구매가능/예약진행중/판매완료"
|
||||
varchar status "상태 - 판매가능/예약/"
|
||||
int ticket_price "가격"
|
||||
datetime deleted_at "삭제일시"
|
||||
datetime created_at "등록일시"
|
||||
@@ -101,10 +101,11 @@ erDiagram
|
||||
PAYMENT {
|
||||
bigint id PK "결제 ID"
|
||||
bigint user_alternate_id "유저 대체ID"
|
||||
varchar tid "카카오페이 결제고유번호"
|
||||
varchar movie_title "영화제목"
|
||||
varchar type "결제 타입 - 예) 네이버페이, 카카오페이"
|
||||
varchar status "상태 - 완료/환불/실패"
|
||||
varchar failed_message "실패사유 - 컬럼명을 알아보기 쉬운가?"
|
||||
varchar status "상태 - 완료/환불"
|
||||
varchar failed_message "실패사유"
|
||||
varchar payment_number "예매번호"
|
||||
int total_price "결제 금액"
|
||||
datetime deleted_at "삭제일시"
|
||||
|
||||
1
server/.gitignore
vendored
1
server/.gitignore
vendored
@@ -6,6 +6,7 @@
|
||||
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
||||
|
||||
HELP.md
|
||||
bin/**
|
||||
|
||||
# User-specific stuff
|
||||
.idea/**/workspace.xml
|
||||
|
||||
12
server/Dockerfile
Normal file
12
server/Dockerfile
Normal 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"]
|
||||
@@ -23,6 +23,8 @@ repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
extra["springCloudVersion"] = "2021.0.3"
|
||||
|
||||
dependencies {
|
||||
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
|
||||
implementation("org.springframework.boot:spring-boot-starter-security")
|
||||
@@ -39,6 +41,10 @@ dependencies {
|
||||
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")
|
||||
implementation("io.micrometer:micrometer-core")
|
||||
implementation("io.micrometer:micrometer-registry-prometheus")
|
||||
|
||||
modules {
|
||||
module("org.springframework.boot:spring-boot-starter-logging") {
|
||||
@@ -58,6 +64,12 @@ dependencies {
|
||||
testImplementation("org.springframework.security:spring-security-test")
|
||||
}
|
||||
|
||||
dependencyManagement {
|
||||
imports {
|
||||
mavenBom("org.springframework.cloud:spring-cloud-dependencies:${property("springCloudVersion")}")
|
||||
}
|
||||
}
|
||||
|
||||
tasks.withType<Test> {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
package com.ticketing.server.movie.aop;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.assertAll;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
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;
|
||||
|
||||
@SpringBootTest
|
||||
class TicketLockAspectTest {
|
||||
|
||||
@Autowired
|
||||
private TicketLockAspect ticketLockAspect;
|
||||
|
||||
@Test
|
||||
@DisplayName("티켓 lock 동시성 체크")
|
||||
@SuppressWarnings({"java:S5960"})
|
||||
void ticketMultiThread() throws InterruptedException {
|
||||
// given
|
||||
ExecutorService executorService = Executors.newFixedThreadPool(2);
|
||||
CountDownLatch latch = new CountDownLatch(2);
|
||||
|
||||
List<String> lockIds = List.of("TicketLock:1", "TicketLock:2", "TicketLock:3");
|
||||
AtomicBoolean result1 = new AtomicBoolean(Boolean.TRUE);
|
||||
AtomicBoolean result2 = new AtomicBoolean(Boolean.TRUE);
|
||||
|
||||
// when
|
||||
executorService.execute(() -> {
|
||||
result1.set(ticketLockAspect.isEveryTicketIdLock(lockIds));
|
||||
latch.countDown();
|
||||
});
|
||||
|
||||
executorService.execute(() -> {
|
||||
result2.set(ticketLockAspect.isEveryTicketIdLock(List.of("TicketLock:1")));
|
||||
latch.countDown();
|
||||
});
|
||||
|
||||
latch.await();
|
||||
|
||||
// then
|
||||
Long unlockCount = ticketLockAspect.ticketIdsUnlock(lockIds);
|
||||
|
||||
assertAll(
|
||||
() -> assertThat(result1).isNotEqualTo(result2),
|
||||
() -> assertThat(unlockCount > 0).isTrue()
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,202 @@
|
||||
package com.ticketing.server.movie.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.result.MockMvcResultMatchers.content;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.ticketing.server.global.config.WithAuthUser;
|
||||
import com.ticketing.server.movie.application.request.MovieDeleteRequest;
|
||||
import com.ticketing.server.movie.application.request.MovieRegisterRequest;
|
||||
import com.ticketing.server.user.domain.UserGrade.ROLES;
|
||||
import org.json.simple.JSONObject;
|
||||
import org.json.simple.JSONArray;
|
||||
import org.json.simple.parser.JSONParser;
|
||||
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.http.MediaType;
|
||||
import org.springframework.test.web.servlet.MockMvc;
|
||||
import org.springframework.test.web.servlet.MvcResult;
|
||||
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
|
||||
@Transactional
|
||||
public class MovieControllerTest {
|
||||
|
||||
@Autowired
|
||||
ObjectMapper mapper;
|
||||
|
||||
@Autowired
|
||||
WebApplicationContext context;
|
||||
|
||||
MockMvc mvc;
|
||||
|
||||
JSONParser jsonParser = new JSONParser();
|
||||
|
||||
private static final String MOVIES_URL = "/api/movies";
|
||||
|
||||
private static final Long RUNNING_TIME = 100L;
|
||||
private static final String MOVIE_TITLE = "등록할 영화";
|
||||
|
||||
private static final String TITLE = "$.title";
|
||||
private static final String MOVIE_DTOS = "$.movieDtos";
|
||||
|
||||
@BeforeEach
|
||||
void init() {
|
||||
mvc = MockMvcBuilders
|
||||
.webAppContextSetup(context)
|
||||
.apply(springSecurity())
|
||||
.build();
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("영화 등록 성공")
|
||||
@WithAuthUser(email = "staff@ticketing.com", role = ROLES.STAFF)
|
||||
void movieRegisterSuccess() throws Exception {
|
||||
|
||||
MovieRegisterRequest request = new MovieRegisterRequest(MOVIE_TITLE, RUNNING_TIME);
|
||||
|
||||
ResultActions resultActions = mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(request))
|
||||
.contentType(MediaType.APPLICATION_JSON));
|
||||
|
||||
resultActions
|
||||
.andExpect(status().isOk())
|
||||
.andExpect(content().contentType(APPLICATION_JSON))
|
||||
.andExpect(jsonPath(TITLE).value(MOVIE_TITLE));
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("영화 등록 실패 - 권한 부족")
|
||||
@WithAuthUser(email = "user@ticketing.com", role = ROLES.USER)
|
||||
void movieRegisterFailWithLowAuthority() throws Exception {
|
||||
|
||||
MovieRegisterRequest request = new MovieRegisterRequest(MOVIE_TITLE, RUNNING_TIME);
|
||||
|
||||
ResultActions resultActions = mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(request))
|
||||
.contentType(APPLICATION_JSON));
|
||||
|
||||
resultActions.andExpect(status().isForbidden());
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("영화 등록 실패 - 인자값 검증 실패")
|
||||
@WithAuthUser(email = "staff@ticketing.com", role = ROLES.ADMIN)
|
||||
void movieRegisterFailWithWrongParameter() throws Exception {
|
||||
|
||||
MovieRegisterRequest requestWithNullRunningTime = new MovieRegisterRequest(MOVIE_TITLE, null);
|
||||
|
||||
// 1. 상영 시간 null
|
||||
ResultActions resultActions = mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(requestWithNullRunningTime))
|
||||
.contentType(APPLICATION_JSON));
|
||||
|
||||
resultActions.andExpect(status().isBadRequest());
|
||||
|
||||
// 2. 영화 제목 null
|
||||
MovieRegisterRequest requestWithNullTitle = new MovieRegisterRequest(null, RUNNING_TIME);
|
||||
|
||||
resultActions = mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(requestWithNullTitle))
|
||||
.contentType(APPLICATION_JSON));
|
||||
|
||||
resultActions.andExpect(status().isBadRequest());
|
||||
|
||||
// 3. 영화 제목 ""
|
||||
MovieRegisterRequest requestWithoutTitle = new MovieRegisterRequest("", RUNNING_TIME);
|
||||
|
||||
resultActions = mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(requestWithoutTitle))
|
||||
.contentType(APPLICATION_JSON));
|
||||
|
||||
resultActions.andExpect(status().isBadRequest());
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("영화 등록 실패 - 같은 영화 중복 등록")
|
||||
@WithAuthUser(email = "staff@ticketing.com", role = ROLES.ADMIN)
|
||||
void movieRegisterFailWithSameMovie() throws Exception {
|
||||
|
||||
// given
|
||||
MovieRegisterRequest request = new MovieRegisterRequest(MOVIE_TITLE, RUNNING_TIME);
|
||||
|
||||
mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(request))
|
||||
.contentType(APPLICATION_JSON))
|
||||
.andExpect(status().isOk());
|
||||
|
||||
// when
|
||||
ResultActions resultActions = mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(request))
|
||||
.contentType(APPLICATION_JSON));
|
||||
|
||||
// then
|
||||
resultActions.andExpect(status().isConflict());
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@DisplayName("영화 삭제 성공")
|
||||
@WithAuthUser(email = "staff@ticketing.com", role = ROLES.ADMIN)
|
||||
void movieDeleteSuccess() throws Exception {
|
||||
|
||||
// given
|
||||
MovieRegisterRequest request = new MovieRegisterRequest(MOVIE_TITLE, RUNNING_TIME);
|
||||
|
||||
mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(request))
|
||||
.contentType(APPLICATION_JSON))
|
||||
.andExpect(status().isOk());
|
||||
|
||||
// when
|
||||
// 1. 영화 조회 - 삭제할 영화 ID 뽑기
|
||||
ResultActions resultActions = mvc.perform(get(MOVIES_URL)
|
||||
.contentType(APPLICATION_JSON));
|
||||
resultActions
|
||||
.andDo(print())
|
||||
.andExpect(status().isOk())
|
||||
.andExpect(jsonPath(MOVIE_DTOS).isNotEmpty());
|
||||
|
||||
MvcResult result = resultActions.andReturn();
|
||||
Object obj = jsonParser.parse(result.getResponse().getContentAsString());
|
||||
JSONObject jsonObject = (JSONObject) obj;
|
||||
|
||||
Object object = jsonObject.get("movieDtos");
|
||||
JSONArray jsonArray = (JSONArray) object;
|
||||
JSONObject jsonObj = (JSONObject) jsonArray.get(0);
|
||||
|
||||
Long movieId = (Long) jsonObj.get("movieId");
|
||||
|
||||
// 2. 영화 삭제 - 해당 ID
|
||||
MovieDeleteRequest movieDeleteRequest = new MovieDeleteRequest(movieId);
|
||||
|
||||
mvc.perform(delete(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(movieDeleteRequest))
|
||||
.contentType(APPLICATION_JSON))
|
||||
.andExpect(status().isOk());
|
||||
|
||||
// then - 삭제한 영화랑 같은 제목의 영화 등록이 성공하는지 확인
|
||||
mvc.perform(post(MOVIES_URL)
|
||||
.content(mapper.writeValueAsString(request))
|
||||
.contentType(APPLICATION_JSON))
|
||||
.andExpect(status().isOk());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.ticketing.server.user.application;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.assertAll;
|
||||
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
|
||||
@@ -9,8 +11,11 @@ import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.ticketing.server.global.redis.RefreshRedisRepository;
|
||||
import com.ticketing.server.user.application.request.LoginRequest;
|
||||
import com.ticketing.server.user.application.request.RefreshRequest;
|
||||
import com.ticketing.server.user.application.request.SignUpRequest;
|
||||
import com.ticketing.server.user.application.response.TokenResponse;
|
||||
import com.ticketing.server.user.service.interfaces.UserService;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
@@ -30,8 +35,12 @@ import org.springframework.web.context.WebApplicationContext;
|
||||
class AuthControllerTest {
|
||||
|
||||
private static final String LOGIN_URL = "/api/auth/token";
|
||||
private static final String REFRESH_URL = "/api/auth/refresh";
|
||||
private static final String LOGOUT_URL = "/api/auth/logout";
|
||||
private static final String REGISTER_URL = "/api/users";
|
||||
|
||||
private static final String USER_EMAIL = "ticketing@gmail.com";
|
||||
private static final String USER_PW = "qwe123";
|
||||
|
||||
@Autowired
|
||||
WebApplicationContext context;
|
||||
@@ -54,7 +63,7 @@ class AuthControllerTest {
|
||||
@DisplayName("로그인 인증 성공")
|
||||
void loginSuccess() throws Exception {
|
||||
// given
|
||||
LoginRequest request = new LoginRequest(USER_EMAIL, "qwe123");
|
||||
LoginRequest request = new LoginRequest(USER_EMAIL, USER_PW);
|
||||
|
||||
// when
|
||||
ResultActions actions = mvc.perform(post(LOGIN_URL)
|
||||
@@ -82,6 +91,69 @@ class AuthControllerTest {
|
||||
.andExpect(status().isUnauthorized());
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("리프레쉬 토큰 발급 성공")
|
||||
void refreshTokenSuccess() throws Exception {
|
||||
// given
|
||||
LoginRequest loginRequest = new LoginRequest(USER_EMAIL, USER_PW);
|
||||
|
||||
// when
|
||||
// 로그인
|
||||
String loginResponseBody = mvc.perform(post(LOGIN_URL)
|
||||
.content(asJsonString(loginRequest))
|
||||
.contentType(MediaType.APPLICATION_JSON))
|
||||
.andReturn()
|
||||
.getResponse()
|
||||
.getContentAsString();
|
||||
|
||||
TokenResponse loginResponse = objectMapper.readValue(loginResponseBody, TokenResponse.class);
|
||||
RefreshRequest refreshRequest = new RefreshRequest(loginResponse.getRefreshToken());
|
||||
|
||||
// 토큰재발급
|
||||
String refreshResponseBody = mvc.perform(post(REFRESH_URL)
|
||||
.content(asJsonString(refreshRequest))
|
||||
.contentType(MediaType.APPLICATION_JSON))
|
||||
.andReturn()
|
||||
.getResponse()
|
||||
.getContentAsString();
|
||||
|
||||
TokenResponse refreshBody = objectMapper.readValue(refreshResponseBody, TokenResponse.class);
|
||||
|
||||
// then
|
||||
assertAll(
|
||||
() -> assertThat(refreshBody.getAccessToken()).isNotEmpty(),
|
||||
() -> assertThat(refreshBody.getRefreshToken()).isNotEmpty(),
|
||||
() -> assertThat(loginResponse.getTokenType()).isEqualTo(refreshBody.getTokenType()),
|
||||
() -> assertThat(loginResponse.getExpiresIn()).isEqualTo(refreshBody.getExpiresIn())
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisplayName("로그아웃 성공")
|
||||
void logoutSuccess() throws Exception {
|
||||
// given
|
||||
LoginRequest loginRequest = new LoginRequest(USER_EMAIL, USER_PW);
|
||||
|
||||
// 로그인
|
||||
String loginResponseBody = mvc.perform(post(LOGIN_URL)
|
||||
.content(asJsonString(loginRequest))
|
||||
.contentType(MediaType.APPLICATION_JSON))
|
||||
.andReturn()
|
||||
.getResponse()
|
||||
.getContentAsString();
|
||||
|
||||
TokenResponse loginResponse = objectMapper.readValue(loginResponseBody, TokenResponse.class);
|
||||
String authorization = loginResponse.getTokenType() + " " + loginResponse.getAccessToken();
|
||||
|
||||
// 로그아웃
|
||||
ResultActions actions = mvc.perform(post(LOGOUT_URL)
|
||||
.header("Authorization", authorization));
|
||||
|
||||
// then
|
||||
actions.andDo(print())
|
||||
.andExpect(status().isOk());
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
void init() throws Exception {
|
||||
mvc = MockMvcBuilders
|
||||
@@ -89,7 +161,7 @@ class AuthControllerTest {
|
||||
.apply(springSecurity())
|
||||
.build();
|
||||
|
||||
SignUpRequest signUpRequest = new SignUpRequest("ticketing", USER_EMAIL, "qwe123", "010-1234-5678");
|
||||
SignUpRequest signUpRequest = new SignUpRequest("ticketing", USER_EMAIL, USER_PW, "010-1234-5678");
|
||||
|
||||
mvc.perform(post(REGISTER_URL)
|
||||
.content(asJsonString(signUpRequest))
|
||||
@@ -102,6 +174,7 @@ class AuthControllerTest {
|
||||
}
|
||||
|
||||
private String asJsonString(Object object) throws JsonProcessingException {
|
||||
|
||||
return objectMapper.writeValueAsString(object);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,241 @@
|
||||
package com.ticketing.server.user.application;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -20,6 +20,9 @@ spring:
|
||||
pathmatch:
|
||||
matching-strategy: ant_path_matcher
|
||||
|
||||
config:
|
||||
import: "optional:configserver:"
|
||||
|
||||
jasypt:
|
||||
encryptor:
|
||||
bean: jasyptStringEncryptor
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.ticketing.server.user.domain;
|
||||
package com.ticketing.server.global.dto;
|
||||
|
||||
public interface SequenceGenerator {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.ticketing.server.user.domain;
|
||||
package com.ticketing.server.global.dto;
|
||||
|
||||
import java.net.NetworkInterface;
|
||||
import java.security.SecureRandom;
|
||||
@@ -18,6 +18,16 @@ public enum ErrorCode {
|
||||
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, "취소할 티켓이 존재하지 않습니다."),
|
||||
BAD_REQUEST_TICKET_RESERVATION(BAD_REQUEST, "이미 다른 고객이 예약 진행 중인 좌석이 존재합니다."),
|
||||
BAD_REQUEST_TICKET_SOLD(BAD_REQUEST, "이미 환불 진행 중 입니다."),
|
||||
NOT_REFUNDABLE_TIME(BAD_REQUEST, "환불이 가능한 시간이 지났습니다."),
|
||||
NOT_REFUNDABLE_SEAT(BAD_REQUEST, "환불할 수 있는 좌석이 아닙니다."),
|
||||
EMPTY_TICKET_ID(BAD_REQUEST, "티켓 정보가 존재하지 않습니다."),
|
||||
|
||||
/* 403 FORBIDDEN : 접근 권한 제한 */
|
||||
VALID_USER_ID(FORBIDDEN, "해당 정보에 접근 권한이 존재하지 않습니다."),
|
||||
@@ -26,6 +36,7 @@ public enum ErrorCode {
|
||||
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, "상영관 정보를 찾을 수 없습니다."),
|
||||
@@ -58,15 +69,20 @@ public enum ErrorCode {
|
||||
throw new TicketingException(UNABLE_CHANGE_GRADE);
|
||||
}
|
||||
|
||||
public static TicketingException throwBadRequestPaymentComplete() {
|
||||
throw new TicketingException(BAD_REQUEST_PAYMENT_COMPLETE);
|
||||
}
|
||||
|
||||
public static TicketingException throwBadRequestPaymentReady() {
|
||||
throw new TicketingException(BAD_REQUEST_PAYMENT_READY);
|
||||
}
|
||||
|
||||
/* 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);
|
||||
@@ -113,4 +129,5 @@ public enum ErrorCode {
|
||||
throw new TicketingException(DELETED_MOVIE);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@ import static org.springframework.http.HttpStatus.UNAUTHORIZED;
|
||||
import static org.springframework.http.HttpStatus.UNSUPPORTED_MEDIA_TYPE;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
@@ -22,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;
|
||||
@@ -213,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);
|
||||
}
|
||||
|
||||
/**
|
||||
* 인증 정보가 없을 때
|
||||
*/
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
}
|
||||
@@ -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();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -28,8 +28,9 @@ public class RefreshToken {
|
||||
this.token = token;
|
||||
}
|
||||
|
||||
public void changeToken(String token) {
|
||||
public RefreshToken changeToken(String token) {
|
||||
this.token = token;
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -53,8 +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(HttpMethod.GET,"/api/movies").permitAll()
|
||||
.antMatchers("/api/movieTimes/**").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()
|
||||
|
||||
@@ -27,6 +27,7 @@ public class JwtProvider {
|
||||
|
||||
private static final String AUTHORITIES_KEY = "auth";
|
||||
private static final String AUTHORITIES_DELIMITER = ",";
|
||||
private static final String ROLE = "ROLE_";
|
||||
|
||||
private final Key key;
|
||||
private final String prefix;
|
||||
@@ -89,7 +90,7 @@ public class JwtProvider {
|
||||
}
|
||||
|
||||
private String makeRoleName(String role) {
|
||||
return "ROLE_" + role.toUpperCase();
|
||||
return role.contains(ROLE) ? role.toUpperCase() : ROLE + role.toUpperCase();
|
||||
}
|
||||
|
||||
public Authentication getAuthentication(String token) {
|
||||
|
||||
@@ -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 {};
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package com.ticketing.server.movie.aop;
|
||||
|
||||
import static com.ticketing.server.movie.domain.TicketLock.LOCK_VALUE;
|
||||
|
||||
import com.ticketing.server.global.exception.ErrorCode;
|
||||
import com.ticketing.server.global.exception.TicketingException;
|
||||
import com.ticketing.server.movie.service.dto.TicketIdsDTO;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.aspectj.lang.ProceedingJoinPoint;
|
||||
import org.aspectj.lang.annotation.Around;
|
||||
import org.aspectj.lang.annotation.Aspect;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
@Aspect
|
||||
@RequiredArgsConstructor
|
||||
public class TicketLockAspect {
|
||||
|
||||
private final RedisTemplate<String, Object> redisTemplate;
|
||||
|
||||
@Around("execution(* com.ticketing.server.movie.service.TicketLockService.*(..))")
|
||||
public Object ticketLock(ProceedingJoinPoint joinPoint) throws Throwable {
|
||||
List<String> ticketLockIds = getTicketLockIds(joinPoint);
|
||||
|
||||
try {
|
||||
if (!isEveryTicketIdLock(ticketLockIds)) {
|
||||
throw new TicketingException(ErrorCode.BAD_REQUEST_TICKET_SOLD);
|
||||
}
|
||||
|
||||
return joinPoint.proceed();
|
||||
} finally {
|
||||
ticketIdsUnlock(ticketLockIds);
|
||||
}
|
||||
}
|
||||
|
||||
protected boolean isEveryTicketIdLock(List<String> ids) {
|
||||
for (String id : ids) {
|
||||
if (Boolean.FALSE.equals(redisTemplate.opsForValue().setIfAbsent(id, LOCK_VALUE.getValue(), 5, TimeUnit.MINUTES))) {
|
||||
return Boolean.FALSE;
|
||||
}
|
||||
}
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
|
||||
protected Long ticketIdsUnlock(List<String> ids) {
|
||||
return redisTemplate.delete(ids);
|
||||
}
|
||||
|
||||
private List<String> getTicketLockIds(ProceedingJoinPoint joinPoint) {
|
||||
for (Object arg : joinPoint.getArgs()) {
|
||||
if (arg instanceof TicketIdsDTO) {
|
||||
TicketIdsDTO ids = (TicketIdsDTO) arg;
|
||||
return ids.makeTicketLockIds();
|
||||
}
|
||||
}
|
||||
|
||||
throw new TicketingException(ErrorCode.EMPTY_TICKET_ID);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -8,11 +8,12 @@ import com.ticketing.server.movie.application.response.MovieDeleteResponse;
|
||||
import com.ticketing.server.movie.application.response.MovieListResponse;
|
||||
import com.ticketing.server.movie.application.response.MovieInfoResponse;
|
||||
import com.ticketing.server.movie.service.dto.DeletedMovieDTO;
|
||||
import com.ticketing.server.movie.service.dto.MovieListDTO;
|
||||
import com.ticketing.server.movie.service.dto.MovieDTO;
|
||||
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
|
||||
import com.ticketing.server.movie.service.interfaces.MovieService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import java.util.List;
|
||||
import javax.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -51,11 +52,11 @@ public class MovieController {
|
||||
@GetMapping()
|
||||
@ApiOperation(value = "영화 목록 조회")
|
||||
public ResponseEntity<MovieListResponse> getMovies() {
|
||||
MovieListDTO movieListDto = movieService.getMovies();
|
||||
List<MovieDTO> movieDtos = movieService.getMovies();
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(
|
||||
movieListDto.toResponse()
|
||||
new MovieListResponse(movieDtos)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -5,13 +5,14 @@ import static com.ticketing.server.user.domain.UserGrade.ROLES.STAFF;
|
||||
import com.ticketing.server.movie.application.request.MovieTimeRegisterRequest;
|
||||
import com.ticketing.server.movie.application.response.MovieTimeInfoResponse;
|
||||
import com.ticketing.server.movie.application.response.MovieTimeListResponse;
|
||||
import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
|
||||
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
|
||||
import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
|
||||
import com.ticketing.server.movie.service.interfaces.MovieTimeService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -58,11 +59,11 @@ public class MovieTimeController {
|
||||
public ResponseEntity<MovieTimeListResponse> getMovieTimes(
|
||||
@ApiParam(value = "영화 ID", required = true) @RequestParam @NotNull Long movieId,
|
||||
@ApiParam(value = "상영 날짜", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate runningDate) {
|
||||
MovieTimeListDTO movieTimeListDto = movieTimeService.getMovieTimes(movieId, runningDate);
|
||||
List<MovieTimeDTO> movieTimeDtos = movieTimeService.getMovieTimes(movieId, runningDate);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(
|
||||
movieTimeListDto.toResponse()
|
||||
new MovieTimeListResponse(movieTimeDtos)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,16 +1,24 @@
|
||||
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.service.dto.TicketDetailsDTO;
|
||||
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
|
||||
@@ -21,10 +29,28 @@ public class TicketController {
|
||||
|
||||
private final TicketService ticketService;
|
||||
|
||||
@GetMapping("payments/{paymentId}")
|
||||
public ResponseEntity<TicketDetailsResponse> findTicketsByPaymentId(@PathVariable("paymentId") @NotNull Long paymentId) {
|
||||
TicketDetailsDTO tickets = ticketService.findTicketsByPaymentId(paymentId);
|
||||
return ResponseEntity.status(HttpStatus.OK).body(tickets.toResponse());
|
||||
@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)
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
@@ -10,7 +10,7 @@ import lombok.Getter;
|
||||
@AllArgsConstructor
|
||||
public class MovieListResponse {
|
||||
|
||||
@ApiModelProperty(value = "영화 제목")
|
||||
@ApiModelProperty(value = "영화 목록")
|
||||
private List<MovieDTO> movieDtos;
|
||||
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ import lombok.Getter;
|
||||
@AllArgsConstructor
|
||||
public class MovieTimeListResponse {
|
||||
|
||||
@ApiModelProperty(value = "영화 시간표 정보")
|
||||
@ApiModelProperty(value = "영화 시간표 목록")
|
||||
private List<MovieTimeDTO> movieTimeDtos;
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
@@ -1,8 +1,15 @@
|
||||
package com.ticketing.server.movie.domain;
|
||||
|
||||
import static com.ticketing.server.global.exception.ErrorCode.BAD_REQUEST_PAYMENT_CANCEL;
|
||||
import static com.ticketing.server.global.exception.ErrorCode.DUPLICATE_PAYMENT;
|
||||
import static com.ticketing.server.global.exception.ErrorCode.NOT_REFUNDABLE_SEAT;
|
||||
import static com.ticketing.server.global.exception.ErrorCode.NOT_REFUNDABLE_TIME;
|
||||
|
||||
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
||||
import com.ticketing.server.global.exception.ErrorCode;
|
||||
import com.ticketing.server.global.exception.TicketingException;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.EnumType;
|
||||
import javax.persistence.Enumerated;
|
||||
@@ -26,7 +33,7 @@ public class Ticket extends AbstractEntity {
|
||||
|
||||
@NotNull
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "movie_times_id", referencedColumnName = "id", updatable = false)
|
||||
@JoinColumn(name = "movie_time_id", referencedColumnName = "id", updatable = false)
|
||||
private MovieTime movieTime;
|
||||
|
||||
private Long paymentId;
|
||||
@@ -53,6 +60,58 @@ public class Ticket extends AbstractEntity {
|
||||
this.status = TicketStatus.SALE;
|
||||
}
|
||||
|
||||
public Ticket makeReservation() {
|
||||
if (!TicketStatus.SALE.equals(status)) {
|
||||
throw new TicketingException(DUPLICATE_PAYMENT);
|
||||
}
|
||||
|
||||
status = TicketStatus.RESERVATION;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Ticket makeSold(Long paymentId) {
|
||||
if (TicketStatus.SOLD.equals(status)) {
|
||||
throw new TicketingException(DUPLICATE_PAYMENT);
|
||||
}
|
||||
|
||||
status = TicketStatus.SOLD;
|
||||
this.paymentId = paymentId;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Ticket cancel() {
|
||||
if (!TicketStatus.RESERVATION.equals(status)) {
|
||||
throw new TicketingException(BAD_REQUEST_PAYMENT_CANCEL);
|
||||
}
|
||||
|
||||
status = TicketStatus.SALE;
|
||||
paymentId = null;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Ticket refund(LocalDateTime dateTime) {
|
||||
long seconds = ChronoUnit.SECONDS.between(dateTime, getStartAt());
|
||||
if (600L > seconds) {
|
||||
throw new TicketingException(NOT_REFUNDABLE_TIME);
|
||||
}
|
||||
|
||||
return refund();
|
||||
}
|
||||
|
||||
public Ticket refund() {
|
||||
if (!TicketStatus.SOLD.equals(status)) {
|
||||
throw new TicketingException(NOT_REFUNDABLE_SEAT);
|
||||
}
|
||||
|
||||
status = TicketStatus.SALE;
|
||||
paymentId = null;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Long getMovieTimeId() {
|
||||
return movieTime.getId();
|
||||
}
|
||||
|
||||
public Integer getColumn() {
|
||||
return this.seat.getSeatColumn();
|
||||
}
|
||||
@@ -85,5 +144,4 @@ public class Ticket extends AbstractEntity {
|
||||
this.paymentId = id;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.ticketing.server.movie.domain;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Getter
|
||||
@RequiredArgsConstructor
|
||||
public enum TicketLock {
|
||||
|
||||
LOCK_KEY("TicketLock"),
|
||||
LOCK_VALUE("lock");
|
||||
|
||||
private final String value;
|
||||
|
||||
}
|
||||
@@ -2,15 +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("환불"),
|
||||
RESERVATION("예약"),
|
||||
SOLD("판매완료");
|
||||
|
||||
private String name;
|
||||
private final String name;
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
@@ -17,8 +16,8 @@ public interface MovieRepository extends JpaRepository<Movie, Long> {
|
||||
|
||||
@Query(value = "SELECT m "
|
||||
+ "FROM Movie m "
|
||||
+ "WHERE title = :title "
|
||||
+ "AND deleted_at IS NULL")
|
||||
+ "WHERE m.title = :title "
|
||||
+ "AND m.deletedAt IS NULL")
|
||||
Optional<Movie> findValidMovieWithTitle(String title);
|
||||
|
||||
@Query(value = "SELECT * "
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
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;
|
||||
@@ -11,8 +12,16 @@ import org.springframework.stereotype.Repository;
|
||||
public interface TicketRepository extends JpaRepository<Ticket, Long> {
|
||||
|
||||
@Query(
|
||||
value =
|
||||
"SELECT t "
|
||||
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 "
|
||||
@@ -21,4 +30,14 @@ public interface TicketRepository extends JpaRepository<Ticket, Long> {
|
||||
)
|
||||
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);
|
||||
|
||||
}
|
||||
|
||||
@@ -5,7 +5,6 @@ import com.ticketing.server.movie.domain.Movie;
|
||||
import com.ticketing.server.movie.domain.repository.MovieRepository;
|
||||
import com.ticketing.server.movie.service.dto.DeletedMovieDTO;
|
||||
import com.ticketing.server.movie.service.dto.MovieDTO;
|
||||
import com.ticketing.server.movie.service.dto.MovieListDTO;
|
||||
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
|
||||
import com.ticketing.server.movie.service.interfaces.MovieService;
|
||||
import java.util.List;
|
||||
@@ -39,14 +38,12 @@ public class MovieServiceImpl implements MovieService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public MovieListDTO getMovies() {
|
||||
public List<MovieDTO> getMovies() {
|
||||
List<Movie> movies = movieRepository.findValidMovies();
|
||||
|
||||
List<MovieDTO> movieDtos = movies.stream()
|
||||
return movies.stream()
|
||||
.map(movie -> movie.toMovieDTO())
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return new MovieListDTO(movieDtos);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -8,9 +8,7 @@ import com.ticketing.server.movie.domain.repository.MovieRepository;
|
||||
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
|
||||
import com.ticketing.server.movie.domain.repository.TheaterRepository;
|
||||
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
|
||||
import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
|
||||
import com.ticketing.server.movie.service.dto.MovieTimeRegisterDTO;
|
||||
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
|
||||
import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
|
||||
import com.ticketing.server.movie.service.interfaces.MovieTimeService;
|
||||
import java.time.LocalDate;
|
||||
@@ -38,12 +36,13 @@ public class MovieTimeServiceImpl implements MovieTimeService {
|
||||
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()) {
|
||||
if (movieTime.isEmpty()) {
|
||||
MovieTime newMovieTime = movieTimeRepository.save(
|
||||
new MovieTime(movie, theater, round, movieTimeRegisterDto.getStartAt())
|
||||
);
|
||||
@@ -55,7 +54,7 @@ public class MovieTimeServiceImpl implements MovieTimeService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public MovieTimeListDTO getMovieTimes(Long movieId, LocalDate runningDate) {
|
||||
public List<MovieTimeDTO> getMovieTimes(Long movieId, LocalDate runningDate) {
|
||||
Movie movie = findMovieById(movieId);
|
||||
|
||||
LocalDateTime startOfDay = runningDate.atStartOfDay().plusHours(6);
|
||||
@@ -63,11 +62,9 @@ public class MovieTimeServiceImpl implements MovieTimeService {
|
||||
|
||||
List<MovieTime> movieTimes = movieTimeRepository.findValidMovieTimes(movie, startOfDay, endOfDay);
|
||||
|
||||
List<MovieTimeDTO> movieTimeDtos = movieTimes.stream()
|
||||
return movieTimes.stream()
|
||||
.map(movieTime -> movieTime.toMovieTimeDTO())
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return new MovieTimeListDTO(movieTimeDtos);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
package com.ticketing.server.movie.service;
|
||||
|
||||
import static com.ticketing.server.global.exception.ErrorCode.BAD_REQUEST_MOVIE_TIME;
|
||||
import static com.ticketing.server.global.exception.ErrorCode.INVALID_TICKET_ID;
|
||||
|
||||
import com.ticketing.server.global.exception.TicketingException;
|
||||
import com.ticketing.server.movie.domain.Ticket;
|
||||
import com.ticketing.server.movie.domain.repository.TicketRepository;
|
||||
import com.ticketing.server.movie.service.dto.TicketIdsDTO;
|
||||
import com.ticketing.server.movie.service.dto.TicketReservationDTO;
|
||||
import com.ticketing.server.movie.service.dto.TicketSoldDTO;
|
||||
import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
|
||||
import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Validated
|
||||
public class TicketLockService {
|
||||
|
||||
private final TicketRepository ticketRepository;
|
||||
|
||||
public TicketsReservationDTO ticketReservation(@Valid TicketIdsDTO ticketIdsDto) {
|
||||
List<Ticket> tickets = getTicketsByInTicketIds(ticketIdsDto.getTicketIds());
|
||||
|
||||
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 (tickets.size() != reservationDtoList.size()) {
|
||||
throw new TicketingException(BAD_REQUEST_MOVIE_TIME);
|
||||
}
|
||||
|
||||
return new TicketsReservationDTO(firstMovieTitle(tickets), reservationDtoList);
|
||||
}
|
||||
|
||||
public TicketsSoldDTO ticketSold(@NotNull Long paymentId, @Valid TicketIdsDTO ticketIdsDto) {
|
||||
List<Ticket> tickets = getTicketsByInTicketIds(ticketIdsDto.getTicketIds());
|
||||
|
||||
List<TicketSoldDTO> soldDtoList = tickets.stream()
|
||||
.map(ticket -> ticket.makeSold(paymentId))
|
||||
.map(TicketSoldDTO::new)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
return new TicketsSoldDTO(paymentId, soldDtoList);
|
||||
}
|
||||
|
||||
private List<Ticket> getTicketsByInTicketIds(List<Long> ticketIds) {
|
||||
List<Ticket> tickets = ticketRepository.findTicketFetchJoinByTicketIds(ticketIds);
|
||||
|
||||
if (tickets.size() != ticketIds.size()) {
|
||||
throw new TicketingException(INVALID_TICKET_ID);
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,11 +1,25 @@
|
||||
package com.ticketing.server.movie.service;
|
||||
|
||||
import com.ticketing.server.global.exception.ErrorCode;
|
||||
import static com.ticketing.server.global.exception.ErrorCode.INVALID_TICKET_ID;
|
||||
import static com.ticketing.server.global.exception.ErrorCode.MOVIE_TIME_NOT_FOUND;
|
||||
import static com.ticketing.server.global.exception.ErrorCode.PAYMENT_ID_NOT_FOUND;
|
||||
|
||||
import com.ticketing.server.global.exception.TicketingException;
|
||||
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.TicketDetailsDTO;
|
||||
import com.ticketing.server.movie.service.dto.TicketDTO;
|
||||
import com.ticketing.server.movie.service.dto.TicketIdsDTO;
|
||||
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.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;
|
||||
@@ -22,19 +36,74 @@ import org.springframework.validation.annotation.Validated;
|
||||
public class TicketServiceImpl implements TicketService {
|
||||
|
||||
private final TicketRepository ticketRepository;
|
||||
private final MovieTimeRepository movieTimeRepository;
|
||||
private final TicketLockService ticketLockService;
|
||||
|
||||
@Override
|
||||
public TicketDetailsDTO findTicketsByPaymentId(@NotNull Long paymentId) {
|
||||
public List<TicketDTO> getTickets(@NotNull Long movieTimeId) {
|
||||
MovieTime movieTime = movieTimeRepository.findById(movieTimeId)
|
||||
.orElseThrow(() -> new TicketingException(MOVIE_TIME_NOT_FOUND));
|
||||
|
||||
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();
|
||||
throw new TicketingException(PAYMENT_ID_NOT_FOUND);
|
||||
}
|
||||
|
||||
return new TicketDetailsDTO(ticketDetails);
|
||||
return ticketDetails;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public TicketsReservationDTO ticketReservation(@NotEmptyCollection List<Long> ticketIds) {
|
||||
return ticketLockService.ticketReservation(new TicketIdsDTO(ticketIds));
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public TicketsSoldDTO ticketSold(@NotNull Long paymentId, @NotEmptyCollection List<Long> ticketIds) {
|
||||
return ticketLockService.ticketSold(paymentId, new TicketIdsDTO(ticketIds));
|
||||
}
|
||||
|
||||
@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 new TicketingException(INVALID_TICKET_ID);
|
||||
}
|
||||
|
||||
return tickets;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
package com.ticketing.server.movie.service.dto;
|
||||
|
||||
import com.ticketing.server.movie.application.response.MovieListResponse;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class MovieListDTO {
|
||||
|
||||
private final List<MovieDTO> movieDtos;
|
||||
|
||||
public MovieListResponse toResponse() {
|
||||
return new MovieListResponse(movieDtos);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
package com.ticketing.server.movie.service.dto;
|
||||
|
||||
import com.ticketing.server.movie.application.response.MovieTimeListResponse;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class MovieTimeListDTO {
|
||||
|
||||
private final List<MovieTimeDTO> movieTimeDtos;
|
||||
|
||||
public MovieTimeListResponse toResponse() {
|
||||
return new MovieTimeListResponse(movieTimeDtos);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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()
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
package com.ticketing.server.movie.service.dto;
|
||||
|
||||
import com.ticketing.server.movie.application.response.TicketDetailsResponse;
|
||||
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class TicketDetailsDTO {
|
||||
|
||||
private final List<TicketDetailDTO> ticketDetails;
|
||||
|
||||
public TicketDetailsResponse toResponse() {
|
||||
return new TicketDetailsResponse(ticketDetails);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.ticketing.server.movie.service.dto;
|
||||
|
||||
import static com.ticketing.server.movie.domain.TicketLock.LOCK_KEY;
|
||||
|
||||
import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class TicketIdsDTO {
|
||||
|
||||
@NotEmptyCollection
|
||||
private List<Long> ticketIds;
|
||||
|
||||
public List<String> makeTicketLockIds() {
|
||||
return ticketIds.stream()
|
||||
.map(id -> LOCK_KEY.getValue() + ":" + id)
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,14 +1,15 @@
|
||||
package com.ticketing.server.movie.service.interfaces;
|
||||
|
||||
import com.ticketing.server.movie.service.dto.DeletedMovieDTO;
|
||||
import com.ticketing.server.movie.service.dto.MovieListDTO;
|
||||
import com.ticketing.server.movie.service.dto.MovieDTO;
|
||||
import com.ticketing.server.movie.service.dto.RegisteredMovieDTO;
|
||||
import java.util.List;
|
||||
|
||||
public interface MovieService {
|
||||
|
||||
RegisteredMovieDTO registerMovie(String title, Long runningTime);
|
||||
|
||||
MovieListDTO getMovies();
|
||||
List<MovieDTO> getMovies();
|
||||
|
||||
DeletedMovieDTO deleteMovie(Long id);
|
||||
}
|
||||
|
||||
@@ -2,17 +2,18 @@ package com.ticketing.server.movie.service.interfaces;
|
||||
|
||||
import com.ticketing.server.movie.domain.Movie;
|
||||
import com.ticketing.server.movie.domain.Theater;
|
||||
import com.ticketing.server.movie.service.dto.MovieTimeListDTO;
|
||||
import com.ticketing.server.movie.service.dto.MovieTimeDTO;
|
||||
import com.ticketing.server.movie.service.dto.MovieTimeRegisterDTO;
|
||||
import com.ticketing.server.movie.service.dto.RegisteredMovieTimeDTO;
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
import javax.validation.Valid;
|
||||
|
||||
public interface MovieTimeService {
|
||||
|
||||
RegisteredMovieTimeDTO registerMovieTime(@Valid MovieTimeRegisterDTO movieTimeRegisterDto);
|
||||
|
||||
MovieTimeListDTO getMovieTimes(Long movieId, LocalDate runningDate);
|
||||
List<MovieTimeDTO> getMovieTimes(Long movieId, LocalDate runningDate);
|
||||
|
||||
Movie findMovieById(Long movieId);
|
||||
|
||||
|
||||
@@ -1,10 +1,31 @@
|
||||
package com.ticketing.server.movie.service.interfaces;
|
||||
|
||||
import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
|
||||
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.TicketIdsDTO;
|
||||
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.Valid;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
public interface TicketService {
|
||||
|
||||
TicketDetailsDTO findTicketsByPaymentId(@NotNull Long paymentId);
|
||||
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);
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
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;
|
||||
@@ -13,7 +14,6 @@ import com.ticketing.server.payment.domain.Payment;
|
||||
import com.ticketing.server.payment.domain.PaymentStatus;
|
||||
import com.ticketing.server.payment.domain.PaymentType;
|
||||
import com.ticketing.server.payment.domain.repository.PaymentRepository;
|
||||
import com.ticketing.server.payment.service.dto.CreatePaymentDTO;
|
||||
import com.ticketing.server.user.domain.User;
|
||||
import com.ticketing.server.user.domain.UserGrade;
|
||||
import com.ticketing.server.user.domain.repository.UserRepository;
|
||||
@@ -46,7 +46,7 @@ MovieSetupService {
|
||||
initTheater();
|
||||
initMovieTime();
|
||||
initTicket();
|
||||
initPayment();
|
||||
// initPayment();
|
||||
}
|
||||
|
||||
private void initMovie() {
|
||||
@@ -119,8 +119,17 @@ MovieSetupService {
|
||||
List<Ticket> tickets = ticketRepository.findAll();
|
||||
Ticket ticket = tickets.get(0);
|
||||
String title = ticket.getMovieTime().getMovie().getTitle();
|
||||
CreatePaymentDTO createPaymentDto = new CreatePaymentDTO(user.getAlternateId(), title, PaymentType.KAKAO_PAY, PaymentStatus.COMPLETED, "2022-0710-4142", 30_000);
|
||||
Payment payment = createPaymentDto.toEntity();
|
||||
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);
|
||||
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,10 +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);
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.ticketing.server.payment.api.dto.response;
|
||||
|
||||
import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public class ApprovedCancelAmount extends SnakeCaseStrategy {
|
||||
|
||||
private Integer total;
|
||||
private Integer taxFree;
|
||||
private Integer vat;
|
||||
private Integer point;
|
||||
private Integer discount;
|
||||
private Integer greenDeposit;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.ticketing.server.payment.api.dto.response;
|
||||
|
||||
import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public class CancelAvailableAmount extends SnakeCaseStrategy {
|
||||
|
||||
private Integer total;
|
||||
private Integer taxFree;
|
||||
private Integer vat;
|
||||
private Integer point;
|
||||
private Integer discount;
|
||||
private Integer greenDeposit;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.ticketing.server.payment.api.dto.response;
|
||||
|
||||
import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public class CanceledAmount extends SnakeCaseStrategy {
|
||||
|
||||
private Integer total;
|
||||
private Integer taxFree;
|
||||
private Integer vat;
|
||||
private Integer point;
|
||||
private Integer discount;
|
||||
private Integer greenDeposit;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
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 CardInfo extends SnakeCaseStrategy {
|
||||
|
||||
private String purchaseCorp;
|
||||
|
||||
private String purchaseCorpCode;
|
||||
|
||||
private String issuerCorp;
|
||||
|
||||
private String issuerCorpCode;
|
||||
|
||||
private String kakaopayPurchaseCorp;
|
||||
|
||||
private String kakaopayPurchaseCorpCode;
|
||||
|
||||
private String kakaopayIssuerCorp;
|
||||
|
||||
private String kakaopayIssuerCorpCode;
|
||||
|
||||
private String bin;
|
||||
|
||||
private String cardType;
|
||||
|
||||
private String installMonth;
|
||||
|
||||
private String approvedId;
|
||||
|
||||
private String cardMid;
|
||||
|
||||
private String interestFreeInstall;
|
||||
|
||||
private String cardItemCode;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
package com.ticketing.server.payment.api.dto.response;
|
||||
|
||||
|
||||
import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.ToString;
|
||||
|
||||
@Getter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@ToString
|
||||
public class KakaoPayApproveResponse extends SnakeCaseStrategy {
|
||||
|
||||
private String aid;
|
||||
|
||||
private String tid;
|
||||
|
||||
private String cid;
|
||||
|
||||
private String sid;
|
||||
|
||||
private String partnerOrderId;
|
||||
|
||||
private String partnerUserId;
|
||||
|
||||
private String paymentMethodType;
|
||||
|
||||
private Amount amount;
|
||||
|
||||
private CardInfo cardInfo;
|
||||
|
||||
private String itemName;
|
||||
|
||||
private String itemCode;
|
||||
|
||||
private Integer quantity;
|
||||
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
private LocalDateTime approvedAt;
|
||||
|
||||
private String payload;
|
||||
|
||||
public Integer getTotalAmount() {
|
||||
return amount.getTotal();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.ticketing.server.payment.api.dto.response;
|
||||
|
||||
import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public class KakaoPayCancelResponse extends SnakeCaseStrategy {
|
||||
|
||||
private String aid;
|
||||
|
||||
private String tid;
|
||||
|
||||
private String cid;
|
||||
|
||||
private String status;
|
||||
|
||||
private String partnerOrderId;
|
||||
|
||||
private String partnerUserId;
|
||||
|
||||
private String paymentMethodType;
|
||||
|
||||
private Amount amount;
|
||||
|
||||
private ApprovedCancelAmount approvedCancelAmount;
|
||||
|
||||
private CanceledAmount canceledAmount;
|
||||
|
||||
private CancelAvailableAmount cancelAvailableAmount;
|
||||
|
||||
private String itemName;
|
||||
|
||||
private String itemCode;
|
||||
|
||||
private Integer quantity;
|
||||
|
||||
private LocalDateTime createdAt;
|
||||
|
||||
private LocalDateTime approvedAt;
|
||||
|
||||
private LocalDateTime canceledAt;
|
||||
|
||||
private String payload;
|
||||
|
||||
public Integer getTotalAmount() {
|
||||
return amount.getTotal();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.ticketing.server.payment.api.dto.response;
|
||||
|
||||
import com.ticketing.server.payment.api.dto.SnakeCaseStrategy;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.ToString;
|
||||
|
||||
@Getter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@ToString
|
||||
public class KakaoPayReadyResponse extends SnakeCaseStrategy {
|
||||
|
||||
// 결제 고유 번호
|
||||
private String tid;
|
||||
|
||||
// 요청 클라이언트가 모바일 앱일 경우
|
||||
private String nextRedirectAppUrl;
|
||||
|
||||
// 요청 클라이언트가 모바일 웹일 경우
|
||||
private String nextRedirectMobileUrl;
|
||||
|
||||
// 요청 클라이언트가 PC 웹일 경우
|
||||
private String nextRedirectPcUrl;
|
||||
|
||||
// 카카오페이 결제 화면으로 이동하는 Android 앱 스킴
|
||||
private String androidAppScheme;
|
||||
|
||||
// 카카오페이 결제 화면으로 이동하는 IOS 앱 스킴
|
||||
private String iosAppScheme;
|
||||
|
||||
// 결제 준비 요청 시간
|
||||
private LocalDateTime createAt;
|
||||
|
||||
}
|
||||
@@ -1,9 +1,23 @@
|
||||
package com.ticketing.server.payment.api.impl;
|
||||
|
||||
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.service.dto.TicketDetailsDTO;
|
||||
import com.ticketing.server.movie.application.response.TicketReservationResponse;
|
||||
import com.ticketing.server.movie.application.response.TicketSoldResponse;
|
||||
import com.ticketing.server.movie.domain.Ticket;
|
||||
import com.ticketing.server.movie.service.dto.TicketRefundDTO;
|
||||
import com.ticketing.server.movie.service.dto.TicketsCancelDTO;
|
||||
import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
|
||||
import com.ticketing.server.movie.service.dto.TicketsReservationDTO;
|
||||
import com.ticketing.server.movie.service.dto.TicketsSoldDTO;
|
||||
import com.ticketing.server.movie.service.interfaces.TicketService;
|
||||
import com.ticketing.server.payment.api.MovieClient;
|
||||
import com.ticketing.server.payment.service.dto.TicketDetailDTO;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
@@ -18,8 +32,38 @@ public class MovieClientImpl implements MovieClient {
|
||||
|
||||
@Override
|
||||
public TicketDetailsResponse getTicketsByPaymentId(@NotNull Long paymentId) {
|
||||
TicketDetailsDTO ticketDetails = ticketService.findTicketsByPaymentId(paymentId);
|
||||
return ticketDetails.toResponse();
|
||||
List<TicketDetailDTO> ticketDetails = ticketService.findTicketsByPaymentId(paymentId);
|
||||
return new TicketDetailsResponse(ticketDetails);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TicketReservationResponse ticketReservation(@NotNull TicketReservationRequest request) {
|
||||
TicketsReservationDTO ticketReservationsDto = ticketService.ticketReservation(request.getTicketIds());
|
||||
return ticketReservationsDto.toResponse();
|
||||
}
|
||||
|
||||
@Override
|
||||
public TicketSoldResponse ticketSold(@NotNull TicketSoldRequest request) {
|
||||
TicketsSoldDTO ticketsSoldDto = ticketService.ticketSold(request.getPaymentId(), request.getTicketIds());
|
||||
return ticketsSoldDto.toResponse();
|
||||
}
|
||||
|
||||
@Override
|
||||
public TicketCancelResponse ticketCancel(@NotNull TicketCancelRequest request) {
|
||||
TicketsCancelDTO ticketsCancelDto = ticketService.ticketCancel(request.getTicketIds());
|
||||
return ticketsCancelDto.toResponse();
|
||||
}
|
||||
|
||||
@Override
|
||||
public TicketsRefundResponse ticketRefundByDateTime(TicketsRefundRequest request, LocalDateTime dateTime) {
|
||||
List<TicketRefundDTO> ticketRefundDTOS = ticketService.ticketsRefund(request.getPaymentId(), ticket -> ticket.refund(dateTime));
|
||||
return new TicketsRefundResponse(ticketRefundDTOS);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TicketsRefundResponse ticketRefund(TicketsRefundRequest request) {
|
||||
List<TicketRefundDTO> ticketRefundDtos = ticketService.ticketsRefund(request.getPaymentId(), Ticket::refund);
|
||||
return new TicketsRefundResponse(ticketRefundDtos);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.ticketing.server.payment.api.impl;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class TicketsRefundRequest {
|
||||
|
||||
private final Long paymentId;
|
||||
|
||||
}
|
||||
@@ -1,20 +1,39 @@
|
||||
package com.ticketing.server.payment.application;
|
||||
|
||||
import static com.ticketing.server.user.domain.UserGrade.ROLES.STAFF;
|
||||
import static com.ticketing.server.user.domain.UserGrade.ROLES.USER;
|
||||
|
||||
import com.ticketing.server.payment.application.request.PaymentReadyRequest;
|
||||
import com.ticketing.server.payment.application.request.PaymentRefundRequest;
|
||||
import com.ticketing.server.payment.application.response.PaymentCancelResponse;
|
||||
import com.ticketing.server.payment.application.response.PaymentCompleteResponse;
|
||||
import com.ticketing.server.payment.application.response.PaymentDetailResponse;
|
||||
import com.ticketing.server.payment.application.response.PaymentRefundResponse;
|
||||
import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
|
||||
import com.ticketing.server.payment.service.AdminKakaoPayRefundService;
|
||||
import com.ticketing.server.payment.service.MyKakaoPayRefundService;
|
||||
import com.ticketing.server.payment.service.dto.PaymentCancelDTO;
|
||||
import com.ticketing.server.payment.service.dto.PaymentCompleteDTO;
|
||||
import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
|
||||
import com.ticketing.server.payment.service.dto.PaymentReadyDTO;
|
||||
import com.ticketing.server.payment.service.dto.PaymentRefundDTO;
|
||||
import com.ticketing.server.payment.service.dto.SimplePaymentsDTO;
|
||||
import com.ticketing.server.payment.service.interfaces.PaymentApisService;
|
||||
import com.ticketing.server.payment.service.interfaces.PaymentService;
|
||||
import com.ticketing.server.user.domain.UserGrade;
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.access.annotation.Secured;
|
||||
import org.springframework.security.core.annotation.AuthenticationPrincipal;
|
||||
import org.springframework.security.core.userdetails.UserDetails;
|
||||
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
|
||||
@@ -25,9 +44,11 @@ public class PaymentController {
|
||||
|
||||
private final PaymentApisService paymentApisService;
|
||||
private final PaymentService paymentService;
|
||||
private final AdminKakaoPayRefundService adminKakaoPayRefundService;
|
||||
private final MyKakaoPayRefundService myKakaoPayRefundService;
|
||||
|
||||
@GetMapping
|
||||
@Secured(UserGrade.ROLES.USER)
|
||||
@Secured(USER)
|
||||
public ResponseEntity<SimplePaymentsResponse> simplePayments(@NotNull Long userAlternateId) {
|
||||
SimplePaymentsDTO simplePayments = paymentService.findSimplePayments(userAlternateId);
|
||||
|
||||
@@ -36,7 +57,7 @@ public class PaymentController {
|
||||
}
|
||||
|
||||
@GetMapping("/detail")
|
||||
@Secured(UserGrade.ROLES.USER)
|
||||
@Secured(USER)
|
||||
public ResponseEntity<PaymentDetailResponse> detail(@NotNull Long paymentId) {
|
||||
PaymentDetailDTO paymentDetail = paymentApisService.findPaymentDetail(paymentId);
|
||||
|
||||
@@ -44,4 +65,51 @@ public class PaymentController {
|
||||
.body(paymentDetail.toResponse());
|
||||
}
|
||||
|
||||
@PostMapping("/ready")
|
||||
@Secured(USER)
|
||||
public ResponseEntity<PaymentReadyDTO> ready(@RequestBody @Valid PaymentReadyRequest request) {
|
||||
PaymentReadyDTO paymentReadyDto = paymentApisService.ready(request.getTicketIds());
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(paymentReadyDto);
|
||||
}
|
||||
|
||||
@GetMapping("/complete")
|
||||
@Secured(USER)
|
||||
public ResponseEntity<PaymentCompleteResponse> complete(
|
||||
@AuthenticationPrincipal UserDetails userRequest,
|
||||
@RequestParam("pg_token") String pgToken) {
|
||||
PaymentCompleteDTO paymentCompleteDto = paymentApisService.complete(userRequest.getUsername(), pgToken);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(paymentCompleteDto.toResponse());
|
||||
}
|
||||
|
||||
@GetMapping("/cancel")
|
||||
@Secured(USER)
|
||||
public ResponseEntity<PaymentCancelResponse> cancel(@AuthenticationPrincipal UserDetails userRequest) {
|
||||
PaymentCancelDTO paymentCancelDto = paymentApisService.cancel(userRequest.getUsername());
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(paymentCancelDto.toResponse());
|
||||
}
|
||||
|
||||
@PostMapping("/refund")
|
||||
@Secured(USER)
|
||||
public ResponseEntity<PaymentRefundResponse> refund(@RequestBody @Valid PaymentRefundRequest request) {
|
||||
PaymentRefundDTO paymentRefundDto = myKakaoPayRefundService.refund(request.getPaymentId());
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(paymentRefundDto.toResponse());
|
||||
}
|
||||
|
||||
@PostMapping("/staff/refund")
|
||||
@Secured(STAFF)
|
||||
public ResponseEntity<PaymentRefundResponse> adminRefund(@RequestBody @Valid PaymentRefundRequest request) {
|
||||
PaymentRefundDTO paymentRefundDto = adminKakaoPayRefundService.refund(request.getPaymentId());
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(paymentRefundDto.toResponse());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.ticketing.server.payment.application.request;
|
||||
|
||||
import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
|
||||
import java.util.List;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public class PaymentReadyRequest {
|
||||
|
||||
@NotEmptyCollection
|
||||
private List<Long> ticketIds;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.ticketing.server.payment.application.request;
|
||||
|
||||
import javax.validation.constraints.NotNull;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
public class PaymentRefundRequest {
|
||||
|
||||
@NotNull
|
||||
private Long paymentId;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.ticketing.server.payment.application.response;
|
||||
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class PaymentCancelResponse {
|
||||
|
||||
private final String email;
|
||||
private final String movieTitle;
|
||||
private final String tid;
|
||||
private final List<Long> ticketIds;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.ticketing.server.payment.application.response;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class PaymentCompleteResponse {
|
||||
|
||||
private final String email;
|
||||
private final String tid;
|
||||
private final String movieTitle;
|
||||
private final Integer quantity;
|
||||
private final Integer totalAmount;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package com.ticketing.server.payment.application.response;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class PaymentRefundResponse {
|
||||
|
||||
private Long paymentId;
|
||||
private List<Long> ticketIds;
|
||||
private String movieTitle;
|
||||
private Integer cancelAmount;
|
||||
private LocalDateTime canceledAt;
|
||||
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ticketing.server.payment.domain;
|
||||
|
||||
import com.ticketing.server.global.dto.repository.AbstractEntity;
|
||||
import com.ticketing.server.global.redis.PaymentCache;
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.EnumType;
|
||||
@@ -24,6 +25,10 @@ public class Payment extends AbstractEntity {
|
||||
@Column(name = "movie_title", nullable = false)
|
||||
private String movieTitle;
|
||||
|
||||
@NotEmpty
|
||||
@Column(name = "tid", nullable = false)
|
||||
private String tid;
|
||||
|
||||
@NotNull
|
||||
@Column(name = "type", nullable = false)
|
||||
@Enumerated(value = EnumType.STRING)
|
||||
@@ -45,9 +50,22 @@ public class Payment extends AbstractEntity {
|
||||
@Column(name = "total_price", nullable = false)
|
||||
private Integer totalPrice;
|
||||
|
||||
public Payment(Long userAlternateId, String movieTitle, PaymentType type, PaymentStatus status, String paymentNumber, Integer totalPrice) {
|
||||
public Payment(PaymentCache paymentCache, PaymentType type, PaymentStatus status, Integer totalAmount) {
|
||||
this(
|
||||
paymentCache.getUserAlternateId(),
|
||||
paymentCache.getMovieTitle(),
|
||||
paymentCache.getTid(),
|
||||
type,
|
||||
status,
|
||||
paymentCache.getPaymentNumber().toString(),
|
||||
totalAmount
|
||||
);
|
||||
}
|
||||
|
||||
private Payment(Long userAlternateId, String movieTitle, String tid, PaymentType type, PaymentStatus status, String paymentNumber, Integer totalPrice) {
|
||||
this.userAlternateId = userAlternateId;
|
||||
this.movieTitle = movieTitle;
|
||||
this.tid = tid;
|
||||
this.type = type;
|
||||
this.status = status;
|
||||
this.paymentNumber = paymentNumber;
|
||||
@@ -64,4 +82,7 @@ public class Payment extends AbstractEntity {
|
||||
this.totalPrice = totalPrice;
|
||||
}
|
||||
|
||||
public void refund() {
|
||||
status = PaymentStatus.REFUNDED;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,15 @@
|
||||
package com.ticketing.server.payment.domain;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@Getter
|
||||
@RequiredArgsConstructor
|
||||
public enum PaymentStatus {
|
||||
COMPLETED, REFUNDED, FAILED
|
||||
|
||||
SOLD("판매"),
|
||||
REFUNDED("환불");
|
||||
|
||||
private final String statusName;
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.ticketing.server.payment.service;
|
||||
|
||||
import com.ticketing.server.global.exception.ErrorCode;
|
||||
import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
|
||||
import com.ticketing.server.payment.api.KakaoPayClient;
|
||||
import com.ticketing.server.payment.api.KakaoPayProperties;
|
||||
import com.ticketing.server.payment.api.MovieClient;
|
||||
import com.ticketing.server.payment.api.impl.TicketsRefundRequest;
|
||||
import com.ticketing.server.payment.domain.Payment;
|
||||
import com.ticketing.server.payment.domain.repository.PaymentRepository;
|
||||
import com.ticketing.server.payment.service.interfaces.AbstractKakaoPayRefund;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class AdminKakaoPayRefundService extends AbstractKakaoPayRefund {
|
||||
|
||||
private final PaymentRepository paymentRepository;
|
||||
private final MovieClient movieClient;
|
||||
|
||||
public AdminKakaoPayRefundService(KakaoPayClient kakaoPayClient, KakaoPayProperties kakaoPayProperties, PaymentRepository paymentRepository, MovieClient movieClient) {
|
||||
super(kakaoPayClient, kakaoPayProperties);
|
||||
this.paymentRepository = paymentRepository;
|
||||
this.movieClient = movieClient;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Payment getPayment(Long paymentId) {
|
||||
return paymentRepository.findById(paymentId)
|
||||
.orElseThrow(ErrorCode::throwPaymentIdNotFound);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected TicketsRefundResponse movieAndPaymentRefund(Payment payment) {
|
||||
TicketsRefundResponse refundResponse = movieClient.ticketRefund(new TicketsRefundRequest(payment.getId()));
|
||||
payment.refund();
|
||||
|
||||
return refundResponse;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package com.ticketing.server.payment.service;
|
||||
|
||||
import com.ticketing.server.global.exception.ErrorCode;
|
||||
import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
|
||||
import com.ticketing.server.payment.api.KakaoPayClient;
|
||||
import com.ticketing.server.payment.api.KakaoPayProperties;
|
||||
import com.ticketing.server.payment.api.MovieClient;
|
||||
import com.ticketing.server.payment.api.UserClient;
|
||||
import com.ticketing.server.payment.api.dto.response.UserDetailResponse;
|
||||
import com.ticketing.server.payment.api.impl.TicketsRefundRequest;
|
||||
import com.ticketing.server.payment.domain.Payment;
|
||||
import com.ticketing.server.payment.domain.repository.PaymentRepository;
|
||||
import com.ticketing.server.payment.service.interfaces.AbstractKakaoPayRefund;
|
||||
import java.time.LocalDateTime;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class MyKakaoPayRefundService extends AbstractKakaoPayRefund {
|
||||
|
||||
private final PaymentRepository paymentRepository;
|
||||
private final MovieClient movieClient;
|
||||
private final UserClient userClient;
|
||||
|
||||
public MyKakaoPayRefundService(KakaoPayClient kakaoPayClient, KakaoPayProperties kakaoPayProperties, PaymentRepository paymentRepository,
|
||||
MovieClient movieClient, UserClient userClient) {
|
||||
super(kakaoPayClient, kakaoPayProperties);
|
||||
this.paymentRepository = paymentRepository;
|
||||
this.movieClient = movieClient;
|
||||
this.userClient = userClient;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Payment getPayment(Long paymentId) {
|
||||
UserDetailResponse userDetail = userClient.detail();
|
||||
Payment payment = paymentRepository.findById(paymentId)
|
||||
.orElseThrow(ErrorCode::throwPaymentIdNotFound);
|
||||
|
||||
if (userDetail.hasUserAlternateId(payment)) {
|
||||
throw ErrorCode.throwValidUserId();
|
||||
}
|
||||
|
||||
return payment;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected TicketsRefundResponse movieAndPaymentRefund(Payment payment) {
|
||||
LocalDateTime now = LocalDateTime.now();
|
||||
TicketsRefundResponse refundResponse = movieClient.ticketRefundByDateTime(new TicketsRefundRequest(payment.getId()), now);
|
||||
payment.refund();
|
||||
|
||||
return refundResponse;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,14 +1,35 @@
|
||||
package com.ticketing.server.payment.service;
|
||||
|
||||
import com.ticketing.server.global.dto.SequenceGenerator;
|
||||
import com.ticketing.server.global.exception.ErrorCode;
|
||||
import com.ticketing.server.global.redis.PaymentCache;
|
||||
import com.ticketing.server.global.redis.PaymentCacheRepository;
|
||||
import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
|
||||
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.TicketDetailsResponse;
|
||||
import com.ticketing.server.movie.application.response.TicketReservationResponse;
|
||||
import com.ticketing.server.payment.api.KakaoPayClient;
|
||||
import com.ticketing.server.payment.api.KakaoPayProperties;
|
||||
import com.ticketing.server.payment.api.MovieClient;
|
||||
import com.ticketing.server.payment.api.UserClient;
|
||||
import com.ticketing.server.payment.api.dto.requset.KakaoPayApproveRequest;
|
||||
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.KakaoPayReadyResponse;
|
||||
import com.ticketing.server.payment.api.dto.response.UserDetailResponse;
|
||||
import com.ticketing.server.payment.domain.Payment;
|
||||
import com.ticketing.server.payment.domain.PaymentStatus;
|
||||
import com.ticketing.server.payment.domain.PaymentType;
|
||||
import com.ticketing.server.payment.domain.repository.PaymentRepository;
|
||||
import com.ticketing.server.payment.service.dto.PaymentCancelDTO;
|
||||
import com.ticketing.server.payment.service.dto.PaymentCompleteDTO;
|
||||
import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
|
||||
import com.ticketing.server.payment.service.dto.PaymentReadyDTO;
|
||||
import com.ticketing.server.payment.service.interfaces.PaymentApisService;
|
||||
import java.util.List;
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -23,9 +44,16 @@ import org.springframework.validation.annotation.Validated;
|
||||
@Slf4j
|
||||
public class PaymentApisServiceImpl implements PaymentApisService {
|
||||
|
||||
private final KakaoPayProperties kakaoPayProperties;
|
||||
|
||||
private final PaymentRepository paymentRepository;
|
||||
private final PaymentCacheRepository paymentCacheRepository;
|
||||
|
||||
private final MovieClient movieClient;
|
||||
private final UserClient userClient;
|
||||
private final KakaoPayClient kakaoPayClient;
|
||||
|
||||
private final SequenceGenerator sequenceGenerator;
|
||||
|
||||
@Override
|
||||
public PaymentDetailDTO findPaymentDetail(@NotNull Long paymentId) {
|
||||
@@ -41,4 +69,90 @@ public class PaymentApisServiceImpl implements PaymentApisService {
|
||||
return new PaymentDetailDTO(payment, tickets);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public PaymentReadyDTO ready(@NotEmptyCollection List<Long> ticketIds) {
|
||||
// User 정보 조회 - user 의 대체 키가 필요함.
|
||||
UserDetailResponse userResponse = userClient.detail();
|
||||
Long userAlternateId = userResponse.getUserAlternateId();
|
||||
|
||||
// 다른 결제중인 데이터가 있다면, 예외처리
|
||||
paymentCacheRepository.findByEmail(userResponse.getEmail())
|
||||
.ifPresent(paymentCache -> ErrorCode.throwBadRequestPaymentReady());
|
||||
|
||||
// Ticket 정보 조회 - 영화제목, 티켓가격이 필요함.
|
||||
TicketReservationResponse ticketResponse = movieClient.ticketReservation(new TicketReservationRequest(ticketIds));
|
||||
String movieTitle = ticketResponse.getMovieTitle();
|
||||
|
||||
// 예매번호 자동생성
|
||||
Long paymentNumber = sequenceGenerator.generateId();
|
||||
|
||||
KakaoPayReadyRequest request = new KakaoPayReadyRequest(
|
||||
paymentNumber.toString(),
|
||||
userAlternateId.toString(),
|
||||
movieTitle,
|
||||
ticketResponse.getTicketQuantity(),
|
||||
ticketResponse.getTotalPrice(),
|
||||
kakaoPayProperties.getApprovalUrl(),
|
||||
kakaoPayProperties.getCancelUrl(),
|
||||
kakaoPayProperties.getFailUrl()
|
||||
);
|
||||
KakaoPayReadyResponse response = kakaoPayClient.ready(kakaoPayProperties.getAuthorization(), request);
|
||||
|
||||
paymentCacheRepository.save(
|
||||
new PaymentCache(
|
||||
userResponse.getEmail(),
|
||||
movieTitle,
|
||||
response.getTid(),
|
||||
ticketIds,
|
||||
userAlternateId,
|
||||
paymentNumber,
|
||||
request.getTotalAmount()
|
||||
)
|
||||
);
|
||||
|
||||
return new PaymentReadyDTO(response);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public PaymentCompleteDTO complete(@NotEmpty String email, @NotEmpty String pgToken) {
|
||||
PaymentCache paymentCache = paymentCacheRepository.findByEmail(email)
|
||||
.orElseThrow(ErrorCode::throwBadRequestPaymentComplete);
|
||||
|
||||
Payment payment = new Payment(paymentCache, PaymentType.KAKAO_PAY, PaymentStatus.SOLD, paymentCache.getTotalAmount());
|
||||
payment = paymentRepository.save(payment);
|
||||
|
||||
movieClient.ticketSold(new TicketSoldRequest(payment.getId(), paymentCache.getTicketIds()));
|
||||
paymentCacheRepository.delete(paymentCache);
|
||||
|
||||
// 카카오페이 결제완료
|
||||
String paymentNumberToString = paymentCache.getPaymentNumber().toString();
|
||||
String userAlternateIdToString = paymentCache.getUserAlternateId().toString();
|
||||
KakaoPayApproveRequest kakaoPayApproveRequest = new KakaoPayApproveRequest(
|
||||
paymentCache.getTid(),
|
||||
paymentNumberToString,
|
||||
userAlternateIdToString,
|
||||
pgToken
|
||||
);
|
||||
KakaoPayApproveResponse kakaoPayApproveResponse = kakaoPayClient.approve(
|
||||
kakaoPayProperties.getAuthorization(),
|
||||
kakaoPayApproveRequest
|
||||
);
|
||||
|
||||
return new PaymentCompleteDTO(email, kakaoPayApproveResponse);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public PaymentCancelDTO cancel(@NotEmpty String email) {
|
||||
PaymentCache paymentCache = paymentCacheRepository.findByEmail(email)
|
||||
.orElseThrow(ErrorCode::throwBadRequestPaymentComplete);
|
||||
|
||||
movieClient.ticketCancel(new TicketCancelRequest(paymentCache.getTicketIds()));
|
||||
paymentCacheRepository.delete(paymentCache);
|
||||
|
||||
return new PaymentCancelDTO(paymentCache);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
package com.ticketing.server.payment.service.dto;
|
||||
|
||||
import com.ticketing.server.payment.domain.Payment;
|
||||
import com.ticketing.server.payment.domain.PaymentStatus;
|
||||
import com.ticketing.server.payment.domain.PaymentType;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class CreatePaymentDTO {
|
||||
|
||||
private final Long userAlternateId;
|
||||
private final String movieTitle;
|
||||
private final PaymentType type;
|
||||
private final PaymentStatus status;
|
||||
private final String paymentNumber;
|
||||
private final Integer totalPrice;
|
||||
|
||||
public Payment toEntity() {
|
||||
return new Payment
|
||||
(
|
||||
this.getUserAlternateId(),
|
||||
this.getMovieTitle(),
|
||||
this.getType(),
|
||||
this.getStatus(),
|
||||
this.getPaymentNumber(),
|
||||
this.getTotalPrice()
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package com.ticketing.server.payment.service.dto;
|
||||
|
||||
import com.ticketing.server.global.redis.PaymentCache;
|
||||
import com.ticketing.server.payment.application.response.PaymentCancelResponse;
|
||||
import java.util.List;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||
public class PaymentCancelDTO {
|
||||
|
||||
private final String email;
|
||||
private final String movieTitle;
|
||||
private final String tid;
|
||||
private final List<Long> ticketIds;
|
||||
|
||||
public PaymentCancelDTO(PaymentCache paymentCache) {
|
||||
this(
|
||||
paymentCache.getEmail(),
|
||||
paymentCache.getMovieTitle(),
|
||||
paymentCache.getTid(),
|
||||
paymentCache.getTicketIds()
|
||||
);
|
||||
}
|
||||
|
||||
public PaymentCancelResponse toResponse() {
|
||||
return new PaymentCancelResponse(email, movieTitle, tid, ticketIds);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.ticketing.server.payment.service.dto;
|
||||
|
||||
import com.ticketing.server.payment.api.dto.response.KakaoPayApproveResponse;
|
||||
import com.ticketing.server.payment.application.response.PaymentCompleteResponse;
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class PaymentCompleteDTO {
|
||||
|
||||
private final String email;
|
||||
private final String tid;
|
||||
private final String movieTitle;
|
||||
private final Integer quantity;
|
||||
private final Integer totalAmount;
|
||||
|
||||
public PaymentCompleteDTO(@NotEmpty String email, KakaoPayApproveResponse kakaoPayApproveResponse) {
|
||||
this(
|
||||
email,
|
||||
kakaoPayApproveResponse.getTid(),
|
||||
kakaoPayApproveResponse.getItemName(),
|
||||
kakaoPayApproveResponse.getQuantity(),
|
||||
kakaoPayApproveResponse.getTotalAmount()
|
||||
);
|
||||
}
|
||||
|
||||
public PaymentCompleteResponse toResponse() {
|
||||
return new PaymentCompleteResponse(email, tid, movieTitle, quantity, totalAmount);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.ticketing.server.payment.service.dto;
|
||||
|
||||
import com.ticketing.server.payment.api.dto.response.KakaoPayReadyResponse;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor(access = AccessLevel.PRIVATE)
|
||||
public class PaymentReadyDTO {
|
||||
|
||||
// 결제 고유 번호
|
||||
private String tid;
|
||||
|
||||
// 요청 클라이언트가 모바일 앱일 경우
|
||||
private String nextRedirectAppUrl;
|
||||
|
||||
// 요청 클라이언트가 모바일 웹일 경우
|
||||
private String nextRedirectMobileUrl;
|
||||
|
||||
// 요청 클라이언트가 PC 웹일 경우
|
||||
private String nextRedirectPcUrl;
|
||||
|
||||
// 카카오페이 결제 화면으로 이동하는 Android 앱 스킴
|
||||
private String androidAppScheme;
|
||||
|
||||
// 카카오페이 결제 화면으로 이동하는 IOS 앱 스킴
|
||||
private String iosAppScheme;
|
||||
|
||||
public PaymentReadyDTO(KakaoPayReadyResponse response) {
|
||||
this(
|
||||
response.getTid(),
|
||||
response.getNextRedirectAppUrl(),
|
||||
response.getNextRedirectMobileUrl(),
|
||||
response.getNextRedirectPcUrl(),
|
||||
response.getAndroidAppScheme(),
|
||||
response.getIosAppScheme()
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package com.ticketing.server.payment.service.dto;
|
||||
|
||||
import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
|
||||
import com.ticketing.server.payment.api.dto.response.KakaoPayCancelResponse;
|
||||
import com.ticketing.server.payment.application.response.PaymentRefundResponse;
|
||||
import com.ticketing.server.payment.domain.Payment;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public class PaymentRefundDTO {
|
||||
|
||||
private Long paymentId;
|
||||
private List<Long> ticketIds;
|
||||
private String movieTitle;
|
||||
private Integer cancelAmount;
|
||||
private LocalDateTime canceledAt;
|
||||
|
||||
public PaymentRefundDTO(Payment payment, KakaoPayCancelResponse kakaoPayCancelResponse, TicketsRefundResponse refundResponse) {
|
||||
this(
|
||||
payment.getId(),
|
||||
refundResponse.getTicketIds(),
|
||||
kakaoPayCancelResponse.getItemName(),
|
||||
kakaoPayCancelResponse.getTotalAmount(),
|
||||
kakaoPayCancelResponse.getCanceledAt()
|
||||
);
|
||||
}
|
||||
|
||||
public PaymentRefundResponse toResponse() {
|
||||
return new PaymentRefundResponse(
|
||||
paymentId,
|
||||
ticketIds,
|
||||
movieTitle,
|
||||
cancelAmount,
|
||||
canceledAt
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
package com.ticketing.server.payment.service.interfaces;
|
||||
|
||||
import com.ticketing.server.movie.service.dto.TicketsRefundResponse;
|
||||
import com.ticketing.server.payment.api.KakaoPayClient;
|
||||
import com.ticketing.server.payment.api.KakaoPayProperties;
|
||||
import com.ticketing.server.payment.api.dto.requset.KakaoPayCancelRequest;
|
||||
import com.ticketing.server.payment.api.dto.response.KakaoPayCancelResponse;
|
||||
import com.ticketing.server.payment.domain.Payment;
|
||||
import com.ticketing.server.payment.service.dto.PaymentRefundDTO;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
@Validated
|
||||
public abstract class AbstractKakaoPayRefund {
|
||||
|
||||
private final KakaoPayClient kakaoPayClient;
|
||||
private final KakaoPayProperties kakaoPayProperties;
|
||||
|
||||
@Transactional
|
||||
public PaymentRefundDTO refund(@NotNull Long paymentId) {
|
||||
Payment payment = getPayment(paymentId);
|
||||
|
||||
// 내부 환불
|
||||
TicketsRefundResponse refundResponse = movieAndPaymentRefund(payment);
|
||||
|
||||
// 카카오페이 환불
|
||||
KakaoPayCancelResponse kakaoPayCancelResponse = kakaoPayClient.cancel(
|
||||
kakaoPayProperties.getAuthorization(),
|
||||
new KakaoPayCancelRequest(payment.getTid(), payment.getTotalPrice())
|
||||
);
|
||||
|
||||
return new PaymentRefundDTO(payment, kakaoPayCancelResponse, refundResponse);
|
||||
}
|
||||
|
||||
protected abstract Payment getPayment(Long paymentId);
|
||||
|
||||
protected abstract TicketsRefundResponse movieAndPaymentRefund(Payment payment);
|
||||
|
||||
}
|
||||
@@ -1,9 +1,22 @@
|
||||
package com.ticketing.server.payment.service.interfaces;
|
||||
|
||||
import com.ticketing.server.global.validator.constraints.NotEmptyCollection;
|
||||
import com.ticketing.server.payment.service.dto.PaymentCancelDTO;
|
||||
import com.ticketing.server.payment.service.dto.PaymentCompleteDTO;
|
||||
import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
|
||||
import com.ticketing.server.payment.service.dto.PaymentReadyDTO;
|
||||
import java.util.List;
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
public interface PaymentApisService {
|
||||
|
||||
PaymentDetailDTO findPaymentDetail(@NotNull Long paymentId);
|
||||
|
||||
PaymentReadyDTO ready(@NotEmptyCollection List<Long> ticketIds);
|
||||
|
||||
PaymentCompleteDTO complete(@NotEmpty String email, @NotEmpty String pgToken);
|
||||
|
||||
PaymentCancelDTO cancel(@NotEmpty String email);
|
||||
|
||||
}
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
package com.ticketing.server.user.application;
|
||||
|
||||
import com.ticketing.server.user.application.request.LoginRequest;
|
||||
import com.ticketing.server.user.application.request.RefreshRequest;
|
||||
import com.ticketing.server.user.application.response.LogoutResponse;
|
||||
import com.ticketing.server.user.service.dto.TokenDTO;
|
||||
import com.ticketing.server.user.application.response.TokenResponse;
|
||||
import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
|
||||
import com.ticketing.server.user.service.dto.TokenDTO;
|
||||
import com.ticketing.server.user.service.interfaces.AuthenticationService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -16,7 +17,6 @@ import org.springframework.security.core.userdetails.UserDetails;
|
||||
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
|
||||
@@ -37,8 +37,8 @@ public class AuthController {
|
||||
}
|
||||
|
||||
@PostMapping("/refresh")
|
||||
public ResponseEntity<TokenResponse> refreshToken(@RequestParam("refreshToken") String refreshToken) {
|
||||
TokenDTO tokenDto = authenticationService.reissueTokenDto(refreshToken);
|
||||
public ResponseEntity<TokenResponse> refreshToken(@RequestBody RefreshRequest request) {
|
||||
TokenDTO tokenDto = authenticationService.reissueTokenDto(request.getRefreshToken());
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.headers(getHttpHeaders())
|
||||
|
||||
@@ -9,6 +9,7 @@ import com.ticketing.server.user.application.request.UserChangePasswordRequest;
|
||||
import com.ticketing.server.user.application.request.UserDeleteRequest;
|
||||
import com.ticketing.server.user.application.response.PaymentsResponse;
|
||||
import com.ticketing.server.user.application.response.SignUpResponse;
|
||||
import com.ticketing.server.user.application.response.UserChangeGradeResponse;
|
||||
import com.ticketing.server.user.application.response.UserChangePasswordResponse;
|
||||
import com.ticketing.server.user.application.response.UserDeleteResponse;
|
||||
import com.ticketing.server.user.application.response.UserDetailResponse;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user