refactor: 정적팩토리메서드 네이밍 통일

README.md

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

server/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-	java
+    java
-	id("org.springframework.boot") version "2.6.7"
+    id("org.springframework.boot") version "2.6.7"
-	id("io.spring.dependency-management") version "1.0.11.RELEASE"
+    id("io.spring.dependency-management") version "1.0.11.RELEASE"
 }
 
 group = "com.ticketing"
@@ -9,20 +9,22 @@ version = "0.0.1-SNAPSHOT"
 
 val javaVersion = JavaVersion.VERSION_11
 java {
-	sourceCompatibility = javaVersion
+    sourceCompatibility = javaVersion
-	targetCompatibility = javaVersion
+    targetCompatibility = javaVersion
 }
 
 configurations {
-	compileOnly {
+    compileOnly {
-		extendsFrom(configurations.annotationProcessor.get())
+        extendsFrom(configurations.annotationProcessor.get())
-	}
+    }
 }
 
 repositories {
-	mavenCentral()
+    mavenCentral()
 }
 
+
+
 dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
 	implementation("org.springframework.boot:spring-boot-starter-security")
@@ -30,59 +32,37 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-web")
 	implementation("org.springframework.boot:spring-boot-starter-actuator")
 	implementation("org.springframework.boot:spring-boot-starter-log4j2")
-	implementation("org.projectlombok:lombok:1.18.24")
+	implementation("org.projectlombok:lombok:1.18.20")
-	implementation("io.springfox:springfox-boot-starter:3.0.0")
+	implementation("io.springfox:springfox-swagger2:3.0.0")
 	implementation("io.springfox:springfox-swagger-ui:3.0.0")
 	implementation("com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.4")
-	implementation("com.lmax:disruptor:3.4.4")
+	implementation("com.lmax:disruptor:3.4.2")
-	implementation("io.jsonwebtoken:jjwt-api:0.11.5")
+	implementation("io.jsonwebtoken:jjwt-api:0.11.2")
-	implementation("com.googlecode.json-simple:json-simple:1.1.1")
+  implementation("com.googlecode.json-simple:json-simple:1.1.1")
 	implementation("org.springframework.boot:spring-boot-starter-data-redis")
-	implementation("com.google.code.findbugs:jsr305:3.0.2")
 
-	modules {
+    modules {
-		module("org.springframework.boot:spring-boot-starter-logging") {
+        module("org.springframework.boot:spring-boot-starter-logging") {
-			replacedBy("org.springframework.boot:spring-boot-starter-log4j2", "Use Log4j2 instead of Logback")
+            replacedBy("org.springframework.boot:spring-boot-starter-log4j2", "Use Log4j2 instead of Logback")
-		}
+        }
-	}
+    }
 
-	compileOnly("org.projectlombok:lombok")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
-	runtimeOnly("mysql:mysql-connector-java")
+    testImplementation("org.springframework.security:spring-security-test")
-	runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.5")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
-	runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.5")
-	annotationProcessor("org.projectlombok:lombok")
-	annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 
-	testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
+    compileOnly("org.projectlombok:lombok")
-	testImplementation("org.springframework.boot:spring-boot-starter-test")
+    runtimeOnly("mysql:mysql-connector-java")
-	testImplementation("org.springframework.security:spring-security-test")
+    runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.2")
+    runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.11.2")
+    annotationProcessor("org.projectlombok:lombok")
+    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
+
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework.security:spring-security-test")
 }
 
 tasks.withType<Test> {
-	useJUnitPlatform()
+    useJUnitPlatform()
 }
-
-sourceSets {
-	create("intTest") {
-		compileClasspath += sourceSets.main.get().output
-		runtimeClasspath += sourceSets.main.get().output
-	}
-}
-
-val intTestImplementation by configurations.getting {
-	extendsFrom(configurations.implementation.get())
-}
-
-configurations["intTestRuntimeOnly"].extendsFrom(configurations.runtimeOnly.get())
-configurations["intTestImplementation"].extendsFrom(configurations.testImplementation.get())
-
-val integrationTest = task<Test>("integrationTest") {
-	description = "Runs integration tests."
-	group = "verification"
-
-	testClassesDirs = sourceSets["intTest"].output.classesDirs
-	classpath = sourceSets["intTest"].runtimeClasspath
-	shouldRunAfter("test")
-}
-
-tasks.check { dependsOn(integrationTest) }

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

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

server/src/intTest/java/com/ticketing/server/user/application/UserControllerTest.java

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

server/src/intTest/resources/application.yml

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

server/src/main/java/com/ticketing/server/global/config/SwaggerConfig.java

@@ -1,28 +1,14 @@
 package com.ticketing.server.global.config;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.springframework.boot.actuate.autoconfigure.endpoint.web.CorsEndpointProperties;
-import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
-import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
-import org.springframework.boot.actuate.endpoint.ExposableEndpoint;
-import org.springframework.boot.actuate.endpoint.web.EndpointLinksResolver;
-import org.springframework.boot.actuate.endpoint.web.EndpointMapping;
-import org.springframework.boot.actuate.endpoint.web.EndpointMediaTypes;
-import org.springframework.boot.actuate.endpoint.web.ExposableWebEndpoint;
-import org.springframework.boot.actuate.endpoint.web.WebEndpointsSupplier;
-import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpointsSupplier;
-import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier;
-import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
+import springfox.documentation.builders.ApiInfoBuilder;
-import org.springframework.util.StringUtils;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
 import springfox.documentation.service.ApiKey;
 import springfox.documentation.service.AuthorizationScope;
 import springfox.documentation.service.SecurityReference;
@@ -36,29 +22,27 @@ import springfox.documentation.swagger.web.UiConfigurationBuilder;
 @RequiredArgsConstructor
 public class SwaggerConfig {
 
+    public static final String SECURITY_SCHEMA_NAME = "Authorization";
+    public static final String AUTHORIZATION_SCOPE_GLOBAL = "global";
+    public static final String AUTHORIZATION_SCOPE_GLOBAL_DESC = "accessEverything";
+
     @Bean
     public Docket api() {
-        return new Docket(DocumentationType.OAS_30).useDefaultResponseMessages(false).select()
+        return new Docket(DocumentationType.OAS_30)
-            .apis(RequestHandlerSelectors.any()).paths(PathSelectors.ant("/api/**")).build()
+            .useDefaultResponseMessages(false)
+            .select()
+            .apis(RequestHandlerSelectors.any())
+            .paths(PathSelectors.ant("/api/**")).build()
+            .apiInfo(apiInfo())
             .securityContexts(Arrays.asList(securityContext()))
             .securitySchemes(Arrays.asList(apiKey()));
     }
 
-    @Bean
+    private ApiInfo apiInfo() {
-    public WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping(WebEndpointsSupplier webEndpointsSupplier, ServletEndpointsSupplier servletEndpointsSupplier, ControllerEndpointsSupplier controllerEndpointsSupplier, EndpointMediaTypes endpointMediaTypes, CorsEndpointProperties corsProperties, WebEndpointProperties webEndpointProperties, Environment environment) {
+        return new ApiInfoBuilder()
-        List<ExposableEndpoint<?>> allEndpoints = new ArrayList<>();
+            .title("Ticketing REST API Document")
-        Collection<ExposableWebEndpoint> webEndpoints = webEndpointsSupplier.getEndpoints();
+            .version("v1")
-        allEndpoints.addAll(webEndpoints);
+            .description("Ticketing REST API 문서").build();
-        allEndpoints.addAll(servletEndpointsSupplier.getEndpoints());
-        allEndpoints.addAll(controllerEndpointsSupplier.getEndpoints());
-        String basePath = webEndpointProperties.getBasePath();
-        EndpointMapping endpointMapping = new EndpointMapping(basePath);
-        boolean shouldRegisterLinksMapping = this.shouldRegisterLinksMapping(webEndpointProperties, environment, basePath);
-        return new WebMvcEndpointHandlerMapping(endpointMapping, webEndpoints, endpointMediaTypes, corsProperties.toCorsConfiguration(), new EndpointLinksResolver(allEndpoints, basePath), shouldRegisterLinksMapping, null);
-    }
-
-    private boolean shouldRegisterLinksMapping(WebEndpointProperties webEndpointProperties, Environment environment, String basePath) {
-        return webEndpointProperties.getDiscovery().isEnabled() && (StringUtils.hasText(basePath) || ManagementPortType.get(environment).equals(ManagementPortType.DIFFERENT));
     }
 
     private ApiKey apiKey() {
@@ -69,10 +53,6 @@ public class SwaggerConfig {
         return SecurityContext.builder().securityReferences(defaultAuth()).build();
     }
 
-    public static final String SECURITY_SCHEMA_NAME = "Authorization";
-    public static final String AUTHORIZATION_SCOPE_GLOBAL = "global";
-    public static final String AUTHORIZATION_SCOPE_GLOBAL_DESC = "accessEverything";
-
     private List<SecurityReference> defaultAuth() {
         AuthorizationScope authorizationScope = new AuthorizationScope(AUTHORIZATION_SCOPE_GLOBAL,
             AUTHORIZATION_SCOPE_GLOBAL_DESC);

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

@@ -19,15 +19,13 @@ 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;
 
 }

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

@@ -0,0 +1,9 @@
+package com.ticketing.server.global.exception;
+
+public class AlreadyDeletedException extends RuntimeException {
+
+	public AlreadyDeletedException(String message) {
+		super(message);
+	}
+
+}

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

@@ -0,0 +1,11 @@
+package com.ticketing.server.global.exception;
+
+public class EmailNotFoundException extends IllegalArgumentException {
+
+	private static final String MESSAGE = "존재하지 않는 이메일 입니다.";
+
+	public EmailNotFoundException() {
+		super(MESSAGE);
+	}
+
+}

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

@@ -1,101 +0,0 @@
-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;
-import lombok.Getter;
-import org.springframework.http.HttpStatus;
-
-@Getter
-@AllArgsConstructor
-public enum ErrorCode {
-
-	/* 400 BAD_REQUEST : 잘못된 요청 */
-	MISMATCH_PASSWORD(BAD_REQUEST, "비밀번호가 일치하지 않습니다."),
-	TOKEN_TYPE(BAD_REQUEST, "토큰 타입이 올바르지 않습니다."),
-	UNAVAILABLE_REFRESH_TOKEN(BAD_REQUEST, "사용할 수 없는 토큰 입니다."),
-	UNABLE_CHANGE_GRADE(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);
-	}
-
-	public static TicketingException throwUnableChangeGrade() {
-		throw new TicketingException(UNABLE_CHANGE_GRADE);
-	}
-
-	/* 403 FORBIDDEN : 접근 권한 제한 */
-	public static TicketingException throwValidUserId() {
-		throw new TicketingException(VALID_USER_ID);
-	}
-
-	/* 404 NOT_FOUND : Resource 를 찾을 수 없음 */
-	public static TicketingException throwUserNotFound() {
-		throw new TicketingException(USER_NOT_FOUND);
-	}
-
-	public static TicketingException throwEmailNotFound() {
-		throw new TicketingException(EMAIL_NOT_FOUND);
-	}
-
-	public static TicketingException throwMovieNotFound() {
-		throw new TicketingException(MOVIE_NOT_FOUND);
-	}
-
-	public static TicketingException throwRefreshTokenNotFound() {
-		throw new TicketingException(REFRESH_TOKEN_NOT_FOUND);
-	}
-
-	public static TicketingException throwPaymentIdNotFound() {
-		throw new TicketingException(PAYMENT_ID_NOT_FOUND);
-	}
-
-	/* 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/ErrorResponse.java

@@ -1,35 +0,0 @@
-package com.ticketing.server.global.exception;
-
-import java.util.List;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import org.springframework.http.HttpStatus;
-
-@Getter
-@EqualsAndHashCode
-public class ErrorResponse {
-
-	private final HttpStatus status;
-	private final String message;
-	private final List<String> errors;
-
-	public ErrorResponse(HttpStatus status, String message, List<String> errors) {
-		this.status = status;
-		this.message = message;
-		this.errors = errors;
-	}
-
-	public ErrorResponse(HttpStatus status, String message, String error) {
-		this.status = status;
-		this.message = message;
-		this.errors = List.of(error);
-	}
-
-	public static ErrorResponse toErrorResponse(ErrorCode errorCode) {
-		return new ErrorResponse(
-			errorCode.getHttpStatus(),
-			errorCode.name(),
-			errorCode.getDetail());
-	}
-
-}

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

@@ -1,248 +0,0 @@
-package com.ticketing.server.global.exception;
-
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
-import static org.springframework.http.HttpStatus.FORBIDDEN;
-import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
-import static org.springframework.http.HttpStatus.METHOD_NOT_ALLOWED;
-import static org.springframework.http.HttpStatus.NOT_FOUND;
-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;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.TypeMismatchException;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.validation.BindException;
-import org.springframework.validation.FieldError;
-import org.springframework.validation.ObjectError;
-import org.springframework.web.HttpMediaTypeNotSupportedException;
-import org.springframework.web.HttpRequestMethodNotSupportedException;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.MissingServletRequestParameterException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
-import org.springframework.web.multipart.support.MissingServletRequestPartException;
-import org.springframework.web.servlet.NoHandlerFoundException;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
-
-@Slf4j
-@RestControllerAdvice
-public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
-
-	/* 400 START */
-
-	/**
-	 * Valid 유효성 검사 실패
-	 */
-	@Override
-	protected ResponseEntity<Object> handleMethodArgumentNotValid(
-		MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-		log.error("MethodArgumentNotValidException :: ", ex);
-
-		List<String> errors = generateErrors(ex);
-		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), errors);
-
-		return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
-	}
-
-	/***
-	 * ModelAttribute 으로 binding error 발생
-	 */
-	@Override
-	protected ResponseEntity<Object> handleBindException(
-		BindException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-		log.error("BindException :: ", ex);
-
-		List<String> errors = generateErrors(ex);
-		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), errors);
-		return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
-	}
-
-	/**
-	 * 잘못된 유형으로 Bean 속성 설정
-	 */
-	@Override
-	protected ResponseEntity<Object> handleTypeMismatch(
-		TypeMismatchException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-		log.error("TypeMismatchException :: ", ex);
-
-		String error = ex.getValue() + " value for " + ex.getPropertyName() + " should be of type " + ex.getRequiredType();
-		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), error);
-		return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
-	}
-
-	/**
-	 * multipart/form-data 요청 실패
-	 */
-	@Override
-	protected ResponseEntity<Object> handleMissingServletRequestPart(
-		MissingServletRequestPartException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-		log.error("MissingServletRequestPartException :: ", ex);
-
-		String error = ex.getRequestPartName() + " part is missing";
-		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), error);
-		return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
-	}
-
-	/**
-	 * 필수 인수 누락
-	 */
-	@Override
-	protected ResponseEntity<Object> handleMissingServletRequestParameter(
-		MissingServletRequestParameterException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-		log.error("MissingServletRequestParameterException :: ", ex);
-
-		String error = ex.getParameterName() + " parameter is missing";
-		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), error);
-		return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
-	}
-
-	/**
-	 * 인수가 예상한 형식이 아닐 시
-	 */
-	@ExceptionHandler(value = MethodArgumentTypeMismatchException.class)
-	protected ResponseEntity<Object> handleMethodArgumentTypeMismatch(MethodArgumentTypeMismatchException ex) {
-		log.error("MethodArgumentTypeMismatchException :: ", ex);
-
-		String error = ex.getName() + " should be of type " + Objects.requireNonNull(ex.getRequiredType()).getName();
-		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), error);
-		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
-	}
-
-	/**
-	 * 제약 조건 위반
-	 */
-	@ExceptionHandler(value = ConstraintViolationException.class)
-	protected ResponseEntity<Object> handleConstraintViolation(ConstraintViolationException ex) {
-		log.error("ConstraintViolationException :: ", ex);
-
-		List<String> errors = new ArrayList<>();
-		for (ConstraintViolation<?> violation : ex.getConstraintViolations()) {
-			errors.add(violation.getRootBeanClass().getName() + " " + violation.getPropertyPath() + ": " + violation.getMessage());
-		}
-
-		ErrorResponse response = new ErrorResponse(BAD_REQUEST, ex.getLocalizedMessage(), errors);
-		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
-	}
-
-	/* 400 END */
-
-	/**
-	 * 404 발생
-	 */
-	@Override
-	protected ResponseEntity<Object> handleNoHandlerFoundException(
-		NoHandlerFoundException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-		log.error("NoHandlerFoundException :: ", ex);
-
-		String error = "No handler found for " + ex.getHttpMethod() + " " + ex.getRequestURL();
-		ErrorResponse response = new ErrorResponse(NOT_FOUND, ex.getLocalizedMessage(), error);
-		return ResponseEntity.status(response.getStatus()).headers(headers).body(response);
-	}
-
-	/**
-	 * 지원하지 않는 HTTP 메서드로 요청 405
-	 */
-	@Override
-	protected ResponseEntity<Object> handleHttpRequestMethodNotSupported(
-		HttpRequestMethodNotSupportedException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-		log.error("HttpRequestMethodNotSupportedException :: ", ex);
-
-		StringBuilder builder = new StringBuilder();
-		builder.append(ex.getMethod());
-		builder.append(" method is not supported for this request. Supported methods are ");
-
-		Set<HttpMethod> supportedHttpMethods = ex.getSupportedHttpMethods();
-		if (supportedHttpMethods != null) {
-			supportedHttpMethods.forEach(t -> builder.append(t).append(" "));
-		}
-
-		ErrorResponse response = new ErrorResponse(METHOD_NOT_ALLOWED, ex.getLocalizedMessage(), builder.toString());
-		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
-	}
-
-	/**
-	 * 지원되지 않는 미디어 유형으로 요청 415
-	 */
-	@Override
-	protected ResponseEntity<Object> handleHttpMediaTypeNotSupported(
-		HttpMediaTypeNotSupportedException ex, HttpHeaders headers, HttpStatus status, WebRequest request) {
-		log.error("HttpMediaTypeNotSupportedException :: ", ex);
-
-		StringBuilder builder = new StringBuilder();
-		builder.append(ex.getContentType());
-		builder.append(" media type is not supported. Supported media types are ");
-		ex.getSupportedMediaTypes().forEach(t -> builder.append(t).append(" "));
-
-		ErrorResponse response = new ErrorResponse(UNSUPPORTED_MEDIA_TYPE, ex.getLocalizedMessage(), builder.substring(0, builder.length() - 2));
-		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
-	}
-
-	/**
-	 * 특정 핸들러 없는 모든 예외 500
-	 */
-	@ExceptionHandler(value = Exception.class)
-	protected ResponseEntity<Object> handleAll(Exception ex) {
-		log.error("Exception :: ", ex);
-
-		ErrorResponse response = new ErrorResponse(INTERNAL_SERVER_ERROR, ex.getLocalizedMessage(), "오류가 발생했습니다.");
-		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
-	}
-
-	/**
-	 * 접근 권한이 없을 때
-	 */
-	@ExceptionHandler(value = AccessDeniedException.class)
-	protected ResponseEntity<ErrorResponse> handleAccessDeniedException(Exception ex) {
-		log.error("AccessDeniedException :: ", ex);
-
-		ErrorResponse response = new ErrorResponse(FORBIDDEN, ex.getLocalizedMessage(), "접근 권한이 없습니다.");
-		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
-	}
-
-	/**
-	 * 인증 정보가 없을 때
-	 */
-	@ExceptionHandler(value = AuthenticationException.class)
-	protected ResponseEntity<ErrorResponse> handleAuthenticationException(Exception ex) {
-		log.error("AuthenticationException :: ", ex);
-
-		ErrorResponse response = new ErrorResponse(UNAUTHORIZED, ex.getLocalizedMessage(), "로그인 후 이용하실 수 있습니다.");
-		return ResponseEntity.status(response.getStatus()).headers(new HttpHeaders()).body(response);
-	}
-
-	/**
-	 * 커스텀 예외 발생 시
-	 */
-	@ExceptionHandler(value = TicketingException.class)
-	protected ResponseEntity<ErrorResponse> ticketingException(TicketingException ex) {
-		log.error("TicketingException :: ", ex);
-
-		ErrorCode errorCode = ex.getErrorCode();
-		return ResponseEntity.status(errorCode.getHttpStatus()).body(ErrorResponse.toErrorResponse(errorCode));
-	}
-
-	private List<String> generateErrors(BindException ex) {
-		List<String> errors = new ArrayList<>();
-		List<ObjectError> allErrors = ex.getBindingResult().getAllErrors();
-
-		for (ObjectError error : allErrors) {
-			errors.add(error.getDefaultMessage());
-		}
-		return errors;
-	}
-
-}

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

@@ -0,0 +1,11 @@
+package com.ticketing.server.global.exception;
+
+public class PasswordMismatchException extends RuntimeException {
+
+	private static final String MESSAGE = "패스워드가 일치하지 않습니다";
+
+	public PasswordMismatchException() {
+		super(MESSAGE);
+	}
+
+}

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

@@ -1,12 +0,0 @@
-package com.ticketing.server.global.exception;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class TicketingException extends RuntimeException {
-
-	private final ErrorCode errorCode;
-
-}

server/src/main/java/com/ticketing/server/global/exception/token/TokenException.java

@@ -0,0 +1,9 @@
+package com.ticketing.server.global.exception.token;
+
+public class TokenException extends RuntimeException {
+
+	public TokenException(String message) {
+		super(message);
+	}
+
+}

server/src/main/java/com/ticketing/server/global/exception/token/TokenNotFindException.java

@@ -0,0 +1,10 @@
+package com.ticketing.server.global.exception.token;
+
+public class TokenNotFindException extends TokenException {
+
+	private static final String MESSAGE = "일치하는 토큰을 찾지 못하였습니다.";
+
+	public TokenNotFindException() {
+		super(MESSAGE);
+	}
+}

server/src/main/java/com/ticketing/server/global/exception/token/TokenTypeException.java

@@ -0,0 +1,10 @@
+package com.ticketing.server.global.exception.token;
+
+public class TokenTypeException extends TokenException {
+
+	private static final String MESSAGE = "토큰 타입이 일치하지 않습니다.";
+
+	public TokenTypeException() {
+		super(MESSAGE);
+	}
+}

server/src/main/java/com/ticketing/server/global/exception/token/UnavailableRefreshTokenException.java

@@ -0,0 +1,11 @@
+package com.ticketing.server.global.exception.token;
+
+public class UnavailableRefreshTokenException extends TokenException {
+
+	private static final String MESSAGE = "사용할 수 없는 refresh Token 입니다.";
+
+	public UnavailableRefreshTokenException() {
+		super(MESSAGE);
+	}
+
+}

server/src/main/java/com/ticketing/server/global/factory/YamlPropertySourceFactory.java

@@ -5,23 +5,19 @@ import java.util.Properties;
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
 import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.EncodedResource;
 import org.springframework.core.io.support.PropertySourceFactory;
-import org.springframework.lang.Nullable;
-import org.springframework.util.StringUtils;
 
 public class YamlPropertySourceFactory implements PropertySourceFactory {
 
 	@Override
-	public PropertySource<?> createPropertySource(@Nullable String name, EncodedResource resource) {
+	public PropertySource<?> createPropertySource(String name, EncodedResource encodedResource) {
-		Properties yamlProperties = loadYamlProperties(resource);
+		Resource resource = encodedResource.getResource();
-		String sourceName = StringUtils.hasText(name) ? name : resource.getResource().getFilename();
+		YamlPropertiesFactoryBean factoryBean = new YamlPropertiesFactoryBean();
-		return new PropertiesPropertySource(Objects.requireNonNull(sourceName), Objects.requireNonNull(yamlProperties));
+		factoryBean.setResources(resource);
-	}
 
-	private Properties loadYamlProperties(EncodedResource resource) {
+		Properties properties = factoryBean.getObject();
-		YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
+		return new PropertiesPropertySource(Objects.requireNonNull(resource.getFilename()), Objects.requireNonNull(properties));
-		factory.setResources(resource.getResource());
-		return factory.getObject();
 	}
 }

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

@@ -1,56 +0,0 @@
-package com.ticketing.server.global.security;
-
-import com.ticketing.server.user.domain.UserGrade;
-import java.util.ArrayList;
-import java.util.List;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.access.AccessDecisionManager;
-import org.springframework.security.access.AccessDecisionVoter;
-import org.springframework.security.access.annotation.Jsr250Voter;
-import org.springframework.security.access.expression.method.ExpressionBasedPreInvocationAdvice;
-import org.springframework.security.access.hierarchicalroles.RoleHierarchy;
-import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl;
-import org.springframework.security.access.prepost.PreInvocationAuthorizationAdviceVoter;
-import org.springframework.security.access.vote.AffirmativeBased;
-import org.springframework.security.access.vote.AuthenticatedVoter;
-import org.springframework.security.access.vote.RoleHierarchyVoter;
-import org.springframework.security.access.vote.RoleVoter;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
-
-@EnableGlobalMethodSecurity(
-	securedEnabled = true,
-	jsr250Enabled = true,
-	prePostEnabled = true
-)
-@Configuration
-public class RoleConfig extends GlobalMethodSecurityConfiguration {
-
-	@Override
-	protected AccessDecisionManager accessDecisionManager() {
-		List<AccessDecisionVoter<?>> decisionVoters = new ArrayList<>();
-		ExpressionBasedPreInvocationAdvice expressionAdvice = new ExpressionBasedPreInvocationAdvice();
-		expressionAdvice.setExpressionHandler(getExpressionHandler());
-		decisionVoters.add(new PreInvocationAuthorizationAdviceVoter(expressionAdvice));
-		decisionVoters.add(new Jsr250Voter());
-
-		decisionVoters.add(new RoleVoter());
-		decisionVoters.add(roleHierarchyVoter());
-		decisionVoters.add(new AuthenticatedVoter());
-		return new AffirmativeBased(decisionVoters);
-	}
-
-	@Bean
-	public RoleHierarchyVoter roleHierarchyVoter() {
-		return new RoleHierarchyVoter(roleHierarchy());
-	}
-
-	@Bean
-	public RoleHierarchy roleHierarchy() {
-		RoleHierarchyImpl roleHierarchy = new RoleHierarchyImpl();
-		roleHierarchy.setHierarchy(UserGrade.getRoleHierarchy());
-		return roleHierarchy;
-	}
-
-}

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

@@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -17,6 +18,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 
 @Configuration
 @EnableWebSecurity
+@EnableGlobalMethodSecurity(securedEnabled = true)
 @RequiredArgsConstructor
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
@@ -50,15 +52,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
 			.and()
 			.authorizeRequests()
-			.antMatchers(HttpMethod.POST, "/api/auth/token").permitAll()
+			.antMatchers(HttpMethod.POST, "/api/user/login").permitAll()
-			.antMatchers(HttpMethod.POST, "/api/auth/refresh").permitAll()
+			.antMatchers(HttpMethod.POST, "/api/user/refresh").permitAll()
-			.antMatchers(HttpMethod.POST, "/api/users").permitAll()
+			.antMatchers(HttpMethod.POST, "/api/user").permitAll()
-			.antMatchers(HttpMethod.GET,"/api/movies").permitAll()
-			.antMatchers("/api/movieTimes/**").permitAll()
 			.antMatchers("/l7check").permitAll()
-			.antMatchers("/actuator/**").permitAll()
+			.antMatchers("/actuator/health").permitAll()
-			.antMatchers("/api/v3/", "/swagger-ui/**", "/swagger/", "/swagger-resources/**", "/v3/api-docs").permitAll()
 			.anyRequest().authenticated()
+
 			.and()
 			.apply(new JwtSecurityConfig(jwtFilter));
 	}

server/src/main/java/com/ticketing/server/global/security/jwt/JwtProperties.java

@@ -10,7 +10,7 @@ import org.springframework.context.annotation.PropertySource;
 @Getter
 @RequiredArgsConstructor
 @ConstructorBinding
-@ConfigurationProperties(value = "jwt")
+@ConfigurationProperties("jwt")
 @PropertySource(value = "classpath:application.yml", factory = YamlPropertySourceFactory.class)
 public class JwtProperties {
 

server/src/main/java/com/ticketing/server/global/security/jwt/JwtProvider.java

@@ -1,6 +1,6 @@
 package com.ticketing.server.global.security.jwt;
 
-import com.ticketing.server.user.service.dto.TokenDTO;
+import com.ticketing.server.user.application.response.TokenDto;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
@@ -42,12 +42,12 @@ public class JwtProvider {
 		this.refreshTokenValidityInMilliseconds = jwtProperties.getRefreshTokenValidityInSeconds() * 1000L;
 	}
 
-	public TokenDTO generateTokenDto(Authentication authentication) {
+	public TokenDto generateTokenDto(Authentication authentication) {
 		String accessToken = createAccessToken(authentication);
 		String refreshToken = createRefreshToken(authentication);
 		long expiresIn = accessTokenValidityInMilliseconds / 1000L;
 
-		return new TokenDTO(accessToken, refreshToken, prefix, expiresIn);
+		return TokenDto.of(accessToken, refreshToken, prefix, expiresIn);
 	}
 
 	private String createAccessToken(Authentication authentication) {

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

@@ -3,24 +3,15 @@ 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.Qualifier;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
 import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerExceptionResolver;
 
-@Component("JwtAccessDeniedHandler")
+@Component
 public class JwtAccessDeniedHandler implements AccessDeniedHandler {
 
-	private final HandlerExceptionResolver resolver;
-
-	public JwtAccessDeniedHandler(@Qualifier("handlerExceptionResolver") HandlerExceptionResolver resolver) {
-		this.resolver = resolver;
-	}
-
 	@Override
 	public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException {
 		response.sendError(HttpServletResponse.SC_FORBIDDEN);
-		resolver.resolveException(request, response, null, accessDeniedException);
 	}
 }

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

@@ -3,24 +3,15 @@ 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.Qualifier;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerExceptionResolver;
 
-@Component("JwtAuthenticationEntryPoint")
+@Component
 public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint {
 
-	private final HandlerExceptionResolver resolver;
-
-	public JwtAuthenticationEntryPoint(@Qualifier("handlerExceptionResolver") HandlerExceptionResolver resolver) {
-		this.resolver = resolver;
-	}
-
 	@Override
 	public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException {
-		resolver.resolveException(request, response, null, authException);
+		response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
 	}
-
 }

server/src/main/java/com/ticketing/server/global/security/service/CustomUserDetailsService.java

@@ -1,6 +1,5 @@
-package com.ticketing.server.user.service;
+package com.ticketing.server.global.security.service;
 
-import com.ticketing.server.global.exception.ErrorCode;
 import com.ticketing.server.user.domain.User;
 import com.ticketing.server.user.domain.repository.UserRepository;
 import java.util.Collections;
@@ -19,9 +18,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 UsernameNotFoundException("존재하지 않는 email 입니다. :: " + email));
 	}
 
 	private UserDetails createUserDetails(User user) {
@@ -33,5 +32,4 @@ public class CustomUserDetailsService implements UserDetailsService {
 			, Collections.singleton(grantedAuthority)
 		);
 	}
-
 }

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

@@ -1,28 +0,0 @@
-package com.ticketing.server.global.validator.constraints;
-
-import com.ticketing.server.global.validator.constraintvalidators.FieldsValueNotMatchValidator;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-@Constraint(validatedBy = FieldsValueNotMatchValidator.class)
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface FieldsValueNotMatch {
-
-	String message() default "validation.password.not.change";
-
-	String field();
-
-	String fieldMatch();
-
-	Class<?>[] groups() default {};
-
-	Class<? extends Payload>[] payload() default {};
-
-}

server/src/main/java/com/ticketing/server/global/validator/constraintvalidators/FieldsValueNotMatchValidator.java

@@ -1,29 +0,0 @@
-package com.ticketing.server.global.validator.constraintvalidators;
-
-import com.ticketing.server.global.validator.constraints.FieldsValueNotMatch;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import org.springframework.beans.BeanWrapperImpl;
-
-public class FieldsValueNotMatchValidator implements ConstraintValidator<FieldsValueNotMatch, Object> {
-
-	private String field;
-	private String fieldMatch;
-
-	public void initialize(FieldsValueNotMatch constraintAnnotation) {
-		this.field = constraintAnnotation.field();
-		this.fieldMatch = constraintAnnotation.fieldMatch();
-	}
-
-	@Override
-	public boolean isValid(Object value, ConstraintValidatorContext context) {
-		Object fieldValue = new BeanWrapperImpl(value).getPropertyValue(field);
-		Object fieldMatchValue = new BeanWrapperImpl(value).getPropertyValue(fieldMatch);
-
-		if (fieldValue != null) {
-			return !fieldValue.equals(fieldMatchValue);
-		} else {
-			return fieldMatchValue != null;
-		}
-	}
-}

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

@@ -1,53 +1,8 @@
 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;
 
 @RestController
-@RequestMapping("/api/movies")
-@Api(value = "Movie API", tags = {"Movie"})
-@RequiredArgsConstructor
-@Slf4j
 public class MovieController {
 
-	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()
-				)
-			);
-	}
-
 }

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,21 +0,0 @@
-package com.ticketing.server.movie.application.response;
-
-import com.ticketing.server.movie.service.dto.MovieDTO;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.List;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class MovieListResponse {
-
-    @ApiModelProperty(value = "영화 제목")
-    private 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.service.dto.TicketDetailDTO;
-import java.util.List;
-import lombok.Getter;
-
-@Getter
-public class TicketDetailsResponse {
-
-	private final List<TicketDetailDTO> ticketDetails;
-
-	public TicketDetailsResponse(List<TicketDetailDTO> ticketDetails) {
-		this.ticketDetails = ticketDetails;
-	}
-
-}

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

@@ -4,28 +4,21 @@ import com.ticketing.server.global.dto.repository.AbstractEntity;
 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
+    @NotNull
-	@Column(unique = true)
+    @Column(unique = true)
-	private String title;
+    private String title;
 
-	@NotNull
+    @NotNull
-	private Long runningTime;
+    private Integer runningTime;
-
-	Movie(Long id, String title, Long runningTime) {
-		this.id = id;
-		this.title = title;
-		this.runningTime = runningTime;
-	}
 
 }

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 Integer seatCount;
-	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);
-	}
 
 }

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 com.ticketing.server.payment.domain.Payment;
-import java.time.LocalDateTime;
 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("판매가능"),
+    private String name;
-	SCHEDULED("환불"),
-	SOLD("판매완료");
-
-	private String name;
 
 }

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

@@ -1,11 +1,8 @@
 package com.ticketing.server.movie.domain.repository;
 
 import com.ticketing.server.movie.domain.Movie;
-import java.time.LocalDateTime;
-import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -13,9 +10,4 @@ public interface MovieRepository extends JpaRepository<Movie, Long> {
 
     Optional<Movie> findByTitle(String title);
 
-    @Query(value = "SELECT * "
-        + "FROM movie "
-        + "WHERE deleted_at IS NULL", nativeQuery = true)
-    List<Movie> findValidMovies();
-
 }

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,44 +1,9 @@
 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.interfaces.MovieService;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 @Service
-@RequiredArgsConstructor
-@Slf4j
 public class MovieServiceImpl implements MovieService {
 
-	private final MovieRepository movieRepository;
-
-	@Override
-	public MovieDTO registerMovie(MovieRegisterDTO movieRegisterDto) {
-		Optional<Movie> movie = movieRepository.findByTitle(movieRegisterDto.getTitle());
-
-		if(movie.isEmpty()) {
-			return MovieDTO.from(movieRepository.save(movieRegisterDto.toMovie()));
-		}
-
-		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.service.dto.TicketDetailDTO;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.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/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.service.dto.TicketDetailDTO;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class TicketDetailsDTO {
-
-	private final List<TicketDetailDTO> ticketDetails;
-
-	public TicketDetailsResponse toResponse() {
-		return new TicketDetailsResponse(ticketDetails);
-	}
-}

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

@@ -1,13 +1,5 @@
 package com.ticketing.server.movie.service.interfaces;
 
-import com.ticketing.server.movie.service.dto.MovieDTO;
-import com.ticketing.server.movie.service.dto.MovieRegisterDTO;
-import java.util.List;
-
 public interface MovieService {
 
-	MovieDTO registerMovie(MovieRegisterDTO movieRegisterDto);
-
-    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,47 +1,8 @@
 package com.ticketing.server.payment.application;
 
-import com.ticketing.server.payment.application.response.PaymentDetailResponse;
-import com.ticketing.server.payment.application.response.SimplePaymentsResponse;
-import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
-import com.ticketing.server.payment.service.dto.SimplePaymentsDTO;
-import com.ticketing.server.payment.service.interfaces.PaymentApisService;
-import com.ticketing.server.payment.service.interfaces.PaymentService;
-import com.ticketing.server.user.domain.UserGrade;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.annotation.Secured;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @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) {
-		PaymentDetailDTO paymentDetail = paymentApisService.findPaymentDetail(paymentId);
-
-		return ResponseEntity.status(HttpStatus.OK)
-			.body(paymentDetail.toResponse());
-	}
-
 }

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

@@ -1,20 +0,0 @@
-package com.ticketing.server.payment.application.response;
-
-import com.ticketing.server.payment.service.dto.TicketDetailDTO;
-import java.time.LocalDateTime;
-import java.util.List;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class PaymentDetailResponse {
-
-	private Long paymentId;
-	private String movieTitle;
-	private String paymentNumber;
-	private Integer totalPrice;
-	private LocalDateTime createdAt;
-	private List<TicketDetailDTO> tickets;
-
-}

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

@@ -1,15 +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/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)
+	@ManyToOne
-	private Long userAlternateId;
+	@JoinColumn(name = "user_id", referencedColumnName = "id", updatable = false)
-
+	private User user;
-	@NotEmpty
-	@Column(name = "movie_title", nullable = false)
-	private String movieTitle;
 
 	@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
+	@NotNull
-	@Column(name = "payment_number", nullable = false)
 	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.domain.Payment;
-import com.ticketing.server.payment.domain.repository.PaymentRepository;
-import com.ticketing.server.payment.service.dto.PaymentDetailDTO;
-import com.ticketing.server.payment.service.interfaces.PaymentApisService;
-import javax.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-
-@Service
-@RequiredArgsConstructor
-@Transactional(readOnly = true)
-@Validated
-@Slf4j
-public class PaymentApisServiceImpl implements PaymentApisService {
-
-	private final PaymentRepository paymentRepository;
-	private final MovieClient movieClient;
-	private final UserClient userClient;
-
-	@Override
-	public PaymentDetailDTO findPaymentDetail(@NotNull Long paymentId) {
-		Payment payment = paymentRepository.findById(paymentId)
-			.orElseThrow(ErrorCode::throwPaymentIdNotFound);
-
-		UserDetailResponse userDetail = userClient.detail();
-		if (!userDetail.hasUserAlternateId(payment)) {
-			throw ErrorCode.throwValidUserId();
-		}
-
-		TicketDetailsResponse tickets = movieClient.getTicketsByPaymentId(payment.getId());
-		return new PaymentDetailDTO(payment, tickets);
-	}
-
-}

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

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

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

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 final Long paymentId;
-	private final String movieTitle;
-	private final String paymentNumber;
-	private final Integer totalPrice;
-
-	public SimplePaymentDTO(Payment payment) {
-		this(
-			payment.getId(),
-			payment.getMovieTitle(),
-			payment.getPaymentNumber(),
-			payment.getTotalPrice()
-		);
-	}
-}

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/dto/TicketDetailDTO.java

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

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.service.dto.PaymentDetailDTO;
-import javax.validation.constraints.NotNull;
-
-public interface PaymentApisService {
-
-	PaymentDetailDTO 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/AuthController.java

@@ -1,65 +0,0 @@
-package com.ticketing.server.user.application;
-
-import com.ticketing.server.user.application.request.LoginRequest;
-import com.ticketing.server.user.application.response.LogoutResponse;
-import com.ticketing.server.user.service.dto.TokenDTO;
-import com.ticketing.server.user.application.response.TokenResponse;
-import com.ticketing.server.user.service.dto.DeleteRefreshTokenDTO;
-import com.ticketing.server.user.service.interfaces.AuthenticationService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequiredArgsConstructor
-@RequestMapping("/api/auth")
-@Slf4j
-public class AuthController {
-
-	private final AuthenticationService authenticationService;
-
-	@PostMapping("/token")
-	public ResponseEntity<TokenResponse> login(@RequestBody LoginRequest loginRequest) {
-		TokenDTO tokenDto = authenticationService.generateTokenDto(loginRequest.toAuthentication());
-
-		return ResponseEntity.status(HttpStatus.OK)
-			.headers(getHttpHeaders())
-			.body(tokenDto.toResponse());
-	}
-
-	@PostMapping("/refresh")
-	public ResponseEntity<TokenResponse> refreshToken(@RequestParam("refreshToken") String refreshToken) {
-		TokenDTO tokenDto = authenticationService.reissueTokenDto(refreshToken);
-
-		return ResponseEntity.status(HttpStatus.OK)
-			.headers(getHttpHeaders())
-			.body(tokenDto.toResponse());
-	}
-
-	@PostMapping("/logout")
-	public ResponseEntity<LogoutResponse> logout(@AuthenticationPrincipal UserDetails userRequest) {
-		DeleteRefreshTokenDTO refreshToken = authenticationService.deleteRefreshToken(userRequest.getUsername());
-
-		return ResponseEntity.status(HttpStatus.OK)
-			.body(refreshToken.toResponse());
-	}
-
-	private HttpHeaders getHttpHeaders() {
-		HttpHeaders httpHeaders = new HttpHeaders();
-		httpHeaders.set(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, must-revalidate");
-		httpHeaders.set(HttpHeaders.PRAGMA, "no-store");
-		httpHeaders.set(HttpHeaders.EXPIRES, "0");
-
-		return httpHeaders;
-	}
-
-}

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

@@ -1,17 +0,0 @@
-package com.ticketing.server.user.application;
-
-import com.ticketing.server.user.domain.UserGrade;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class UserChangeGradeResponse {
-
-	private String email;
-
-	private UserGrade beforeGrade;
-
-	private UserGrade afterGrade;
-
-}

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

@@ -1,107 +1,86 @@
 package com.ticketing.server.user.application;
 
-import static com.ticketing.server.user.domain.UserGrade.ROLES.ADMIN;
+import com.ticketing.server.global.security.jwt.JwtProperties;
-import static com.ticketing.server.user.domain.UserGrade.ROLES.USER;
+import com.ticketing.server.user.application.request.LoginRequest;
-
 import com.ticketing.server.user.application.request.SignUpRequest;
-import com.ticketing.server.user.application.request.UserChangeGradeRequest;
-import com.ticketing.server.user.application.request.UserChangePasswordRequest;
 import com.ticketing.server.user.application.request.UserDeleteRequest;
-import com.ticketing.server.user.application.response.PaymentsResponse;
+import com.ticketing.server.user.application.request.UserModifyPasswordRequest;
 import com.ticketing.server.user.application.response.SignUpResponse;
+import com.ticketing.server.user.application.response.TokenDto;
 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.ChangeGradeDTO;
+import com.ticketing.server.user.service.UserServiceImpl;
-import com.ticketing.server.user.service.dto.ChangePasswordDTO;
+import com.ticketing.server.user.service.interfaces.AuthenticationService;
-import com.ticketing.server.user.service.dto.ChangedPasswordUserDTO;
+import javax.servlet.http.HttpServletResponse;
-import com.ticketing.server.user.service.dto.CreatedUserDTO;
-import com.ticketing.server.user.service.dto.DeletedUserDTO;
-import com.ticketing.server.user.service.dto.PaymentsDTO;
-import com.ticketing.server.user.service.dto.UserDetailDTO;
-import com.ticketing.server.user.service.interfaces.UserApisService;
-import com.ticketing.server.user.service.interfaces.UserService;
 import javax.validation.Valid;
 import 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.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/users")
+@RequestMapping("/api/user")
 @Slf4j
+
 public class UserController {
 
-	private final UserService userService;
+	private final UserServiceImpl userService;
-	private final UserApisService userApisService;
+	private final AuthenticationService authenticationService;
 	private final PasswordEncoder passwordEncoder;
+	private final JwtProperties jwtProperties;
 
 	@PostMapping
 	public ResponseEntity<SignUpResponse> register(@RequestBody @Valid SignUpRequest request) {
-		CreatedUserDTO createdUserDto = userService.register(request.toSignUpDto(passwordEncoder));
+		User user = userService.register(request.toSignUpDto(passwordEncoder));
-
+		return ResponseEntity.status(HttpStatus.CREATED).body(SignUpResponse.from(user));
-		return ResponseEntity.status(HttpStatus.CREATED)
-			.body(createdUserDto.toResponse());
-	}
-
-	@GetMapping("/details")
-	@Secured(USER)
-	public ResponseEntity<UserDetailResponse> details(@AuthenticationPrincipal UserDetails userRequest) {
-		UserDetailDTO userDetail = userService.findDetailByEmail(userRequest.getUsername());
-
-		return ResponseEntity.status(HttpStatus.OK)
-			.body(userDetail.toResponse());
 	}
 
 	@DeleteMapping
-	@Secured(USER)
+	@Secured("ROLE_GUEST")
 	public ResponseEntity<UserDeleteResponse> deleteUser(@RequestBody @Valid UserDeleteRequest request) {
-		DeletedUserDTO deletedUserDto = userService.delete(request.toDeleteUserDto(passwordEncoder));
+		User user = userService.delete(request.toDeleteUserDto(passwordEncoder));
-
+		return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.from(user));
-		return ResponseEntity.status(HttpStatus.OK)
-			.body(deletedUserDto.toResponse());
 	}
 
 	@PutMapping("/password")
-	@Secured(USER)
+	@Secured("ROLE_GUEST")
-	public ResponseEntity<UserChangePasswordResponse> changePassword(
+	public ResponseEntity<UserChangePasswordResponse> changePassword(@RequestBody @Valid UserModifyPasswordRequest request) {
-		@AuthenticationPrincipal UserDetails userRequest,
+		if (request.oldEqualNew()) {
-		@RequestBody @Valid UserChangePasswordRequest request) {
+			log.error("기존 패스워드와 동일한 패스워드로 변경할 수 없습니다.");
-		ChangePasswordDTO changePasswordDto = request.toChangePasswordDto(userRequest.getUsername(), passwordEncoder);
+			return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
-		ChangedPasswordUserDTO changedUserDto = userService.changePassword(changePasswordDto);
+		}
 
-		return ResponseEntity.status(HttpStatus.OK)
+		User user = userService.changePassword(request.toChangePasswordDto(passwordEncoder));
-			.body(changedUserDto.toResponse());
+		return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.from(user));
 	}
 
-	@PostMapping("/grade")
+	@PostMapping("/login")
-	@Secured(ADMIN)
+	public ResponseEntity<TokenDto> login(@RequestBody LoginRequest loginRequest, HttpServletResponse response) {
-	public ResponseEntity<UserChangeGradeResponse> changeGrade(@RequestBody @Valid UserChangeGradeRequest request) {
+		TokenDto tokenDto = authenticationService.login(loginRequest.toAuthentication());
-		ChangeGradeDTO changeGradeDto = userService.changeGrade(request.getEmail(), request.getAfterGrade());
 
-		return ResponseEntity.status(HttpStatus.OK)
+		response.setHeader("Cache-Control", "no-store");
-			.body(changeGradeDto.toResponse());
+		response.setHeader("Pragma", "no-store");
+		return ResponseEntity.status(HttpStatus.OK).body(tokenDto);
 	}
 
-	@GetMapping("/payments")
+	@PostMapping("/refresh")
-	@Secured(USER)
+	public ResponseEntity<TokenDto> refreshToken(@RequestParam("refreshToken") String refreshToken, HttpServletResponse response) {
-	public ResponseEntity<PaymentsResponse> getPayments(@AuthenticationPrincipal UserDetails userRequest) {
+		TokenDto tokenDto = authenticationService.reissueAccessToken(refreshToken);
-		PaymentsDTO paymentsDto = userApisService.findPaymentsByEmail(userRequest.getUsername());
 
-		return ResponseEntity.status(HttpStatus.OK)
+		response.setHeader(jwtProperties.getAccessHeader(), tokenDto.getAccessToken());
-			.body(paymentsDto.toResponse());
+		response.setHeader(jwtProperties.getRefreshHeader(), tokenDto.getRefreshToken());
+		return ResponseEntity.status(HttpStatus.OK).body(tokenDto);
 	}
 
 }

server/src/main/java/com/ticketing/server/user/application/request/UserChangeGradeRequest.java

@@ -1,19 +0,0 @@
-package com.ticketing.server.user.application.request;
-
-import com.ticketing.server.user.domain.UserGrade;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import lombok.Getter;
-
-@Getter
-public class UserChangeGradeRequest {
-
-	@NotEmpty(message = "{validation.not.empty.email}")
-	@Email(message = "{validation.email}")
-	private String email;
-
-	@NotNull(message = "{validation.not.null.grade}")
-	private UserGrade afterGrade;
-
-}

server/src/main/java/com/ticketing/server/user/application/request/UserModifyPasswordRequest.java

@@ -1,7 +1,7 @@
 package com.ticketing.server.user.application.request;
 
-import com.ticketing.server.global.validator.constraints.FieldsValueNotMatch;
 import com.ticketing.server.user.service.dto.ChangePasswordDTO;
+import javax.validation.constraints.Email;
 import javax.validation.constraints.NotEmpty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -11,12 +11,11 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
-@FieldsValueNotMatch(
+public class UserModifyPasswordRequest {
-	field = "oldPassword",
+
-	fieldMatch = "newPassword",
+	@NotEmpty(message = "{validation.not.empty.email}")
-	message = "{validation.password.not.change}"
+	@Email(message = "{validation.email}")
-)
+	private String email;
-public class UserChangePasswordRequest {
 
 	@NotEmpty(message = "{validation.not.empty.oldpassword}")
 	private String oldPassword;
@@ -24,8 +23,12 @@ public class UserChangePasswordRequest {
 	@NotEmpty(message = "{validation.not.empty.newpassword}")
 	private String newPassword;
 
-	public ChangePasswordDTO toChangePasswordDto(String email, PasswordEncoder passwordEncoder) {
+	public ChangePasswordDTO toChangePasswordDto(PasswordEncoder passwordEncoder) {
 		return new ChangePasswordDTO(email, oldPassword, newPassword, passwordEncoder);
 	}
 
+	public boolean oldEqualNew() {
+		return oldPassword.equals(newPassword);
+	}
+
 }

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

@@ -1,14 +0,0 @@
-package com.ticketing.server.user.application.response;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class LogoutResponse {
-
-	private final Long refreshTokenId;
-	private final String email;
-	private final String refreshToken;
-
-}

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

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

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

@@ -1,13 +1,20 @@
 package com.ticketing.server.user.application.response;
 
+import com.ticketing.server.user.domain.User;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class SignUpResponse {
 
-	private final String name;
+	private String name;
-	private final String email;
+
+	private String email;
+
+	public static SignUpResponse from(User user) {
+		return new SignUpResponse(user.getName(), user.getEmail());
+	}
 
 }

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

@@ -0,0 +1,20 @@
+package com.ticketing.server.user.application.response;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class TokenDto {
+
+	private final String accessToken;
+	private final String refreshToken;
+	private final String tokenType;
+	private final long expiresIn;
+
+	public static TokenDto of(String accessToken, String refreshToken, String tokenType, long expiresIn) {
+		return new TokenDto(accessToken, refreshToken, tokenType, expiresIn);
+	}
+
+}

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

@@ -1,15 +0,0 @@
-package com.ticketing.server.user.application.response;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class TokenResponse {
-
-	private final String accessToken;
-	private final String refreshToken;
-	private final String tokenType;
-	private final long expiresIn;
-
-}

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

@@ -1,15 +1,20 @@
 package com.ticketing.server.user.application.response;
 
-import java.time.LocalDateTime;
+import com.ticketing.server.user.domain.User;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class UserChangePasswordResponse {
 
-	private final String name;
+	private String name;
-	private final String email;
+
-	private final LocalDateTime updatedAt;
+	private String email;
+
+	public static UserChangePasswordResponse from(User user) {
+		return new UserChangePasswordResponse(user.getName(), user.getEmail());
+	}
 
 }

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

@@ -1,15 +1,20 @@
 package com.ticketing.server.user.application.response;
 
-import java.time.LocalDateTime;
+import com.ticketing.server.user.domain.User;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class UserDeleteResponse {
 
-	private final String name;
+	private String name;
-	private final String email;
+
-	private final LocalDateTime deletedAt;
+	private String email;
+
+	public static UserDeleteResponse from(User user) {
+		return new UserDeleteResponse(user.getName(), user.getEmail());
+	}
 
 }

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

@@ -1,18 +0,0 @@
-package com.ticketing.server.user.application.response;
-
-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
-public class UserDetailResponse {
-
-	private final String name;
-	private final String email;
-	private final UserGrade grade;
-	private final String phone;
-
-}

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

@@ -1,19 +0,0 @@
-package com.ticketing.server.user.domain;
-
-import com.ticketing.server.user.application.UserChangeGradeResponse;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class ChangeGradeDTO {
-
-	private final String email;
-	private final UserGrade beforeGrade;
-	private final UserGrade afterGrade;
-
-	public UserChangeGradeResponse toResponse() {
-		return new UserChangeGradeResponse(email, beforeGrade, afterGrade);
-	}
-
-}

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