refactor: testImplementation 와 다른 게 없어서 통합

README.md

@@ -1,5 +1,5 @@
 # 🍿 Ticketing
-영화 예매 사이트를 대용량 트래픽에 대응할 수 있도록 설계.
+영화 예매 서비스
 
 <br/>
 
@@ -8,43 +8,19 @@
 - 기획 및 설계 : 22.04.13 ~ 
 - 프로젝트 구현 :   
 
-<br/>
 
-## 🎯 프로젝트 주요 관심사
-- OOP(객체 지향 프로그래밍)의 장점을 최대한 활용
-- 테스트 코드를 통한 믿을 수 있는 코드 작성
-- 대용량 트래픽을 고려한 확장 가능한 설계 및 성능 튜닝
-- 코드리뷰를 통해 코드 품질 향상
-- 코드 컨벤션 준수하여 코드 통일성 유지
+<br/><br/>
 
-<br/>
+## 🎯 프로젝트 목표
 
-## 🛠 기술스택
-- Java 11
-- Spring Boot 2.6.7 (당시 최신 GA 버전)
-- Gradle Kotlin DSL
-- Spring Security
-- Junit 5
-- Hibernate / SpringJPA
-- MySQL 8.0
-- Redis
 
-<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/>
+<br/><br/>
 
 ## 🧩 ERD
 
 ``` mermaid
 erDiagram
-    MOVIE ||--o{ MOVIE_TIME : ""
+    MOVIE ||--o{ MOVIE_TIMES : ""
     MOVIE {
         bigint id PK "영화 ID"
         varchar title "영화제목"
@@ -52,7 +28,7 @@ erDiagram
         datetime created_at "등록일시"
         datetime updated_at "수정일시"
     }
-    THEATER ||--o{ MOVIE_TIME : ""
+    THEATER ||--o{ MOVIE_TIMES : ""
     THEATER ||--|{ SEAT : ""
     THEATER {
         bigint id PK "상영관 ID"
@@ -70,11 +46,12 @@ erDiagram
         datetime created_at "등록일시"
         datetime updated_at "수정일시"
     }
-    MOVIE_TIME ||--o{ TICKET : ""
-    MOVIE_TIME {
+    MOVIE_TIMES ||--o{ TICKET : ""
+    MOVIE_TIMES {
         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 "종료 시간"
@@ -84,8 +61,8 @@ erDiagram
     TICKET {
         bigint id PK "티켓 ID"
         bigint seat_id FK "좌석 ID"
-        bigint movie_time_id FK "상영시간표 ID"
-        bigint payment_id "결제 ID"
+        bigint movie_times_id FK "상영시간표 ID"
+        bigint payment_id FK "결제 ID"
         varchar status "상태 - 구매가능/예약진행중/판매완료"
         int ticket_price "가격"
         datetime created_at "등록일시"
@@ -94,8 +71,7 @@ erDiagram
     TICKET }|--|| PAYMENT : ""
     PAYMENT {
         bigint id PK "결제 ID"
-        bigint user_id "유저ID"
-        varchar movie_title "영화제목"
+        bigint user_id FK "유저ID"
         varchar type "결제 타입 - 예) 네이버페이, 카카오페이"
         varchar status "상태 - 완료/환불/실패"
         varchar failed_message "실패사유 - 컬럼명을 알아보기 쉬운가?"
@@ -118,3 +94,5 @@ erDiagram
         datetime updated_at "수정일시"
     }
 ```
+
+<br/><br/>

server/src/intTest/java/com/ticketing/server/movie/domain/repository/MovieRepositoryTest.java

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

server/src/intTest/java/com/ticketing/server/movie/domain/repository/TheaterRepositoryTest.java

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

server/src/main/java/com/ticketing/server/global/dto/repository/AbstractEntity.java

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

server/src/main/java/com/ticketing/server/global/exception/ErrorCode.java

@@ -2,7 +2,6 @@ package com.ticketing.server.global.exception;
 
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
 import static org.springframework.http.HttpStatus.CONFLICT;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
 import static org.springframework.http.HttpStatus.NOT_FOUND;
 
 import lombok.AllArgsConstructor;
@@ -18,79 +17,15 @@ public enum ErrorCode {
 	TOKEN_TYPE(BAD_REQUEST, "토큰 타입이 올바르지 않습니다."),
 	UNAVAILABLE_REFRESH_TOKEN(BAD_REQUEST, "사용할 수 없는 토큰 입니다."),
 
-	/* 403 FORBIDDEN : 접근 권한 제한 */
-	VALID_USER_ID(FORBIDDEN, "해당 정보에 접근 권한이 존재하지 않습니다."),
-
 	/* 404 NOT_FOUND : Resource 를 찾을 수 없음 */
-	USER_NOT_FOUND(NOT_FOUND, "해당 유저 정보를 찾을 수 없습니다."),
 	EMAIL_NOT_FOUND(NOT_FOUND, "해당 이메일을 찾을 수 없습니다."),
-	MOVIE_NOT_FOUND(NOT_FOUND, "해당 제목의 영화를 찾을 수 없습니다."),
 	REFRESH_TOKEN_NOT_FOUND(NOT_FOUND, "리프레쉬 토큰을 찾을 수 없습니다."),
-	PAYMENT_ID_NOT_FOUND(NOT_FOUND, "결제정보를 찾을 수 없습니다."),
 
 	/* 409 CONFLICT : Resource 의 현재 상태와 충돌. 보통 중복된 데이터 존재 */
 	DUPLICATE_EMAIL(CONFLICT, "이메일이 이미 존재합니다."),
-	DUPLICATE_PAYMENT(CONFLICT, "해당 좌석은 현재 판매된 좌석입니다."),
-	DUPLICATE_MOVIE(CONFLICT, "해당 영화 정보가 이미 존재합니다."),
 	DELETED_EMAIL(CONFLICT, "이미 삭제된 이메일 입니다.");
 
 	private final HttpStatus httpStatus;
 	private final String detail;
 
-	/* 400 BAD_REQUEST : 잘못된 요청 */
-	public static TicketingException throwMismatchPassword() {
-		throw new TicketingException(MISMATCH_PASSWORD);
-	}
-
-	public static TicketingException throwTokenType() {
-		throw new TicketingException(TOKEN_TYPE);
-	}
-
-	public static TicketingException throwUnavailableRefreshToken() {
-		throw new TicketingException(UNAVAILABLE_REFRESH_TOKEN);
-	}
-
-	/* 403 FORBIDDEN : 접근 권한 제한 */
-	public static TicketingException throwValidUserId() {
-		throw new TicketingException(VALID_USER_ID);
-	}
-
-	/* 404 NOT_FOUND : Resource 를 찾을 수 없음 */
-	public static TicketingException throwUserNotFound() {
-		throw new TicketingException(USER_NOT_FOUND);
-	}
-
-	public static TicketingException throwEmailNotFound() {
-		throw new TicketingException(EMAIL_NOT_FOUND);
-	}
-
-	public static TicketingException throwMovieNotFound() {
-		throw new TicketingException(MOVIE_NOT_FOUND);
-	}
-
-	public static TicketingException throwRefreshTokenNotFound() {
-		throw new TicketingException(REFRESH_TOKEN_NOT_FOUND);
-	}
-
-	public static TicketingException throwPaymentIdNotFound() {
-		throw new TicketingException(PAYMENT_ID_NOT_FOUND);
-	}
-
-	/* 409 CONFLICT : Resource 의 현재 상태와 충돌. 보통 중복된 데이터 존재 */
-	public static TicketingException throwDuplicateEmail() {
-		throw new TicketingException(DUPLICATE_EMAIL);
-	}
-
-	public static TicketingException throwDuplicatePayment() {
-		throw new TicketingException(DUPLICATE_PAYMENT);
-	}
-
-	public static TicketingException throwDuplicateMovie() {
-		throw new TicketingException(DUPLICATE_MOVIE);
-	}
-
-	public static TicketingException throwDeletedEmail() {
-		throw new TicketingException(DELETED_EMAIL);
-	}
-
 }

server/src/main/java/com/ticketing/server/global/exception/GlobalExceptionHandler.java

@@ -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;
@@ -54,8 +53,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
 
 		List<String> errors = generateErrors(ex);
 		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), errors);
-
-		return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
+		return handleExceptionInternal(ex, response, headers, response.getStatus(), request);
 	}
 
 	/***
@@ -68,7 +66,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
 
 		List<String> errors = generateErrors(ex);
 		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), errors);
-		return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
+		return handleExceptionInternal(ex, response, headers, response.getStatus(), request);
 	}
 
 	/**
@@ -240,7 +238,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
 		List<ObjectError> allErrors = ex.getBindingResult().getAllErrors();
 
 		for (ObjectError error : allErrors) {
-			errors.add(error.getDefaultMessage());
+			errors.add(((FieldError) error).getField() + ": " + error.getDefaultMessage());
 		}
 		return errors;
 	}

server/src/main/java/com/ticketing/server/global/security/WebSecurityConfig.java

@@ -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("/api/movies/**").permitAll()
 			.antMatchers("/l7check").permitAll()
 			.antMatchers("/actuator/**").permitAll()
 			.antMatchers("/api/v3/", "/swagger-ui/**", "/swagger/", "/swagger-resources/**", "/v3/api-docs").permitAll()

server/src/main/java/com/ticketing/server/global/security/jwt/handle/JwtAuthenticationEntryPoint.java

@@ -3,6 +3,7 @@ package com.ticketing.server.global.security.jwt.handle;
 import java.io.IOException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
@@ -22,5 +23,4 @@ public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
 	public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException {
 		resolver.resolveException(request, response, null, authException);
 	}
-
 }

server/src/main/java/com/ticketing/server/global/validator/constraints/FieldsValueNotMatch.java

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

server/src/main/java/com/ticketing/server/movie/application/MovieController.java

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

server/src/main/java/com/ticketing/server/movie/application/MovieTimeController.java

@@ -1,39 +0,0 @@
-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)));
-    }
-
-
-}

server/src/main/java/com/ticketing/server/movie/application/MovieTimesController.java

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

server/src/main/java/com/ticketing/server/movie/application/TicketController.java

@@ -1,30 +1,8 @@
 package com.ticketing.server.movie.application;
 
-import com.ticketing.server.movie.application.response.TicketDetailsResponse;
-import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
-import com.ticketing.server.movie.service.interfaces.TicketService;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequiredArgsConstructor
-@RequestMapping("/api/tickets")
-@Validated
 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());
-	}
-
 }

server/src/main/java/com/ticketing/server/movie/application/request/MovieRegisterRequest.java

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

server/src/main/java/com/ticketing/server/movie/application/response/MovieListResponse.java

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

server/src/main/java/com/ticketing/server/movie/application/response/MovieTimeListResponse.java

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

server/src/main/java/com/ticketing/server/movie/application/response/MovieTitleResponse.java

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

server/src/main/java/com/ticketing/server/movie/application/response/TicketDetailsResponse.java

@@ -1,16 +0,0 @@
-package com.ticketing.server.movie.application.response;
-
-import com.ticketing.server.payment.application.response.TicketDetailDTO;
-import java.util.List;
-import lombok.Getter;
-
-@Getter
-public class TicketDetailsResponse {
-
-	private final List<TicketDetailDTO> ticketDetails;
-
-	public TicketDetailsResponse(List<TicketDetailDTO> ticketDetails) {
-		this.ticketDetails = ticketDetails;
-	}
-
-}

server/src/main/java/com/ticketing/server/movie/domain/Movie.java

@@ -1,31 +1,29 @@
 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;
-import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@NoArgsConstructor
 @AllArgsConstructor
 public class Movie extends AbstractEntity {
 
-	@NotNull
-	@Column(unique = true)
-	private String title;
+    @NotNull
+    @Column(unique = true)
+    private String title;
 
-	@NotNull
-	private Long runningTime;
+    @NotNull
+    private Integer runningTime;
 
-	Movie(Long id, String title, Long runningTime) {
-		this.id = id;
-		this.title = title;
-		this.runningTime = runningTime;
-	}
+    public MovieDto toDto() {
+        return new MovieDto(this.title);
+    }
 
 }

server/src/main/java/com/ticketing/server/movie/domain/MovieTime.java

@@ -1,75 +0,0 @@
-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.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.validation.constraints.NotNull;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Entity
-@Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class MovieTime extends AbstractEntity {
-
-	@NotNull
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "movie_id", referencedColumnName = "id", updatable = false)
-	private Movie movie;
-
-	@NotNull
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "theater_id", referencedColumnName = "id", updatable = false)
-	private Theater theater;
-
-	@NotNull
-	private Integer round;
-
-	@NotNull
-	private LocalDateTime startAt;
-
-	@NotNull
-	private LocalDateTime endAt;
-
-	@OneToMany(mappedBy = "movieTime", cascade = CascadeType.ALL)
-	private List<Ticket> tickets = new ArrayList<>();
-
-	public MovieTime(Movie movie, Theater theater, int round, LocalDateTime startAt) {
-		this.movie = movie;
-		this.theater = theater;
-		this.round = round;
-		this.startAt = startAt;
-		this.endAt = generateEndAt(startAt);
-	}
-
-	MovieTime(Long id, Movie movie, Theater theater, int round, LocalDateTime startAt) {
-		this.id = id;
-		this.movie = movie;
-		this.theater = theater;
-		this.round = round;
-		this.startAt = startAt;
-		this.endAt = generateEndAt(startAt);
-	}
-
-	private LocalDateTime generateEndAt(LocalDateTime startAt) {
-		Long runningTime = movie.getRunningTime();
-		return startAt.plusMinutes(runningTime);
-	}
-
-	public String getMovieTitle() {
-		return this.movie.getTitle();
-	}
-
-	public List<Seat> getSeats() {
-		return this.theater.getSeats();
-	}
-
-}

server/src/main/java/com/ticketing/server/movie/domain/MovieTimes.java

@@ -0,0 +1,38 @@
+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;
+
+}

server/src/main/java/com/ticketing/server/movie/domain/Seat.java

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

server/src/main/java/com/ticketing/server/movie/domain/Theater.java

@@ -1,38 +1,21 @@
 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.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@NoArgsConstructor
+@AllArgsConstructor
 public class Theater extends AbstractEntity {
 
 	@NotNull
 	private Integer theaterNumber;
 
-	@OneToMany(mappedBy = "theater", cascade = CascadeType.ALL)
-	private List<Seat> seats = new ArrayList<>();
-
-	Theater(Long id, Integer theaterNumber) {
-		this.id = id;
-		this.theaterNumber = theaterNumber;
-	}
-
-	public Theater(Integer theaterNumber) {
-		this.theaterNumber = theaterNumber;
-	}
-
-	public void addSeat(Seat seat) {
-		seats.add(seat);
-	}
+	private Integer seatCount;
 
 }

server/src/main/java/com/ticketing/server/movie/domain/Ticket.java

@@ -1,89 +1,35 @@
 package com.ticketing.server.movie.domain;
 
 import com.ticketing.server.global.dto.repository.AbstractEntity;
-import com.ticketing.server.global.exception.ErrorCode;
-import java.time.LocalDateTime;
+import com.ticketing.server.payment.domain.Payment;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
-import lombok.AccessLevel;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Ticket extends AbstractEntity {
 
 	@NotNull
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne
 	@JoinColumn(name = "seat_id", referencedColumnName = "id", updatable = false)
 	private Seat seat;
 
 	@NotNull
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne
 	@JoinColumn(name = "movie_times_id", referencedColumnName = "id", updatable = false)
-	private MovieTime movieTime;
+	private MovieTimes movieTimes;
 
-	private Long paymentId;
+	@ManyToOne
+	@JoinColumn(name = "payment_id", referencedColumnName = "id", updatable = false)
+	private Payment payment;
 
 	@NotNull
-	@Enumerated(EnumType.STRING)
 	private TicketStatus status;
 
 	@NotNull
 	private Integer ticketPrice;
 
-	public Ticket(Seat seat, MovieTime movieTime, Integer ticketPrice) {
-		this.seat = seat;
-		this.movieTime = movieTime;
-		this.ticketPrice = ticketPrice;
-		this.status = TicketStatus.SALE;
-	}
-
-	Ticket(Long id, Seat seat, MovieTime movieTime, Integer ticketPrice) {
-		this.id = id;
-		this.seat = seat;
-		this.movieTime = movieTime;
-		this.ticketPrice = ticketPrice;
-		this.status = TicketStatus.SALE;
-	}
-
-	public Integer getColumn() {
-		return this.seat.getSeatColumn();
-	}
-
-	public Integer getRow() {
-		return this.seat.getSeatRow();
-	}
-
-	public LocalDateTime getStartAt() {
-		return this.movieTime.getStartAt();
-	}
-
-	public LocalDateTime getEndAt() {
-		return this.movieTime.getEndAt();
-	}
-
-	public Integer getTheaterNumber() {
-		return this.seat.getTheaterNumber();
-	}
-
-	public String getMovieTitle() {
-		return this.movieTime.getMovieTitle();
-	}
-
-	public void registerPayment(Long id) {
-		if (this.paymentId != null) {
-			throw ErrorCode.throwDuplicatePayment();
-		}
-
-		this.paymentId = id;
-	}
-
-
 }

server/src/main/java/com/ticketing/server/movie/domain/TicketStatus.java

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

server/src/main/java/com/ticketing/server/movie/domain/repository/MovieTimeRepository.java

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

server/src/main/java/com/ticketing/server/movie/domain/repository/MovieTimesRepository.java

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

server/src/main/java/com/ticketing/server/movie/domain/repository/TicketRepository.java

@@ -1,24 +1,10 @@
 package com.ticketing.server.movie.domain.repository;
 
 import com.ticketing.server.movie.domain.Ticket;
-import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface TicketRepository extends JpaRepository<Ticket, Long> {
 
-	@Query(
-		value =
-			"SELECT t "
-			+ "FROM Ticket t "
-			+ "JOIN FETCH t.movieTime mt "
-			+ "JOIN FETCH t.seat s "
-			+ "JOIN FETCH s.theater th "
-			+ "WHERE t.paymentId = :paymentId "
-	)
-	List<Ticket> findTicketFetchJoinByPaymentId(@Param("paymentId") Long paymentId);
-
 }

server/src/main/java/com/ticketing/server/movie/service/MovieServiceImpl.java

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

server/src/main/java/com/ticketing/server/movie/service/MovieTimeServiceImpl.java

@@ -1,43 +0,0 @@
-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());
-
-	}
-
-}

server/src/main/java/com/ticketing/server/movie/service/MovieTimesServiceImpl.java

@@ -0,0 +1,9 @@
+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 {
+
+}

server/src/main/java/com/ticketing/server/movie/service/TMBDServiceImpl.java

@@ -0,0 +1,9 @@
+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 {
+
+}

server/src/main/java/com/ticketing/server/movie/service/TicketServiceImpl.java

@@ -1,40 +1,9 @@
 package com.ticketing.server.movie.service;
 
-import com.ticketing.server.global.exception.ErrorCode;
-import com.ticketing.server.movie.domain.repository.TicketRepository;
-import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
 import com.ticketing.server.movie.service.interfaces.TicketService;
-import com.ticketing.server.payment.application.response.TicketDetailDTO;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
 
 @Service
-@RequiredArgsConstructor
-@Transactional(readOnly = true)
-@Validated
-@Slf4j
 public class TicketServiceImpl implements TicketService {
 
-	private final TicketRepository ticketRepository;
-
-	@Override
-	public TicketDetailsDTO findTicketsByPaymentId(@NotNull Long paymentId) {
-		List<TicketDetailDTO> ticketDetails = ticketRepository.findTicketFetchJoinByPaymentId(paymentId)
-			.stream()
-			.map(TicketDetailDTO::new)
-			.collect(Collectors.toList());
-
-		if (ticketDetails.isEmpty()) {
-			throw ErrorCode.throwPaymentIdNotFound();
-		}
-
-		return new TicketDetailsDTO(ticketDetails);
-	}
-
 }

server/src/main/java/com/ticketing/server/movie/service/dto/MovieDTO.java

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

server/src/main/java/com/ticketing/server/movie/service/dto/MovieDto.java

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

server/src/main/java/com/ticketing/server/movie/service/dto/MovieRegisterDTO.java

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

server/src/main/java/com/ticketing/server/movie/service/dto/MovieTimeDTO.java

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

server/src/main/java/com/ticketing/server/movie/service/dto/TicketDetailsDTO.java

@@ -1,18 +0,0 @@
-package com.ticketing.server.movie.service.dto;
-
-import com.ticketing.server.movie.application.response.TicketDetailsResponse;
-import com.ticketing.server.payment.application.response.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);
-	}
-}

server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieService.java

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

server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieTimeService.java

@@ -1,11 +0,0 @@
-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);
-
-}

server/src/main/java/com/ticketing/server/movie/service/interfaces/MovieTimesService.java

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

server/src/main/java/com/ticketing/server/movie/service/interfaces/TMDBService.java

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

server/src/main/java/com/ticketing/server/movie/service/interfaces/TicketService.java

@@ -1,10 +1,5 @@
 package com.ticketing.server.movie.service.interfaces;
 
-import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
-import javax.validation.constraints.NotNull;
-
 public interface TicketService {
 
-	TicketDetailsDTO findTicketsByPaymentId(@NotNull Long paymentId);
-
 }

server/src/main/java/com/ticketing/server/movie/setup/MovieSetupController.java

@@ -1,20 +0,0 @@
-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();
-	}
-
-}

server/src/main/java/com/ticketing/server/movie/setup/MovieSetupService.java

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

server/src/main/java/com/ticketing/server/payment/api/MovieClient.java

@@ -1,10 +0,0 @@
-package com.ticketing.server.payment.api;
-
-import com.ticketing.server.movie.application.response.TicketDetailsResponse;
-import javax.validation.constraints.NotNull;
-
-public interface MovieClient {
-
-	TicketDetailsResponse getTicketsByPaymentId(@NotNull Long paymentId);
-
-}

server/src/main/java/com/ticketing/server/payment/api/UserClient.java

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

server/src/main/java/com/ticketing/server/payment/api/dto/response/UserDetailResponse.java

@@ -1,34 +0,0 @@
-package com.ticketing.server.payment.api.dto.response;
-
-import com.ticketing.server.payment.domain.Payment;
-import com.ticketing.server.user.domain.UserGrade;
-import com.ticketing.server.user.service.dto.UserDetailDTO;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class UserDetailResponse {
-
-	private final Long userAlternateId;
-	private final String name;
-	private final String email;
-	private final UserGrade grade;
-	private final String phone;
-
-	public UserDetailResponse(UserDetailDTO userDetailDto) {
-		this(
-			userDetailDto.getAlternateId(),
-			userDetailDto.getName(),
-			userDetailDto.getEmail(),
-			userDetailDto.getGrade(),
-			userDetailDto.getPhone()
-		);
-	}
-
-	public boolean hasUserAlternateId(Payment payment) {
-		return userAlternateId.equals(payment.getUserAlternateId());
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/api/impl/MovieClientImpl.java

@@ -1,25 +0,0 @@
-package com.ticketing.server.payment.api.impl;
-
-import com.ticketing.server.movie.application.response.TicketDetailsResponse;
-import com.ticketing.server.movie.service.dto.TicketDetailsDTO;
-import com.ticketing.server.movie.service.interfaces.TicketService;
-import com.ticketing.server.payment.api.MovieClient;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-@Service
-@RequiredArgsConstructor
-@Validated
-public class MovieClientImpl implements MovieClient {
-
-	private final TicketService ticketService;
-
-	@Override
-	public TicketDetailsResponse getTicketsByPaymentId(@NotNull Long paymentId) {
-		TicketDetailsDTO ticketDetails = ticketService.findTicketsByPaymentId(paymentId);
-		return ticketDetails.toResponse();
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/api/impl/UserClientImpl.java

@@ -1,28 +0,0 @@
-package com.ticketing.server.payment.api.impl;
-
-import com.ticketing.server.payment.api.UserClient;
-import com.ticketing.server.payment.api.dto.response.UserDetailResponse;
-import com.ticketing.server.user.service.dto.UserDetailDTO;
-import com.ticketing.server.user.service.interfaces.UserService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.stereotype.Service;
-
-@Service
-@RequiredArgsConstructor
-public class UserClientImpl implements UserClient {
-
-	private final UserService userService;
-
-	@Override
-	public UserDetailResponse detail() {
-		Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-		UserDetails details = (UserDetails) authentication.getPrincipal();
-
-		UserDetailDTO userDetail = userService.findDetailByEmail(details.getUsername());
-		return new UserDetailResponse(userDetail);
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/application/PaymentController.java

@@ -1,42 +1,8 @@
 package com.ticketing.server.payment.application;
 
-import com.ticketing.server.payment.application.response.PaymentDetailResponse;
-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.payment.application.response.SimplePaymentsResponse;
-import com.ticketing.server.user.domain.UserGrade;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.annotation.Secured;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequiredArgsConstructor
-@RequestMapping("/api/payments")
-@Validated
 public class PaymentController {
 
-	private final PaymentApisService paymentApisService;
-	private final PaymentService paymentService;
-
-	@GetMapping
-	@Secured(UserGrade.ROLES.USER)
-	public ResponseEntity<SimplePaymentsResponse> simplePayments(@NotNull Long userAlternateId) {
-		SimplePaymentsDTO simplePayments = paymentService.findSimplePayments(userAlternateId);
-		return ResponseEntity.status(HttpStatus.OK).body(simplePayments.toResponse());
-	}
-
-	@GetMapping("/detail")
-	@Secured(UserGrade.ROLES.USER)
-	public ResponseEntity<PaymentDetailResponse> detail(@NotNull Long paymentId) {
-		PaymentDetailResponse paymentDetail = paymentApisService.findPaymentDetail(paymentId);
-		return ResponseEntity.status(HttpStatus.OK).body(paymentDetail);
-	}
-
 }

server/src/main/java/com/ticketing/server/payment/application/response/PaymentDetailResponse.java

@@ -1,38 +0,0 @@
-package com.ticketing.server.payment.application.response;
-
-import com.ticketing.server.movie.application.response.TicketDetailsResponse;
-import com.ticketing.server.payment.domain.Payment;
-import java.time.LocalDateTime;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class PaymentDetailResponse {
-
-	private Long paymentId;
-
-	private String movieTitle;
-
-	private String paymentNumber;
-
-	private Integer totalPrice;
-
-	private LocalDateTime createdAt;
-
-	List<TicketDetailDTO> tickets;
-
-	public PaymentDetailResponse(Payment payment, TicketDetailsResponse ticketDetails) {
-		this(
-			payment.getId(),
-			payment.getMovieTitle(),
-			payment.getPaymentNumber(),
-			payment.getTotalPrice(),
-			payment.getCreatedAt(),
-			ticketDetails.getTicketDetails()
-		);
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/application/response/SimplePaymentsResponse.java

@@ -1,16 +0,0 @@
-package com.ticketing.server.payment.application.response;
-
-import com.ticketing.server.payment.service.dto.SimplePaymentDTO;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class SimplePaymentsResponse {
-
-	private final Long userAlternateId;
-
-	private final List<SimplePaymentDTO> payments;
-
-}

server/src/main/java/com/ticketing/server/payment/application/response/TicketDetailDTO.java

@@ -1,36 +0,0 @@
-package com.ticketing.server.payment.application.response;
-
-import com.ticketing.server.movie.domain.Ticket;
-import java.time.LocalDateTime;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class TicketDetailDTO {
-
-	private Integer price;
-
-	private Integer theaterNumber;
-
-	private Integer column;
-
-	private Integer row;
-
-	private LocalDateTime startAt;
-
-	private LocalDateTime endAt;
-
-	public TicketDetailDTO(Ticket ticket) {
-		this(
-				ticket.getTicketPrice(),
-				ticket.getTheaterNumber(),
-				ticket.getColumn(),
-				ticket.getRow(),
-				ticket.getStartAt(),
-				ticket.getEndAt()
-			);
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/domain/Payment.java

@@ -1,67 +1,38 @@
 package com.ticketing.server.payment.domain;
 
 import com.ticketing.server.global.dto.repository.AbstractEntity;
-import javax.persistence.Column;
+import com.ticketing.server.user.domain.User;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
-import javax.validation.constraints.NotEmpty;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
-import lombok.AccessLevel;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Payment extends AbstractEntity {
 
 	@NotNull
-	@Column(name = "user_alternate_id", nullable = false)
-	private Long userAlternateId;
-
-	@NotEmpty
-	@Column(name = "movie_title", nullable = false)
-	private String movieTitle;
+	@ManyToOne
+	@JoinColumn(name = "user_id", referencedColumnName = "id", updatable = false)
+	private User user;
 
 	@NotNull
-	@Column(name = "type", nullable = false)
 	@Enumerated(value = EnumType.STRING)
 	private PaymentType type;
 
 	@NotNull
-	@Column(name = "status", nullable = false)
 	@Enumerated(value = EnumType.STRING)
 	private PaymentStatus status;
 
-	@Column(name = "failed_message")
 	private String failedMessage;
 
-	@NotEmpty
-	@Column(name = "payment_number", nullable = false)
+	@NotNull
 	private String paymentNumber;
 
 	@NotNull
-	@Column(name = "total_price", nullable = false)
 	private Integer totalPrice;
 
-	public Payment(Long userAlternateId, String movieTitle, PaymentType type, PaymentStatus status, String paymentNumber, Integer totalPrice) {
-		this.userAlternateId = userAlternateId;
-		this.movieTitle = movieTitle;
-		this.type = type;
-		this.status = status;
-		this.paymentNumber = paymentNumber;
-		this.totalPrice = totalPrice;
-	}
-
-	Payment(Long id, Long userAlternateId, String movieTitle, PaymentType type, PaymentStatus status, String paymentNumber, Integer totalPrice) {
-		this.id = id;
-		this.userAlternateId = userAlternateId;
-		this.movieTitle = movieTitle;
-		this.type = type;
-		this.status = status;
-		this.paymentNumber = paymentNumber;
-		this.totalPrice = totalPrice;
-	}
-
 }

server/src/main/java/com/ticketing/server/payment/domain/repository/PaymentRepository.java

@@ -1,13 +1,10 @@
 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> findByUserAlternateId(Long userId);
-
 }

server/src/main/java/com/ticketing/server/payment/service/PaymentApisServiceImpl.java

@@ -1,44 +0,0 @@
-package com.ticketing.server.payment.service;
-
-import com.ticketing.server.global.exception.ErrorCode;
-import com.ticketing.server.movie.application.response.TicketDetailsResponse;
-import com.ticketing.server.payment.api.MovieClient;
-import com.ticketing.server.payment.api.UserClient;
-import com.ticketing.server.payment.api.dto.response.UserDetailResponse;
-import com.ticketing.server.payment.application.response.PaymentDetailResponse;
-import com.ticketing.server.payment.domain.Payment;
-import com.ticketing.server.payment.domain.repository.PaymentRepository;
-import com.ticketing.server.payment.service.interfaces.PaymentApisService;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-@Service
-@RequiredArgsConstructor
-@Transactional(readOnly = true)
-@Validated
-@Slf4j
-public class PaymentApisServiceImpl implements PaymentApisService {
-
-	private final PaymentRepository paymentRepository;
-	private final MovieClient movieClient;
-	private final UserClient userClient;
-
-	@Override
-	public PaymentDetailResponse findPaymentDetail(@NotNull Long paymentId) {
-		Payment payment = paymentRepository.findById(paymentId)
-			.orElseThrow(ErrorCode::throwPaymentIdNotFound);
-
-		UserDetailResponse userDetail = userClient.detail();
-		if (!userDetail.hasUserAlternateId(payment)) {
-			throw ErrorCode.throwValidUserId();
-		}
-
-		TicketDetailsResponse tickets = movieClient.getTicketsByPaymentId(payment.getId());
-		return new PaymentDetailResponse(payment, tickets);
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/service/PaymentServiceImpl.java

@@ -1,37 +1,9 @@
 package com.ticketing.server.payment.service;
 
-import com.ticketing.server.payment.domain.repository.PaymentRepository;
-import com.ticketing.server.payment.service.dto.SimplePaymentDTO;
-import com.ticketing.server.payment.service.dto.SimplePaymentsDTO;
 import com.ticketing.server.payment.service.interfaces.PaymentService;
-import java.util.stream.Collectors;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
 
 @Service
-@RequiredArgsConstructor
-@Transactional(readOnly = true)
-@Validated
-@Slf4j
 public class PaymentServiceImpl implements PaymentService {
 
-	private final PaymentRepository paymentRepository;
-
-	@Override
-	public SimplePaymentsDTO findSimplePayments(@NotNull Long userAlternateId) {
-		return paymentRepository.findByUserAlternateId(userAlternateId)
-			.stream()
-			.map(SimplePaymentDTO::new)
-			.collect(Collectors
-				.collectingAndThen(
-					Collectors.toList()
-					, payments -> new SimplePaymentsDTO(userAlternateId, payments)
-				)
-			);
-	}
-
 }

server/src/main/java/com/ticketing/server/payment/service/dto/CreatePaymentDTO.java

@@ -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 Long userAlternateId;
-	private String movieTitle;
-	private PaymentType type;
-	private PaymentStatus status;
-	private String paymentNumber;
-	private Integer totalPrice;
-
-	public Payment toEntity() {
-		return new Payment
-			(
-				this.getUserAlternateId(),
-				this.getMovieTitle(),
-				this.getType(),
-				this.getStatus(),
-				this.getPaymentNumber(),
-				this.getTotalPrice()
-			);
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/service/dto/SimplePaymentDTO.java

@@ -1,25 +0,0 @@
-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 SimplePaymentDTO(Payment payment) {
-		this(
-			payment.getId(),
-			payment.getMovieTitle(),
-			payment.getPaymentNumber(),
-			payment.getTotalPrice()
-		);
-	}
-}

server/src/main/java/com/ticketing/server/payment/service/dto/SimplePaymentsDTO.java

@@ -1,19 +0,0 @@
-package com.ticketing.server.payment.service.dto;
-
-import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class SimplePaymentsDTO {
-
-	private final Long userAlternateId;
-	private final List<SimplePaymentDTO> payments;
-
-	public SimplePaymentsResponse toResponse() {
-		return new SimplePaymentsResponse(userAlternateId, payments);
-	}
-
-}

server/src/main/java/com/ticketing/server/payment/service/interfaces/PaymentApisService.java

@@ -1,9 +0,0 @@
-package com.ticketing.server.payment.service.interfaces;
-
-import com.ticketing.server.payment.application.response.PaymentDetailResponse;
-import javax.validation.constraints.NotNull;
-
-public interface PaymentApisService {
-
-	PaymentDetailResponse findPaymentDetail(@NotNull Long paymentId);
-}

server/src/main/java/com/ticketing/server/payment/service/interfaces/PaymentService.java

@@ -1,10 +1,5 @@
 package com.ticketing.server.payment.service.interfaces;
 
-import com.ticketing.server.payment.service.dto.SimplePaymentsDTO;
-import javax.validation.constraints.NotNull;
-
 public interface PaymentService {
 
-	SimplePaymentsDTO findSimplePayments(@NotNull Long userAlternateId);
-
 }

server/src/main/java/com/ticketing/server/user/api/PaymentClient.java

@@ -1,10 +0,0 @@
-package com.ticketing.server.user.api;
-
-import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
-import javax.validation.constraints.NotNull;
-
-public interface PaymentClient {
-
-	SimplePaymentsResponse getPayments(@NotNull Long alternateId);
-
-}

server/src/main/java/com/ticketing/server/user/api/impl/PaymentClientImpl.java

@@ -1,23 +0,0 @@
-package com.ticketing.server.user.api.impl;
-
-import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
-import com.ticketing.server.payment.service.dto.SimplePaymentsDTO;
-import com.ticketing.server.payment.service.interfaces.PaymentService;
-import com.ticketing.server.user.api.PaymentClient;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-@Service
-@RequiredArgsConstructor
-public class PaymentClientImpl implements PaymentClient {
-
-	private final PaymentService paymentService;
-
-	@Override
-	public SimplePaymentsResponse getPayments(@NotNull Long alternateId) {
-		SimplePaymentsDTO payments = paymentService.findSimplePayments(alternateId);
-		return payments.toResponse();
-	}
-
-}

server/src/main/java/com/ticketing/server/user/application/UserController.java

@@ -3,16 +3,13 @@ package com.ticketing.server.user.application;
 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.PaymentsResponse;
 import com.ticketing.server.user.application.response.SignUpResponse;
 import com.ticketing.server.user.application.response.UserChangePasswordResponse;
 import com.ticketing.server.user.application.response.UserDeleteResponse;
 import com.ticketing.server.user.application.response.UserDetailResponse;
 import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.domain.UserGrade;
-import com.ticketing.server.user.service.dto.UserDetailDTO;
-import com.ticketing.server.user.service.interfaces.UserApisService;
-import com.ticketing.server.user.service.interfaces.UserService;
+import com.ticketing.server.user.service.UserServiceImpl;
 import javax.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -36,8 +33,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 public class UserController {
 
-	private final UserApisService userApisService;
-	private final UserService userService;
+	private final UserServiceImpl userService;
 	private final PasswordEncoder passwordEncoder;
 
 	@PostMapping
@@ -47,21 +43,21 @@ public class UserController {
 	}
 
 	@GetMapping("/details")
-	@Secured(UserGrade.ROLES.USER)
+	@Secured("ROLE_GUEST")
 	public ResponseEntity<UserDetailResponse> details(@AuthenticationPrincipal UserDetails userRequest) {
-		UserDetailDTO userDetail = userService.findDetailByEmail(userRequest.getUsername());
-		return ResponseEntity.status(HttpStatus.OK).body(userDetail.toResponse());
+		User user = userService.findByEmail(userRequest.getUsername());
+		return ResponseEntity.status(HttpStatus.OK).body(UserDetailResponse.from(user));
 	}
 
 	@DeleteMapping
-	@Secured(UserGrade.ROLES.USER)
+	@Secured(UserGrade.ROLES.GUEST)
 	public ResponseEntity<UserDeleteResponse> deleteUser(@RequestBody @Valid UserDeleteRequest request) {
 		User user = userService.delete(request.toDeleteUserDto(passwordEncoder));
 		return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.from(user));
 	}
 
 	@PutMapping("/password")
-	@Secured(UserGrade.ROLES.USER)
+	@Secured(UserGrade.ROLES.GUEST)
 	public ResponseEntity<UserChangePasswordResponse> changePassword(
 		@AuthenticationPrincipal UserDetails userRequest,
 		@RequestBody @Valid UserChangePasswordRequest request) {
@@ -69,11 +65,4 @@ public class UserController {
 		return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.from(user));
 	}
 
-	@GetMapping("/payments")
-	@Secured(UserGrade.ROLES.USER)
-	public ResponseEntity<PaymentsResponse> getPayments(@AuthenticationPrincipal UserDetails userRequest) {
-		PaymentsResponse paymentDetails = userApisService.findPaymentsByEmail(userRequest.getUsername());
-		return ResponseEntity.status(HttpStatus.OK).body(paymentDetails);
-	}
-
 }

server/src/main/java/com/ticketing/server/user/application/response/PaymentsResponse.java

@@ -1,20 +0,0 @@
-package com.ticketing.server.user.application.response;
-
-import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
-import com.ticketing.server.payment.service.dto.SimplePaymentDTO;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class PaymentsResponse {
-
-	private String email;
-	private List<SimplePaymentDTO> payments;
-
-	public PaymentsResponse(String email, SimplePaymentsResponse simplePayments) {
-		this(email, simplePayments.getPayments());
-	}
-	
-}

server/src/main/java/com/ticketing/server/user/application/response/UserDetailResponse.java

@@ -1,27 +1,21 @@
 package com.ticketing.server.user.application.response;
 
+import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.domain.UserGrade;
-import com.ticketing.server.user.service.dto.UserDetailDTO;
-import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor
 public class UserDetailResponse {
 
-	private final String name;
-	private final String email;
-	private final UserGrade grade;
-	private final String phone;
+	private String name;
+	private String email;
+	private UserGrade grade;
+	private String phone;
 
-	public UserDetailResponse(UserDetailDTO userDetailDto) {
-		this(
-			userDetailDto.getName(),
-			userDetailDto.getEmail(),
-			userDetailDto.getGrade(),
-			userDetailDto.getPhone()
-		);
+	public static UserDetailResponse from(User user) {
+		return new UserDetailResponse(user.getName(), user.getEmail(), user.getGrade(), user.getPhone());
 	}
 
 }

server/src/main/java/com/ticketing/server/user/domain/SequenceGenerator.java

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

server/src/main/java/com/ticketing/server/user/domain/Snowflake.java

@@ -1,118 +0,0 @@
-package com.ticketing.server.user.domain;
-
-import java.net.NetworkInterface;
-import java.security.SecureRandom;
-import java.time.Instant;
-import java.util.Enumeration;
-import org.springframework.stereotype.Component;
-
-/**
- * Twitter Snowflake Custom.
- * https://github.com/callicoder/java-snowflake
- */
-@Component
-public class Snowflake implements SequenceGenerator {
-
-	private static final int EPOCH_BITS = 41;
-	private static final int NODE_ID_BITS = 10;
-	private static final int SEQUENCE_BITS = 12;
-
-	private static final long MAX_NODE_ID = (1L << NODE_ID_BITS) - 1;
-	private static final long MAX_SEQUENCE = (1L << SEQUENCE_BITS) - 1;
-
-	// Custom Epoch (January 1, 2015 Midnight UTC = 2015-01-01T00:00:00Z)
-	private static final long DEFAULT_CUSTOM_EPOCH = 1420070400000L;
-
-	private final long nodeId;
-	private final long customEpoch;
-
-	private volatile long lastTimestamp = -1L;
-	private volatile long sequence = 0L;
-
-	// Let Snowflake generate a nodeId
-	public Snowflake() {
-		this.nodeId = createNodeId();
-		this.customEpoch = DEFAULT_CUSTOM_EPOCH;
-	}
-
-	@Override
-	public Long generateId() {
-		return nextId();
-	}
-
-	private synchronized long nextId() {
-		long currentTimestamp = timestamp();
-
-		if(currentTimestamp < lastTimestamp) {
-			throw new IllegalStateException("Invalid System Clock!");
-		}
-
-		if (currentTimestamp == lastTimestamp) {
-			sequence = (sequence + 1) & MAX_SEQUENCE;
-			if(sequence == 0) {
-				// 동일 밀리초 시퀀스가 소진됐을 경우 대기.
-				currentTimestamp = waitNextMillis(currentTimestamp);
-			}
-		} else {
-			// 다음 밀리초 시퀀스 초기화.
-			sequence = 0;
-		}
-
-		lastTimestamp = currentTimestamp;
-		return currentTimestamp << (NODE_ID_BITS + SEQUENCE_BITS)
-			| (nodeId << SEQUENCE_BITS)
-			| sequence;
-	}
-
-	public long[] parse(long id) {
-		long maskNodeId = ((1L << NODE_ID_BITS) - 1) << SEQUENCE_BITS;
-		long maskSequence = (1L << SEQUENCE_BITS) - 1;
-
-		long timestamp = (id >> (NODE_ID_BITS + SEQUENCE_BITS)) + customEpoch;
-		long nodeId = (id & maskNodeId) >> SEQUENCE_BITS;
-		long sequence = id & maskSequence;
-
-		return new long[]{timestamp, nodeId, sequence};
-	}
-
-	private long timestamp() {
-		return Instant.now().toEpochMilli() - customEpoch;
-	}
-
-	private long waitNextMillis(long currentTimestamp) {
-		while (currentTimestamp == lastTimestamp) {
-			currentTimestamp = timestamp();
-		}
-		return currentTimestamp;
-	}
-
-	private long createNodeId() {
-		long nodeId;
-		try {
-			StringBuilder sb = new StringBuilder();
-			Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
-			while (networkInterfaces.hasMoreElements()) {
-				NetworkInterface networkInterface = networkInterfaces.nextElement();
-				byte[] mac = networkInterface.getHardwareAddress();
-				if (mac != null) {
-					for(byte macPort: mac) {
-						sb.append(String.format("%02X", macPort));
-					}
-				}
-			}
-			nodeId = sb.toString().hashCode();
-		} catch (Exception ex) {
-			nodeId = (new SecureRandom().nextInt());
-		}
-		nodeId = nodeId & MAX_NODE_ID;
-		return nodeId;
-	}
-
-	@Override
-	public String toString() {
-		return "Snowflake Settings [EPOCH_BITS=" + EPOCH_BITS + ", NODE_ID_BITS=" + NODE_ID_BITS
-			+ ", SEQUENCE_BITS=" + SEQUENCE_BITS + ", CUSTOM_EPOCH=" + customEpoch
-			+ ", NodeId=" + nodeId + "]";
-	}
-
-}

server/src/main/java/com/ticketing/server/user/domain/User.java

@@ -1,7 +1,10 @@
 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.ErrorCode;
+import com.ticketing.server.global.exception.TicketingException;
 import com.ticketing.server.global.validator.constraints.Phone;
 import com.ticketing.server.user.service.dto.ChangePasswordDTO;
 import com.ticketing.server.user.service.dto.DeleteUserDTO;
@@ -14,54 +17,42 @@ import javax.persistence.Enumerated;
 import javax.validation.constraints.Email;
 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)
+@NoArgsConstructor
 public class User extends AbstractEntity {
 
-	@Column(name = "alternate_key", unique = true, nullable = false)
-	@NotNull(message = "{validation.not.null.alternate.key}")
-	private Long alternateId;
-
-	@Column(name = "name", nullable = false)
+	@Column(name = "name")
 	@NotEmpty(message = "{validation.not.empty.name}")
 	private String name;
 
-	@Column(name = "email", unique = true, nullable = false)
+	@Column(name = "email")
 	@NotEmpty(message = "{validation.not.empty.email}")
 	@Email(message = "{validation.email}")
 	private String email;
 
-	@Column(name = "password", nullable = false)
+	@Column(name = "password")
 	@NotEmpty(message = "{validation.not.empty.password}")
 	private String password;
 
-	@Column(name = "grade", nullable = false)
-	@NotNull(message = "{validation.not.null.grade}")
+	@Column(name = "grade")
+	@NotNull(message = "{validation.not.empty.grade}")
 	@Enumerated(value = EnumType.STRING)
-	private UserGrade grade = UserGrade.USER;
+	private UserGrade grade = UserGrade.GUEST;
 
-	@Column(name = "phone", nullable = false)
+	@Column(name = "phone")
 	@NotEmpty(message = "{validation.not.empty.phone}")
 	@Phone
 	private String phone;
 
-	public User(Long alternateId, String name, String email, String password, UserGrade grade, String phone) {
-		this.alternateId = alternateId;
-		this.name = name;
-		this.email = email;
-		this.password = password;
-		this.grade = grade;
-		this.phone = phone;
-	}
+	private boolean isDeleted = false;
 
-	User(Long id, Long alternateId, String name, String email, String password, UserGrade grade, String phone) {
-		this.id = id;
-		this.alternateId = alternateId;
+	private LocalDateTime deletedAt;
+
+	public User(String name, String email, String password, UserGrade grade, String phone) {
 		this.name = name;
 		this.email = email;
 		this.password = password;
@@ -70,12 +61,13 @@ public class User extends AbstractEntity {
 	}
 
 	public User delete(DeleteUserDTO deleteUser) {
-		if (deletedAt != null) {
-			throw ErrorCode.throwDeletedEmail();
+		if (isDeleted) {
+			throw new TicketingException(DELETED_EMAIL);
 		}
 
 		checkPassword(deleteUser);
 
+		isDeleted = true;
 		deletedAt = LocalDateTime.now();
 		return this;
 	}
@@ -89,7 +81,7 @@ public class User extends AbstractEntity {
 
 	public void checkPassword(PasswordMatches passwordMatches) {
 		if (!passwordMatches.passwordMatches(password)) {
-			throw ErrorCode.throwMismatchPassword();
+			throw new TicketingException(MISMATCH_PASSWORD);
 		}
 	}
 

server/src/main/java/com/ticketing/server/user/domain/UserGrade.java

@@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor;
 public enum UserGrade {
 	ADMIN(ROLES.ADMIN, null),
 	STAFF(ROLES.STAFF, ROLES.ADMIN),
-	USER(ROLES.USER, ROLES.STAFF);
+	GUEST(ROLES.GUEST, ROLES.STAFF);
 
 	private final String roleName;
 	private final String parentName;
@@ -15,7 +15,7 @@ public enum UserGrade {
 
 		public static final String ADMIN = "ROLE_ADMIN";
 		public static final String STAFF = "ROLE_STAFF";
-		public static final String USER = "ROLE_USER";
+		public static final String GUEST = "ROLE_GUEST";
 
 		private ROLES() {
 		}

server/src/main/java/com/ticketing/server/user/domain/repository/UserRepository.java

@@ -10,6 +10,6 @@ public interface UserRepository extends JpaRepository<User, Long> {
 
 	Optional<User> findByEmail(String email);
 
-	Optional<User> findByEmailAndDeletedAtNull(String email);
+	Optional<User> findByEmailAndIsDeletedFalse(String email);
 
 }

server/src/main/java/com/ticketing/server/user/service/AuthenticationServiceImpl.java

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

server/src/main/java/com/ticketing/server/user/service/CustomUserDetailsService.java

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

server/src/main/java/com/ticketing/server/user/service/UserApisServiceImpl.java

@@ -1,34 +0,0 @@
-package com.ticketing.server.user.service;
-
-import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
-import com.ticketing.server.user.api.PaymentClient;
-import com.ticketing.server.user.application.response.PaymentsResponse;
-import com.ticketing.server.user.domain.User;
-import com.ticketing.server.user.service.interfaces.UserApisService;
-import com.ticketing.server.user.service.interfaces.UserService;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-@Service
-@RequiredArgsConstructor
-@Transactional(readOnly = true)
-@Validated
-@Slf4j
-public class UserApisServiceImpl implements UserApisService {
-
-	private final PaymentClient paymentClient;
-	private final UserService userService;
-
-	@Override
-	public PaymentsResponse findPaymentsByEmail(@NotNull String email) {
-		User user = userService.findNotDeletedUserByEmail(email);
-		SimplePaymentsResponse simplePayments = paymentClient.getPayments(user.getAlternateId());
-
-		return new PaymentsResponse(user.getEmail(), simplePayments);
-	}
-
-}

server/src/main/java/com/ticketing/server/user/service/UserServiceImpl.java

@@ -1,17 +1,17 @@
 package com.ticketing.server.user.service;
 
-import com.ticketing.server.global.exception.ErrorCode;
-import com.ticketing.server.user.domain.SequenceGenerator;
+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.user.domain.User;
 import com.ticketing.server.user.domain.repository.UserRepository;
 import com.ticketing.server.user.service.dto.ChangePasswordDTO;
 import com.ticketing.server.user.service.dto.DeleteUserDTO;
 import com.ticketing.server.user.service.dto.SignUpDTO;
-import com.ticketing.server.user.service.dto.UserDetailDTO;
 import com.ticketing.server.user.service.interfaces.UserService;
 import java.util.Optional;
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -26,17 +26,16 @@ import org.springframework.validation.annotation.Validated;
 public class UserServiceImpl implements UserService {
 
 	private final UserRepository userRepository;
-	private final SequenceGenerator sequenceGenerator;
 
 	@Override
 	@Transactional
 	public User register(@Valid SignUpDTO signUpDto) {
 		Optional<User> user = userRepository.findByEmail(signUpDto.getEmail());
 		if (user.isEmpty()) {
-			return userRepository.save(signUpDto.toUser(sequenceGenerator.generateId()));
+			return userRepository.save(signUpDto.toUser());
 		}
 
-		throw ErrorCode.throwDuplicateEmail();
+		throw new TicketingException(DUPLICATE_EMAIL);
 	}
 
 	@Override
@@ -54,17 +53,18 @@ public class UserServiceImpl implements UserService {
 	}
 
 	@Override
-	public UserDetailDTO findDetailByEmail(@NotNull String email) {
-		User user = userRepository.findByEmail(email)
-			.orElseThrow(ErrorCode::throwEmailNotFound);
-
-		return new UserDetailDTO(user);
+	public User findByEmail(String email) {
+		return userRepository.findByEmail(email)
+			.orElseThrow(UserServiceImpl::throwEmailNotFound);
 	}
 
-	@Override
-	public User findNotDeletedUserByEmail(@NotNull String email) {
-		return userRepository.findByEmailAndDeletedAtNull(email)
-			.orElseThrow(ErrorCode::throwEmailNotFound);
+	private User findNotDeletedUserByEmail(String email) {
+		return userRepository.findByEmailAndIsDeletedFalse(email)
+			.orElseThrow(UserServiceImpl::throwEmailNotFound);
+	}
+
+	private static RuntimeException throwEmailNotFound() {
+		throw new TicketingException(EMAIL_NOT_FOUND);
 	}
 
 }

server/src/main/java/com/ticketing/server/user/service/dto/SignUpDTO.java

@@ -5,11 +5,9 @@ import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.domain.UserGrade;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotEmpty;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
 public class SignUpDTO {
 
 	@NotEmpty(message = "{validation.not.empty.name}")
@@ -26,8 +24,15 @@ public class SignUpDTO {
 	@Phone
 	private String phone;
 
-	public User toUser(long alternateId) {
-		return new User(alternateId, this.name, this.email, password, UserGrade.USER, this.phone);
+	public SignUpDTO(String name, String email, String password, String phone) {
+		this.name = name;
+		this.email = email;
+		this.password = password;
+		this.phone = phone;
+	}
+
+	public User toUser() {
+		return new User(this.name, this.email, password, UserGrade.GUEST, this.phone);
 	}
 
 	@Override

server/src/main/java/com/ticketing/server/user/service/dto/UserDetailDTO.java

@@ -1,33 +0,0 @@
-package com.ticketing.server.user.service.dto;
-
-import com.ticketing.server.user.application.response.UserDetailResponse;
-import com.ticketing.server.user.domain.User;
-import com.ticketing.server.user.domain.UserGrade;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class UserDetailDTO {
-
-	private Long alternateId;
-	private String name;
-	private String email;
-	private UserGrade grade;
-	private String phone;
-
-	public UserDetailDTO(User user) {
-		this(
-			user.getAlternateId(),
-			user.getName(),
-			user.getEmail(),
-			user.getGrade(),
-			user.getPhone()
-		);
-	}
-
-	public UserDetailResponse toResponse() {
-		return new UserDetailResponse(this);
-	}
-}

server/src/main/java/com/ticketing/server/user/service/interfaces/UserApisService.java

@@ -1,10 +0,0 @@
-package com.ticketing.server.user.service.interfaces;
-
-import com.ticketing.server.user.application.response.PaymentsResponse;
-import javax.validation.constraints.NotNull;
-
-public interface UserApisService {
-
-	PaymentsResponse findPaymentsByEmail(@NotNull String email);
-
-}

server/src/main/java/com/ticketing/server/user/service/interfaces/UserService.java

@@ -4,9 +4,7 @@ import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.service.dto.ChangePasswordDTO;
 import com.ticketing.server.user.service.dto.DeleteUserDTO;
 import com.ticketing.server.user.service.dto.SignUpDTO;
-import com.ticketing.server.user.service.dto.UserDetailDTO;
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 
 public interface UserService {
 
@@ -16,8 +14,5 @@ public interface UserService {
 
 	User changePassword(@Valid ChangePasswordDTO changePasswordDto);
 
-	UserDetailDTO findDetailByEmail(@NotNull String email);
-
-	User findNotDeletedUserByEmail(@NotNull String email);
-
+	User findByEmail(String email);
 }

server/src/main/resources/application-local.yml

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

server/src/main/resources/application.yml

@@ -32,7 +32,7 @@ jwt:
   refresh-header: REFRESH_TOKEN
   prefix: Bearer
   secret-key: Zi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXktZi1sYWItdGlja2V0aW5nLXByb2plY3Qtc3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXNlY3JldC1rZXkK
-  access-token-validity-in-seconds: 1800 # 30분
+  access-token-validity-in-seconds: 60 # 1분
   refresh-token-validity-in-seconds: 259200 # 3일
 
 springfox:

server/src/main/resources/i18n/messages.properties

@@ -3,11 +3,8 @@ validation.not.empty.email=\uC774\uBA54\uC77C\uC740 \uD544\uC218 \uC785\uB2C8\uB
 validation.not.empty.password=\uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4.
 validation.not.empty.oldpassword=\uD604\uC7AC \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4.
 validation.not.empty.newpassword=\uBCC0\uACBD\uD560 \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4.
+validation.not.empty.grade=\uC0AC\uC6A9\uC790 \uB4F1\uAE09\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4.
 validation.not.empty.phone=\uD734\uB300\uBC88\uD638\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4.
-validation.not.null.grade=\uC0AC\uC6A9\uC790 \uB4F1\uAE09\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4.
-validation.not.null.payment.id=\uACB0\uC81C ID\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4.
-validation.not.null.alternate.key=\uB300\uCCB4\uD0A4\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4.
 validation.email=\uC774\uBA54\uC77C\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 validation.phone=\uD734\uB300\uBC88\uD638\uAC00 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 validation.password.not.change=\uB3D9\uC77C\uD55C \uD328\uC2A4\uC6CC\uB4DC\uB85C \uBCC0\uACBD\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-

server/src/main/resources/i18n/messages_en.properties

@@ -3,10 +3,8 @@ validation.not.empty.email=email is required.
 validation.not.empty.password=password is required.
 validation.not.empty.oldpassword=Old Password is required.
 validation.not.empty.newpassword=New Password is required.
+validation.not.empty.grade=user grade is required.
 validation.not.empty.phone=phone is required.
-validation.not.null.grade=user grade is required.
-validation.not.null.payment.id=payment id is required.
-validation.not.null.alternate.key=alternate Key is required.
 validation.email=email is not valid.
 validation.phone=phone is not valid.
 validation.password.not.change=password not change.

server/src/main/resources/i18n/messages_ko.properties

@@ -3,11 +3,8 @@ validation.not.empty.email=\uC774\uBA54\uC77C\uC740 \uD544\uC218 \uC785\uB2C8\uB
 validation.not.empty.password=\uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4.
 validation.not.empty.oldpassword=\uD604\uC7AC \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4.
 validation.not.empty.newpassword=\uBCC0\uACBD\uD560 \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4.
+validation.not.empty.grade=\uC0AC\uC6A9\uC790 \uB4F1\uAE09\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4.
 validation.not.empty.phone=\uD734\uB300\uBC88\uD638\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4.
-validation.not.null.grade=\uC0AC\uC6A9\uC790 \uB4F1\uAE09\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4.
-validation.not.null.payment.id=\uACB0\uC81C ID\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4.
-validation.not.null.alternate.key=\uB300\uCCB4\uD0A4\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4.
 validation.email=\uC774\uBA54\uC77C\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 validation.phone=\uD734\uB300\uBC88\uD638\uAC00 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 validation.password.not.change=\uB3D9\uC77C\uD55C \uD328\uC2A4\uC6CC\uB4DC\uB85C \uBCC0\uACBD\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-

server/src/test/java/com/ticketing/server/global/security/jwt/TokenProviderTest.java

@@ -38,7 +38,7 @@ class TokenProviderTest {
 	@DisplayName("토큰 생성 성공")
 	void createTokenSuccess() {
 		// given
-		SimpleGrantedAuthority grantedAuthority = new SimpleGrantedAuthority(UserGrade.USER.name());
+		SimpleGrantedAuthority grantedAuthority = new SimpleGrantedAuthority(UserGrade.GUEST.name());
 		UsernamePasswordAuthenticationToken authenticationToken =
 			new UsernamePasswordAuthenticationToken("ticketing@gmail.com", "123456", Collections.singleton(grantedAuthority));
 
@@ -53,7 +53,7 @@ class TokenProviderTest {
 	@DisplayName("토큰 복호화 성공")
 	void getAuthentication() {
 		// given
-		SimpleGrantedAuthority grantedAuthority = new SimpleGrantedAuthority(UserGrade.USER.name());
+		SimpleGrantedAuthority grantedAuthority = new SimpleGrantedAuthority(UserGrade.GUEST.name());
 		UsernamePasswordAuthenticationToken authenticationToken =
 			new UsernamePasswordAuthenticationToken("ticketing@gmail.com", "123456", Collections.singleton(grantedAuthority));
 

server/src/test/java/com/ticketing/server/movie/domain/MovieTest.java

@@ -1,20 +0,0 @@
-package com.ticketing.server.movie.domain;
-
-import java.util.Arrays;
-import java.util.List;
-
-class MovieTest {
-
-	public static final List<Movie> MOVIES;
-
-	static {
-		MOVIES = Arrays.asList(
-			new Movie(1L, "탑건: 매버릭", 130L),
-			new Movie(2L, "헤어질 결심", 138L),
-			new Movie(3L, "마녀2", 137L),
-			new Movie(4L, "범죄도시2", 106L),
-			new Movie(5L, "버즈 라이트이어", 105L)
-		);
-	}
-
-}

server/src/test/java/com/ticketing/server/movie/domain/MovieTimeTest.java

@@ -1,63 +0,0 @@
-package com.ticketing.server.movie.domain;
-
-import static com.ticketing.server.movie.domain.MovieTest.MOVIES;
-import static com.ticketing.server.movie.domain.TheaterTest.THEATERS;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-
-class MovieTimeTest {
-
-	public static final List<MovieTime> MOVIE_TIMES;
-
-	static {
-		MOVIE_TIMES = new ArrayList<>();
-
-		LocalDateTime now = LocalDateTime.now();
-		List<LocalDateTime> startAts = Arrays.asList(
-			LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 8, 0),
-			LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 10, 0),
-			LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 12, 0),
-			LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 14, 0),
-			LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 16, 0),
-			LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 18, 0),
-			LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 21, 0),
-			LocalDateTime.of(now.getYear(), now.getMonthValue(), now.getDayOfMonth(), 23, 0)
-		);
-
-		Long idx = 1L;
-		for (Theater theater : THEATERS) {
-			MOVIE_TIMES.add(new MovieTime(idx++, MOVIES.get(0), theater, 1, startAts.get(0)));
-			MOVIE_TIMES.add(new MovieTime(idx++, MOVIES.get(0), theater, 3, startAts.get(1)));
-			MOVIE_TIMES.add(new MovieTime(idx++, MOVIES.get(1), theater, 2, startAts.get(2)));
-			MOVIE_TIMES.add(new MovieTime(idx++, MOVIES.get(2), theater, 4, startAts.get(3)));
-			MOVIE_TIMES.add(new MovieTime(idx++, MOVIES.get(0), theater, 5, startAts.get(4)));
-			MOVIE_TIMES.add(new MovieTime(idx++, MOVIES.get(3), theater, 6, startAts.get(5)));
-			MOVIE_TIMES.add(new MovieTime(idx++, MOVIES.get(0), theater, 7, startAts.get(6)));
-			MOVIE_TIMES.add(new MovieTime(idx++, MOVIES.get(4), theater, 8, startAts.get(7)));
-		}
-	}
-
-	@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 = new MovieTime(movie, theater, 1, startAt);
-
-		// then
-		assertThat(movieTime.getEndAt()).isEqualTo(startAt.plusMinutes(runningTime));
-	}
-
-}

server/src/test/java/com/ticketing/server/movie/domain/SeatTest.java

@@ -1,27 +0,0 @@
-package com.ticketing.server.movie.domain;
-
-import static com.ticketing.server.movie.domain.TheaterTest.THEATERS;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-class SeatTest {
-
-	public static final Map<Theater, List<Seat>> SEATS_BY_THEATER = new HashMap<>();
-
-	static {
-		Long idx = 1L;
-		for (Theater theater : THEATERS) {
-			List<Seat> seats = new ArrayList<>();
-			for (int col = 1; col <= 2; col++) {
-				for (int row = 1; row <= 10; row++) {
-					seats.add(new Seat(idx++, col, row, theater));
-				}
-			}
-			SEATS_BY_THEATER.put(theater, seats);
-		}
-	}
-
-}

server/src/test/java/com/ticketing/server/movie/domain/TheaterTest.java

@@ -1,19 +0,0 @@
-package com.ticketing.server.movie.domain;
-
-import java.util.Arrays;
-import java.util.List;
-
-class TheaterTest {
-
-	public static final List<Theater> THEATERS;
-
-	static {
-		THEATERS = Arrays.asList(
-			new Theater(1L, 1),
-			new Theater(2L, 2),
-			new Theater(3L, 3),
-			new Theater(4L, 4)
-		);
-	}
-
-}

server/src/test/java/com/ticketing/server/movie/domain/TicketTest.java

@@ -1,68 +0,0 @@
-package com.ticketing.server.movie.domain;
-
-import static com.ticketing.server.movie.domain.MovieTimeTest.MOVIE_TIMES;
-import static com.ticketing.server.movie.domain.SeatTest.SEATS_BY_THEATER;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import com.ticketing.server.global.exception.ErrorCode;
-import com.ticketing.server.global.exception.TicketingException;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-
-public class TicketTest {
-
-	List<Ticket> tickets;
-
-	@BeforeEach
-	void init() {
-		tickets = setupTickets();
-	}
-
-	public static List<Ticket> setupTickets() {
-		List<Ticket> tickets = new ArrayList<>();
-		Integer ticketPrice = 15_000;
-
-		Long id = 1L;
-		for (MovieTime movieTime : MOVIE_TIMES) {
-			List<Seat> seats = SEATS_BY_THEATER.get(movieTime.getTheater());
-			for (Seat seat : seats) {
-				tickets.add(new Ticket(id++, seat, movieTime, ticketPrice));
-			}
-		}
-		return tickets;
-	}
-
-	@Test
-	@DisplayName("티켓에 결제 ID 등록 성공")
-	void registerPaymentSuccess() {
-		// given
-		Ticket ticket = tickets.get(0);
-
-		// when
-		ticket.registerPayment(1L);
-
-		// then
-		assertThat(ticket.getPaymentId()).isEqualTo(1L);
-	}
-
-	@Test
-	@DisplayName("티켓에 결제 ID 등록 실패 - 이미 등록된 경우")
-	void registerPaymentFail_Duplicate() {
-		// given
-		Ticket ticket = tickets.get(0);
-
-		// when
-		ticket.registerPayment(1L);
-
-		// then
-		assertThatThrownBy(() -> ticket.registerPayment(1L))
-			.isInstanceOf(TicketingException.class)
-			.extracting("errorCode")
-			.isEqualTo(ErrorCode.DUPLICATE_PAYMENT);
-	}
-
-}

server/src/test/java/com/ticketing/server/movie/domain/repository/MovieTimeRepositoryTest.java

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

server/src/test/java/com/ticketing/server/movie/service/MovieServiceImplTest.java

@@ -5,10 +5,11 @@ import static org.mockito.Mockito.when;
 
 import com.ticketing.server.movie.domain.Movie;
 import com.ticketing.server.movie.domain.repository.MovieRepository;
-import com.ticketing.server.movie.service.dto.MovieDTO;
+import com.ticketing.server.movie.service.dto.MovieDto;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -20,9 +21,9 @@ import org.mockito.junit.jupiter.MockitoExtension;
 public class MovieServiceImplTest {
 
     Movie movie;
-    MovieDTO movieDto;
+    MovieDto movieDto;
     List<Movie> movies = new ArrayList<>();
-    List<MovieDTO> movieDTOS = new ArrayList<>();
+    List<MovieDto> movieDtos = new ArrayList<>();
 
     @Mock
     MovieRepository movieRepository;
@@ -34,33 +35,32 @@ 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();
+        List<MovieDto> movieDtoList = movieService.getMovies();
 
         // then
-        assertTrue(movieDTOList.isEmpty());
+        assertTrue(movieDtoList.isEmpty());
+
     }
 
     @Test
     @DisplayName("Movie Service Test - get movies")
     void shouldAbleToGetMovies() {
         // given
-        movie = new Movie("범죄도시2", 106L);
-        movieDto = movieDto.from(movie);
+        movie = new Movie("범죄도시2", 106);
+        movieDto = movie.toDto();
         movies.add(movie);
-        movieDTOS.add(movieDto);
+        movieDtos.add(movieDto);
 
-        when(movieRepository.findValidMovies())
-            .thenReturn(movies);
+        when(movieRepository.findValidMovies()).thenReturn(movies);
 
         // when
-        List<MovieDTO> movieDTOList = movieService.getMovies();
+        List<MovieDto> movieDtoList = movieService.getMovies();
 
         // then
-        assertTrue(!movieDTOList.isEmpty());
+        assertTrue(!movieDtoList.isEmpty());
     }
 
 }

server/src/test/java/com/ticketing/server/movie/service/MovieTimeServiceImplTest.java

@@ -1,85 +0,0 @@
-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 = new MovieTime(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());
-    }
-
-}

server/src/test/java/com/ticketing/server/movie/service/TicketServiceImplTest.java

@@ -1,65 +0,0 @@
-package com.ticketing.server.movie.service;
-
-import static com.ticketing.server.movie.domain.TicketTest.setupTickets;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.mockito.Mockito.when;
-
-import com.ticketing.server.global.exception.ErrorCode;
-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.TicketDetailsDTO;
-import com.ticketing.server.payment.application.response.TicketDetailDTO;
-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.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-class TicketServiceImplTest {
-
-	@Mock
-	TicketRepository ticketRepository;
-
-	@InjectMocks
-	TicketServiceImpl ticketService;
-
-	@Test
-	@DisplayName("paymentId 로 Ticket 목록 조회 실패 - paymentId 가 없는 경우")
-	void findTicketsByPaymentIdFail() {
-		// given
-		when(ticketRepository.findTicketFetchJoinByPaymentId(1L)).thenReturn(Collections.emptyList());
-
-		// when
-		// then
-		assertThatThrownBy(() -> ticketService.findTicketsByPaymentId(1L))
-			.isInstanceOf(TicketingException.class)
-			.extracting("errorCode")
-			.isEqualTo(ErrorCode.PAYMENT_ID_NOT_FOUND);
-	}
-
-	@Test
-	@DisplayName("paymentId 로 Ticket 목록 조회 성공")
-	void findTicketsByPaymentIdSuccess() {
-		// given
-		List<Ticket> tickets = setupTickets();
-		when(ticketRepository.findTicketFetchJoinByPaymentId(1L)).thenReturn(List.of(tickets.get(0)));
-
-		// when
-		TicketDetailsDTO ticketDetailDto = ticketService.findTicketsByPaymentId(1L);
-		List<TicketDetailDTO> ticketDetails = ticketDetailDto.getTicketDetails();
-
-		// then
-		assertAll(
-			() -> assertThat(ticketDetails).hasSize(1),
-			() -> assertThat(ticketDetails.get(0).getPrice()).isEqualTo(15_000)
-		);
-	}
-
-}

server/src/test/java/com/ticketing/server/payment/domain/PaymentTest.java

@@ -1,8 +0,0 @@
-package com.ticketing.server.payment.domain;
-
-public class PaymentTest {
-
-	public static final Payment PAYMENT_USER_1
-		= new Payment(1L, 111L, "탑건: 매버릭", PaymentType.KAKAO_PAY, PaymentStatus.COMPLETED, "2022-0710-4142", 30_000);
-
-}

server/src/test/java/com/ticketing/server/payment/service/PaymentApisServiceImplTest.java

@@ -1,119 +0,0 @@
-package com.ticketing.server.payment.service;
-
-import static com.ticketing.server.movie.domain.TicketTest.setupTickets;
-import static com.ticketing.server.payment.domain.PaymentTest.PAYMENT_USER_1;
-import static com.ticketing.server.user.domain.UserTest.provideCorrectUsers;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.mockito.Mockito.when;
-
-import com.ticketing.server.global.exception.ErrorCode;
-import com.ticketing.server.global.exception.TicketingException;
-import com.ticketing.server.movie.application.response.TicketDetailsResponse;
-import com.ticketing.server.movie.domain.Ticket;
-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.application.response.PaymentDetailResponse;
-import com.ticketing.server.payment.application.response.TicketDetailDTO;
-import com.ticketing.server.payment.domain.repository.PaymentRepository;
-import com.ticketing.server.user.domain.User;
-import com.ticketing.server.user.service.dto.UserDetailDTO;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-@ExtendWith(MockitoExtension.class)
-class PaymentApisServiceImplTest {
-
-	private Map<String, User> users;
-	private List<Ticket> tickets;
-
-	@Mock
-	UserClient userClient;
-
-	@Mock
-	MovieClient movieClient;
-
-	@Mock
-	PaymentRepository paymentRepository;
-
-
-	@InjectMocks
-	PaymentApisServiceImpl paymentApisService;
-
-	@BeforeEach
-	void init() {
-		users = provideCorrectUsers().collect(Collectors.toMap(User::getEmail, user -> user));
-		tickets = setupTickets();
-	}
-
-	@Test
-	@DisplayName("상세 결제정보 조회 실패 - paymentId 가 존재하지 않을 경우")
-	void findPaymentDetailNotPaymentIdFail() {
-		// given
-		when(paymentRepository.findById(1L)).thenReturn(Optional.empty());
-
-		// when
-		// then
-		assertThatThrownBy(() -> paymentApisService.findPaymentDetail(1L))
-			.isInstanceOf(TicketingException.class)
-			.extracting("errorCode")
-			.isEqualTo(ErrorCode.PAYMENT_ID_NOT_FOUND);
-	}
-
-	@Test
-	@DisplayName("상세 결제정보 조회 실패 - 결제UserId와 JWT 로그인 userId 불일치")
-	void findPaymentDetailUserIdFail() {
-		// given
-		when(paymentRepository.findById(1L)).thenReturn(Optional.of(PAYMENT_USER_1));
-
-		UserDetailDTO userDetail = new UserDetailDTO(users.get("ticketing2@gmail.com"));
-		when(userClient.detail()).thenReturn(new UserDetailResponse(userDetail));
-
-		// when
-		// then
-		assertThatThrownBy(() -> paymentApisService.findPaymentDetail(1L))
-			.isInstanceOf(TicketingException.class)
-			.extracting("errorCode")
-			.isEqualTo(ErrorCode.VALID_USER_ID);
-	}
-
-	@Test
-	@DisplayName("상세 결제정보 조회 성공")
-	void findPaymentDetailSuccess() {
-		// given
-		UserDetailDTO userDetail = new UserDetailDTO(users.get("ticketing1@gmail.com"));
-		TicketDetailsResponse response = new TicketDetailsResponse(Arrays.asList(
-			new TicketDetailDTO(tickets.get(0)),
-			new TicketDetailDTO(tickets.get(1))
-		));
-
-		when(paymentRepository.findById(1L)).thenReturn(Optional.of(PAYMENT_USER_1));
-		when(userClient.detail()).thenReturn(new UserDetailResponse(userDetail));
-		when(movieClient.getTicketsByPaymentId(1L)).thenReturn(response);
-
-		// when
-		PaymentDetailResponse paymentDetail = paymentApisService.findPaymentDetail(1L);
-
-		// then
-		assertAll(
-			() -> assertThat(paymentDetail.getPaymentId()).isEqualTo(1L),
-			() -> assertThat(paymentDetail.getMovieTitle()).isEqualTo("탑건: 매버릭"),
-			() -> assertThat(paymentDetail.getPaymentNumber()).isEqualTo("2022-0710-4142"),
-			() -> assertThat(paymentDetail.getTotalPrice()).isEqualTo(30_000),
-			() -> assertThat(paymentDetail.getTickets()).hasSize(2)
-		);
-	}
-
-}

server/src/test/java/com/ticketing/server/payment/service/PaymentServiceImplTest.java

@@ -1,65 +0,0 @@
-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.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.payment.service.dto.SimplePaymentsDTO;
-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("유저 대체키로 결제내역이 없을 경우")
-	void findSimplePaymentsZero() {
-		// given
-		when(paymentRepository.findByUserAlternateId(2L)).thenReturn(Collections.emptyList());
-
-		// when
-		SimplePaymentsDTO simplePayments = paymentService.findSimplePayments(2L);
-
-		// then
-		assertThat(simplePayments.getPayments()).isEmpty();
-	}
-
-	@ParameterizedTest
-	@DisplayName("유저 대체키로 간소 결제내역 조회 성공")
-	@ValueSource(longs = {1L, 2L, 100L, 154L})
-	void findSimplePaymentsSuccess(Long userAlternateId) {
-		// given
-		List<Payment> payments = Arrays.asList(
-			new CreatePaymentDTO(userAlternateId, "범죄도시2", KAKAO_PAY, COMPLETED, "004-323-77542", 15_000).toEntity(),
-			new CreatePaymentDTO(userAlternateId, "토르", KAKAO_PAY, COMPLETED, "004-323-77544", 30_000).toEntity()
-		);
-		when(paymentRepository.findByUserAlternateId(userAlternateId)).thenReturn(payments);
-
-		// when
-		SimplePaymentsDTO simplePayments = paymentService.findSimplePayments(userAlternateId);
-
-		// then
-		assertThat(simplePayments.getPayments()).hasSize(2);
-	}
-
-}

server/src/test/java/com/ticketing/server/user/domain/SnowflakeTest.java

@@ -1,87 +0,0 @@
-package com.ticketing.server.user.domain;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertAll;
-
-import java.time.Instant;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.stream.Collectors;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-
-class SnowflakeTest {
-
-	@Test
-	@DisplayName("비트 계산이 정상적으로 처리되었는지 확인")
-	void nextId_shouldGenerateIdWithCorrectBitsFilled() {
-		// given
-		int nodeId = 784;
-		int sequence = 0;
-		Snowflake snowflake = new Snowflake();
-		long beforeTimestamp = Instant.now().toEpochMilli();
-
-		// when
-		long id = snowflake.generateId();
-
-		// then
-		long[] attrs = snowflake.parse(id);
-		assertAll(
-			() -> assertThat(attrs[0] >= beforeTimestamp).isTrue(),
-			() -> assertThat(sequence).isEqualTo(attrs[2])
-		);
-	}
-
-	@Test
-	@DisplayName("50_000 번 돌렸을 시 유니크 ID 인지 확인")
-	void nextId_shouldGenerateUniqueId() {
-		// given
-		Set<Long> ids = new HashSet<>();
-		Snowflake snowflake = new Snowflake();
-		int iterations = 50_000;
-
-		// when
-		for (int i = 0; i < iterations; i++) {
-			ids.add(snowflake.generateId());
-		}
-
-		// then
-		assertThat(ids).hasSize(iterations);
-	}
-
-	@Test
-	@DisplayName("멀티스레드 환경 유니크 ID 테스트")
-	void nextId_shouldGenerateUniqueIdIfCalledFromMultipleThreads() throws InterruptedException, ExecutionException {
-		// given
-		int numThreads = 50;
-		ExecutorService executorService = Executors.newFixedThreadPool(numThreads);
-		CountDownLatch latch = new CountDownLatch(numThreads);
-
-		Snowflake snowflake = new Snowflake();
-		int iterations = 10_000;
-
-		// when
-		Future<Long>[] futures = new Future[iterations];
-		for (int i = 0; i < iterations; i++) {
-			futures[i] = executorService.submit(() -> {
-				long id = snowflake.generateId();
-				latch.countDown();
-				return id;
-			});
-		}
-
-		// then
-		latch.await();
-		
-		Set<Future<Long>> set = Arrays.stream(futures)
-			.collect(Collectors.toSet());
-		assertThat(set).hasSize(iterations);
-	}
-
-}