Compare commits

...

10 Commits

Author SHA1 Message Date
dongHyo
0e2ba4abae refactor: Exception Method 한 곳으로 이동 2022-07-06 02:54:03 +09:00
dongHyo
4abebf9a8c feat: findPayments 2022-07-06 02:47:06 +09:00
Kim DongHyo
fca765e9c3 feat: movie test data setup (#48)
feat: 영화 테스트 데이터 setup 구현
2022-07-05 19:03:01 +09:00
손창현
3ea3b88b1f Feature/get movie time list (#46)
* refactor: MovieTimeRepository - findValidMovieTimes 네이티브 쿼리 -> JPQL 변경

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

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

* refactor: MovieServiceImplTest - static factory method 적용

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

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

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

* feat: getMovieTimes API

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

* fix: MovieTimeRepositoryTest 오타 수정

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

* refactor: find List<MovieTime> with native query

* add: comment for endOfDay variable

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

* refactor: startOfDay 06:00 설정

* refactor: removed tmdb settings

* refactor: removed unnecessary comments

* refactor: removed unnecessary comments

* refactor: removed unnecessary imports

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

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

View File

@@ -1,5 +1,5 @@
# 🍿 Ticketing
영화 예매 서비스
영화 예매 사이트를 대용량 트래픽에 대응할 수 있도록 설계.
<br/>
@@ -8,13 +8,37 @@
- 기획 및 설계 : 22.04.13 ~
- 프로젝트 구현 :
<br/>
<br/><br/>
## 🎯 프로젝트 주요 관심사
- OOP(객체 지향 프로그래밍)의 장점을 최대한 활용
- 테스트 코드를 통한 믿을 수 있는 코드 작성
- 대용량 트래픽을 고려한 확장 가능한 설계 및 성능 튜닝
- 코드리뷰를 통해 코드 품질 향상
- 코드 컨벤션 준수하여 코드 통일성 유지
## 🎯 프로젝트 목표
<br/>
## 🛠 기술스택
- Java 11
- Spring Boot 2.6.7 (당시 최신 GA 버전)
- Gradle Kotlin DSL
- Spring Security
- Junit 5
- Hibernate / SpringJPA
- MySQL 8.0
- Redis
<br/><br/>
<br/>
## Wiki
- [Git Branch 전략](https://github.com/f-lab-edu/Ticketing/wiki#-git-branch-%EC%A0%84%EB%9E%B5)
- [Code Convention](https://github.com/f-lab-edu/Ticketing/wiki#-code-convention)
- [패키지 구조](https://github.com/f-lab-edu/Ticketing/wiki#-%ED%8C%A8%ED%82%A4%EC%A7%80-%EA%B5%AC%EC%A1%B0)
- [Use Case](https://github.com/f-lab-edu/Ticketing/wiki/Use-Case)
- [Prototype](https://github.com/f-lab-edu/Ticketing/wiki/Prototype)
<br/>
## 🧩 ERD
@@ -51,7 +75,6 @@ erDiagram
bigint id PK "상영시간표 ID"
bigint movie_id FK "영화 ID"
bigint theater_id FK "상영관 ID"
date running_date "상영 날짜"
int round "회차"
time start_at "시작 시간"
time end_at "종료 시간"
@@ -94,5 +117,3 @@ erDiagram
datetime updated_at "수정일시"
}
```
<br/><br/>

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,7 @@
package com.ticketing.server.user.application;
import static org.junit.jupiter.api.Assertions.*;
class UserControllerTest {
}

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,39 @@
package com.ticketing.server.movie.application;
import com.ticketing.server.movie.application.response.MovieTimeListResponse;
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 lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/api/movieTimes")
@Api(value = "MovieTime API", tags = {"Movie Time"})
@RequiredArgsConstructor
@Slf4j
public class MovieTimeController {
private final MovieTimeService movieTimeService;
@GetMapping
@ApiOperation(value = "영화 시간표 조회")
@Validated
public ResponseEntity<MovieTimeListResponse> getMovieTimes(
@ApiParam(value = "영화 제목", required = true) @RequestParam String title,
@ApiParam(value = "상영 날짜", required = true) @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate runningDate) {
return ResponseEntity.status(HttpStatus.OK).body(MovieTimeListResponse.from(movieTimeService.getMovieTimes(title, runningDate)));
}
}

View File

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

View File

@@ -1,6 +1,5 @@
package com.ticketing.server.movie.application.response;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ticketing.server.movie.service.dto.MovieDto;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
@@ -13,7 +12,6 @@ import lombok.Getter;
public class MovieListResponse {
@ApiModelProperty(value = "영화 제목")
@JsonProperty
private List<MovieDto> movieDtos;
public static MovieListResponse from(List<MovieDto> movieDtos) {

View File

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

View File

@@ -1,7 +1,6 @@
package com.ticketing.server.movie.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import com.ticketing.server.movie.service.dto.MovieDto;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.validation.constraints.NotNull;
@@ -15,15 +14,11 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
public class Movie extends AbstractEntity {
@NotNull
@Column(unique = true)
private String title;
@NotNull
@Column(unique = true)
private String title;
@NotNull
private Integer runningTime;
public MovieDto toDto() {
return new MovieDto(this.title);
}
@NotNull
private Long runningTime;
}

View File

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

View File

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

View File

@@ -6,9 +6,11 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Entity
@Getter
@NoArgsConstructor
public class Seat extends AbstractEntity {
@NotNull
@@ -16,10 +18,20 @@ public class Seat extends AbstractEntity {
@JoinColumn(name = "theater_id", referencedColumnName = "id", updatable = false)
private Theater theater;
@NotNull
private Integer seatColumn;
@NotNull
private Integer seatRow;
@NotNull
private Integer seatColumn;
public Seat(Integer seatRow, Integer seatColumn, Theater theater) {
this.seatRow = seatRow;
this.seatColumn = seatColumn;
setTheater(theater);
}
private void setTheater(Theater theater) {
this.theater = theater;
theater.addSeat(this);
}
}

View File

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

View File

@@ -1,15 +1,18 @@
package com.ticketing.server.movie.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import com.ticketing.server.payment.domain.Payment;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Entity
@Getter
@NoArgsConstructor
public class Ticket extends AbstractEntity {
@NotNull
@@ -20,16 +23,26 @@ public class Ticket extends AbstractEntity {
@NotNull
@ManyToOne
@JoinColumn(name = "movie_times_id", referencedColumnName = "id", updatable = false)
private MovieTimes movieTimes;
private MovieTime movieTime;
@ManyToOne
@JoinColumn(name = "payment_id", referencedColumnName = "id", updatable = false)
private Payment payment;
private Long paymentId;
@NotNull
@Enumerated(EnumType.STRING)
private TicketStatus status;
@NotNull
private Integer ticketPrice;
private Ticket(Seat seat, MovieTime movieTime, Integer ticketPrice) {
this.seat = seat;
this.movieTime = movieTime;
this.ticketPrice = ticketPrice;
this.status = TicketStatus.SALE;
}
public static Ticket of(Seat seat, MovieTime movieTime, Integer ticketPrice) {
return new Ticket(seat, movieTime, ticketPrice);
}
}

View File

@@ -6,10 +6,11 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum TicketStatus {
SALE("판매가능"),
SCHEDULED("환불"),
SOLD("판매완료");
private String name;
SALE("판매가능"),
SCHEDULED("환불"),
SOLD("판매완료");
private String name;
}

View File

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

View File

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

View File

@@ -21,7 +21,7 @@ public class MovieServiceImpl implements MovieService {
List<Movie> movies = movieRepository.findValidMovies();
return movies.stream()
.map(movie -> movie.toDto())
.map(MovieDto::from)
.collect(Collectors.toList());
}

View File

@@ -0,0 +1,43 @@
package com.ticketing.server.movie.service;
import com.ticketing.server.global.exception.ErrorCode;
import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.MovieTime;
import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
import com.ticketing.server.movie.service.dto.MovieTimeDto;
import com.ticketing.server.movie.service.interfaces.MovieTimeService;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
@Slf4j
public class MovieTimeServiceImpl implements MovieTimeService {
private final MovieRepository movieRepository;
private final MovieTimeRepository movieTimeRepository;
@Override
public List<MovieTimeDto> getMovieTimes(String title, LocalDate runningDate) {
Movie movie = movieRepository.findByTitle(title)
.orElseThrow(ErrorCode::throwMovieNotFound);
LocalDateTime startOfDay = runningDate.atStartOfDay().plusHours(6);
LocalDateTime endOfDay = startOfDay.plusDays(1);
List<MovieTime> movieTimes = movieTimeRepository.findValidMovieTimes(movie, startOfDay, endOfDay);
return movieTimes.stream()
.map(MovieTimeDto::from)
.collect(Collectors.toList());
}
}

View File

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

View File

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

View File

@@ -1,12 +1,18 @@
package com.ticketing.server.movie.service.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ticketing.server.movie.domain.Movie;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@AllArgsConstructor
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class MovieDto {
@JsonProperty
private String title;
public static MovieDto from(Movie movie) {
return new MovieDto(movie.getTitle());
}
}

View File

@@ -0,0 +1,28 @@
package com.ticketing.server.movie.service.dto;
import com.ticketing.server.movie.domain.MovieTime;
import java.time.LocalDateTime;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class MovieTimeDto {
private Long movieTimeId;
private Integer theaterNumber;
private Integer round;
private LocalDateTime startAt;
private LocalDateTime endAt;
public static MovieTimeDto from(MovieTime movieTime) {
return new MovieTimeDto(movieTime.getId(), movieTime.getTheater().getTheaterNumber(),
movieTime.getRound(), movieTime.getStartAt(), movieTime.getEndAt());
}
}

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,102 @@
package com.ticketing.server.movie.setup;
import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.MovieTime;
import com.ticketing.server.movie.domain.Seat;
import com.ticketing.server.movie.domain.Theater;
import com.ticketing.server.movie.domain.Ticket;
import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
import com.ticketing.server.movie.domain.repository.TheaterRepository;
import com.ticketing.server.movie.domain.repository.TicketRepository;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
@RequiredArgsConstructor
public class
MovieSetupService {
private final MovieRepository movieRepository;
private final MovieTimeRepository movieTimeRepository;
private final TheaterRepository theaterRepository;
private final TicketRepository ticketRepository;
@Transactional
public void init() {
initMovie();
initTheater();
initMovieTime();
initTicket();
}
private void initMovie() {
List<Movie> movies = Arrays.asList(
new Movie("탑건: 매버릭", 130L),
new Movie("헤어질 결심", 138L),
new Movie("마녀2", 137L),
new Movie("범죄도시2", 106L),
new Movie("버즈 라이트이어", 105L)
);
movieRepository.saveAll(movies);
}
private void initTheater() {
List<Theater> theaters = Arrays.asList(
new Theater(1),
new Theater(2)
);
for (Theater theater : theaters) {
for (int row = 1; row <= 2; row++) {
for (int col = 1; col <= 10; col++) {
new Seat(row, col, theater);
}
}
}
theaterRepository.saveAll(theaters);
}
private void initMovieTime() {
List<Movie> movies = movieRepository.findAll();
List<Theater> theaters = theaterRepository.findAll();
LocalDateTime now = LocalDateTime.now();
List<MovieTime> movieTimes = new ArrayList<>();
for (Theater theater : theaters) {
movieTimes.add(MovieTime.of(movies.get(0), theater, 1, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 8, 0)));
movieTimes.add(MovieTime.of(movies.get(0), theater, 3, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 12, 0)));
movieTimes.add(MovieTime.of(movies.get(1), theater, 2, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 10, 0)));
movieTimes.add(MovieTime.of(movies.get(2), theater, 4, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 14, 0)));
movieTimes.add(MovieTime.of(movies.get(0), theater, 5, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 16, 0)));
movieTimes.add(MovieTime.of(movies.get(3), theater, 6, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 18, 0)));
movieTimes.add(MovieTime.of(movies.get(0), theater, 7, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 21, 0)));
movieTimes.add(MovieTime.of(movies.get(4), theater, 8, LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 23, 0)));
}
movieTimeRepository.saveAll(movieTimes);
}
private void initTicket() {
List<MovieTime> movieTimes = movieTimeRepository.findAll();
List<Ticket> tickets = new ArrayList<>();
Integer ticketPrice = 15_000;
for (MovieTime movieTime : movieTimes) {
for (Seat seat : movieTime.getSeats()) {
tickets.add(Ticket.of(seat, movieTime, ticketPrice));
}
}
ticketRepository.saveAll(tickets);
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,6 +1,7 @@
package com.ticketing.server.user.application;
import com.ticketing.server.user.application.request.LoginRequest;
import com.ticketing.server.user.application.response.LogoutResponse;
import com.ticketing.server.user.application.response.TokenDto;
import com.ticketing.server.user.service.interfaces.AuthenticationService;
import lombok.RequiredArgsConstructor;
@@ -8,6 +9,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
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;
@@ -40,6 +43,14 @@ public class AuthController {
.body(tokenDto);
}
@PostMapping("/logout")
public ResponseEntity<LogoutResponse> logout(@AuthenticationPrincipal UserDetails userRequest) {
LogoutResponse logoutResponse = authenticationService.deleteRefreshToken(userRequest.getUsername());
return ResponseEntity.status(HttpStatus.OK)
.body(logoutResponse);
}
private HttpHeaders getHttpHeaders() {
HttpHeaders httpHeaders = new HttpHeaders();
httpHeaders.set(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, must-revalidate");

View File

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

View File

@@ -0,0 +1,28 @@
package com.ticketing.server.user.application.response;
import com.ticketing.server.global.redis.RefreshToken;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor(access = AccessLevel.PRIVATE)
public class LogoutResponse {
private Long refreshTokenId;
private String email;
private String refreshToken;
private LogoutResponse(String email) {
this.email = email;
}
public static LogoutResponse from(String email) {
return new LogoutResponse(email);
}
public static LogoutResponse from(RefreshToken refreshToken) {
return new LogoutResponse(refreshToken.getId(), refreshToken.getEmail(), refreshToken.getToken());
}
}

View File

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

View File

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

View File

@@ -1,14 +1,11 @@
package com.ticketing.server.user.service;
import static com.ticketing.server.global.exception.ErrorCode.REFRESH_TOKEN_NOT_FOUND;
import static com.ticketing.server.global.exception.ErrorCode.TOKEN_TYPE;
import static com.ticketing.server.global.exception.ErrorCode.UNAVAILABLE_REFRESH_TOKEN;
import com.ticketing.server.global.exception.TicketingException;
import com.ticketing.server.global.exception.ErrorCode;
import com.ticketing.server.global.redis.RefreshRedisRepository;
import com.ticketing.server.global.redis.RefreshToken;
import com.ticketing.server.global.security.jwt.JwtProperties;
import com.ticketing.server.global.security.jwt.JwtProvider;
import com.ticketing.server.user.application.response.LogoutResponse;
import com.ticketing.server.user.application.response.TokenDto;
import com.ticketing.server.user.service.interfaces.AuthenticationService;
import lombok.RequiredArgsConstructor;
@@ -62,11 +59,11 @@ public class AuthenticationServiceImpl implements AuthenticationService {
// Redis 에 토큰이 있는지 검증
RefreshToken findTokenEntity = refreshRedisRepository.findByEmail(authentication.getName())
.orElseThrow(() -> new TicketingException(REFRESH_TOKEN_NOT_FOUND));
.orElseThrow(ErrorCode::throwRefreshTokenNotFound);
// redis 토큰과 input 토큰이 일치한지 확인
if (!refreshToken.equals(findTokenEntity.getToken())) {
throw new TicketingException(UNAVAILABLE_REFRESH_TOKEN);
throw ErrorCode.throwUnavailableRefreshToken();
}
// 토큰 발급
@@ -79,11 +76,21 @@ public class AuthenticationServiceImpl implements AuthenticationService {
return tokenDto;
}
@Override
@Transactional
public LogoutResponse deleteRefreshToken(String email) {
return refreshRedisRepository.findByEmail(email)
.map(tokenDto -> {
refreshRedisRepository.delete(tokenDto);
return LogoutResponse.from(tokenDto);
}).orElseGet(() -> LogoutResponse.from(email));
}
private String resolveToken(String bearerToken) {
if (StringUtils.hasText(bearerToken) && jwtProperties.hasTokenStartsWith(bearerToken)) {
return bearerToken.substring(7);
}
throw new TicketingException(TOKEN_TYPE);
throw ErrorCode.throwTokenType();
}
}

View File

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

View File

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

View File

@@ -1,5 +1,6 @@
package com.ticketing.server.user.service.interfaces;
import com.ticketing.server.user.application.response.LogoutResponse;
import com.ticketing.server.user.application.response.TokenDto;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -9,4 +10,6 @@ public interface AuthenticationService {
TokenDto reissueTokenDto(String bearerRefreshToken);
LogoutResponse deleteRefreshToken(String email);
}

View File

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

View File

@@ -11,4 +11,4 @@ spring:
show_sql: true
format_sql: true
hibernate:
ddl-auto: update
ddl-auto: create

View File

@@ -1,13 +0,0 @@
package com.ticketing.server;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
class ServerApplicationTests {
@Test
void contextLoads() {
}
}

View File

@@ -0,0 +1,28 @@
package com.ticketing.server.movie.domain;
import static org.assertj.core.api.Assertions.assertThat;
import java.time.LocalDateTime;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
class MovieTimeTest {
@ParameterizedTest
@DisplayName("영화상영시간 생성")
@ValueSource(longs = {130L, 140L, 30L})
void createMovieTime(Long runningTime) {
// given
Movie movie = new Movie("범죄도시2", runningTime);
Theater theater = new Theater(1);
LocalDateTime startAt = LocalDateTime.of(2022, 7, 4, 8, 10);
// when
MovieTime movieTime = MovieTime.of(movie, theater, 1, startAt);
// then
assertThat(movieTime.getEndAt()).isEqualTo(startAt.plusMinutes(runningTime));
}
}

View File

@@ -0,0 +1,18 @@
package com.ticketing.server.movie.domain.repository;
import javax.transaction.Transactional;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
@Transactional
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class MovieTimeRepositoryTest {
@Autowired
MovieTimeRepository movieTimeRepository;
}

View File

@@ -35,26 +35,27 @@ public class MovieServiceImplTest {
@DisplayName("Movie Service Test - get movies when there is no movie")
void shouldGetEmptyList() {
// given
when(movieRepository.findValidMovies()).thenReturn(Collections.emptyList());
when(movieRepository.findValidMovies())
.thenReturn(Collections.emptyList());
// when
List<MovieDto> movieDtoList = movieService.getMovies();
// then
assertTrue(movieDtoList.isEmpty());
}
@Test
@DisplayName("Movie Service Test - get movies")
void shouldAbleToGetMovies() {
// given
movie = new Movie("범죄도시2", 106);
movieDto = movie.toDto();
movie = new Movie("범죄도시2", 106L);
movieDto = movieDto.from(movie);
movies.add(movie);
movieDtos.add(movieDto);
when(movieRepository.findValidMovies()).thenReturn(movies);
when(movieRepository.findValidMovies())
.thenReturn(movies);
// when
List<MovieDto> movieDtoList = movieService.getMovies();

View File

@@ -0,0 +1,85 @@
package com.ticketing.server.movie.service;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
import static org.mockito.ArgumentMatchers.any;
import com.ticketing.server.movie.domain.Movie;
import com.ticketing.server.movie.domain.MovieTime;
import com.ticketing.server.movie.domain.Theater;
import com.ticketing.server.movie.domain.repository.MovieRepository;
import com.ticketing.server.movie.domain.repository.MovieTimeRepository;
import com.ticketing.server.movie.service.dto.MovieTimeDto;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
public class MovieTimeServiceImplTest {
String title = "범죄도시2";
List<MovieTime> movieTimes = new ArrayList<>();
@Mock
MovieRepository movieRepository;
@Mock
MovieTimeRepository movieTimeRepository;
@InjectMocks
MovieTimeServiceImpl movieTimeService;
@Test
@DisplayName("MovieTime Service Test - get empty list when there is no valid movie times")
void shouldGetEmptyList() {
// given
Movie movie = new Movie(title, 106L);
when(movieRepository.findByTitle(title))
.thenReturn(Optional.of(movie));
when(movieTimeRepository.findValidMovieTimes(any(), any(), any()))
.thenReturn(Collections.emptyList());
// when
List<MovieTimeDto> movieTimeDtoList = movieTimeService.getMovieTimes(title, LocalDate.now());
// then
assertTrue(movieTimeDtoList.isEmpty());
}
@Test
@DisplayName("MovieTime Service Test - get list when there is valid movie times")
void shouldGetMovieTimeList() {
// given
Movie movie = new Movie(title, 106L);
Theater theater = new Theater(1);
MovieTime movieTime = MovieTime.of(movie, theater, 1,
LocalDateTime.of(2022, 7, 1, 17, 0, 0)
);
movieTimes.add(movieTime);
when(movieRepository.findByTitle(title))
.thenReturn(Optional.of(movie));
when(movieTimeRepository.findValidMovieTimes(any(), any(), any()))
.thenReturn(movieTimes);
// when
List<MovieTimeDto> movieTimeDtoList = movieTimeService.getMovieTimes(title, LocalDate.of(2022, 07, 01));
// then
assertTrue(!movieTimeDtoList.isEmpty());
}
}

View File

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

View File

@@ -1,31 +0,0 @@
package com.ticketing.server.user.domain.repository;
import static org.assertj.core.api.Assertions.assertThat;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.UserGrade;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.transaction.annotation.Transactional;
@SpringBootTest
@Transactional
class UserRepositoryTest {
@Autowired
UserRepository userRepository;
@Test
void 유저레포지토리테스트() {
// given
User user = new User("유저1", "email@gmail.com", "testPassword01", UserGrade.GUEST, "010-1234-5678");
// when
userRepository.save(user);
// then
assertThat(user).isNotNull();
}
}

View File

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

View File

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