fix: 맨 하단 개행

README.md

@@ -14,84 +14,4 @@
 ## 🎯 프로젝트 목표
 
 
-<br/><br/>
-
-## 🧩 ERD
-
-``` mermaid
-erDiagram
-    MOVIE ||--o{ MOVIE_TIMES : ""
-    MOVIE {
-        bigint id PK "영화 ID"
-        varchar title "영화제목"
-        int running_time "러닝타임"
-        datetime created_at "등록일시"
-        datetime updated_at "수정일시"
-    }
-    THEATER ||--o{ MOVIE_TIMES : ""
-    THEATER ||--|{ SEAT : ""
-    THEATER {
-        bigint id PK "상영관 ID"
-        int theater_number "상영관 번호"
-        int seat_count "좌석수"
-        datetime created_at "등록일시"
-        datetime updated_at "수정일시"
-    }
-    SEAT ||--o{ TICKET : ""
-    SEAT {
-        bigint id PK "좌석 ID"
-        bigint theater_id FK "상영관 ID"
-        int column "열"
-        int row "행"
-        datetime created_at "등록일시"
-        datetime updated_at "수정일시"
-    }
-    MOVIE_TIMES ||--o{ TICKET : ""
-    MOVIE_TIMES {
-        bigint id PK "상영시간표 ID"
-        bigint movie_id FK "영화 ID"
-        bigint theater_id FK "상영관 ID"
-        date date "상영 날짜"
-        int round "회차"
-        time start_time "시작 시간"
-        time end_time "종료 시간"
-        datetime created_at "등록일시"
-        datetime updated_at "수정일시"
-    }
-    TICKET {
-        bigint id PK "티켓 ID"
-        bigint seat_id FK "좌석 ID"
-        bigint movie_times_id FK "상영시간표 ID"
-        bigint payment_id FK "결제 ID"
-        varchar ticket_status "상태 - 구매가능/예약진행중/판매완료"
-        int ticket_price "가격"
-        datetime created_at "등록일시"
-        datetime updated_at "수정일시"
-    }
-    TICKET }|--|| PAYMENT : ""
-    PAYMENT {
-        bigint id PK "결제 ID"
-        bigint user_id FK "유저ID"
-        varchar type "결제 타입 - 예) 네이버페이, 카카오페이"
-        varchar payment_status "상태 - 완료/환불/실패"
-        varchar failed_reason "실패사유 - 컬럼명을 알아보기 쉬운가?"
-        varchar payment_number "예매번호"
-        int total_price "결제 금액"
-        datetime created_at "결제일시"
-        datetime updated_at "수정일시"
-    }
-    USER ||--o{ PAYMENT : ""
-    USER {
-        bigint id "회원"
-        varchar password "비밀번호"
-        varchar grade "등급 - 고객/임직원"
-        varchar email "이메일"
-        varchar phone "휴대폰 번호"
-        boolean is_deleted "탈퇴여부"
-        datetime deleted_at "탈퇴일시"
-        datetime created_at "가입일시"
-        datetime updated_at "수정일시"
-    }
-```
-
 <br/><br/>

server/build.gradle.kts

@@ -23,23 +23,13 @@ repositories {
 	mavenCentral()
 }
 
-
-
 dependencies {
 	implementation ("org.springframework.boot:spring-boot-starter-data-jpa")
-//	implementation ("org.springframework.boot:spring-boot-starter-security")
+	implementation ("org.springframework.boot:spring-boot-starter-security")
 	implementation ("org.springframework.boot:spring-boot-starter-validation")
 	implementation ("org.springframework.boot:spring-boot-starter-web")
-	implementation("org.springframework.boot:spring-boot-starter-actuator")
-	implementation ("com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.4")
-	implementation ("org.springframework.boot:spring-boot-starter-log4j2")
-	implementation ("com.lmax:disruptor:3.4.2")
 
-	modules {
-		module("org.springframework.boot:spring-boot-starter-logging") {
-			replacedBy("org.springframework.boot:spring-boot-starter-log4j2", "Use Log4j2 instead of Logback")
-		}
-	}
+	implementation ("com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.4")
 
 	compileOnly ("org.projectlombok:lombok")
 	runtimeOnly ("mysql:mysql-connector-java")

server/src/main/java/com/ticketing/server/ServerApplication.java

@@ -2,9 +2,7 @@ package com.ticketing.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
-@EnableJpaAuditing
 @SpringBootApplication
 public class ServerApplication {
 

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

@@ -1,31 +0,0 @@
-package com.ticketing.server.global.dto.repository;
-
-import java.time.LocalDateTime;
-import javax.persistence.Column;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
-import lombok.Getter;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-@MappedSuperclass
-@EntityListeners(AuditingEntityListener.class)
-@Getter
-public abstract class AbstractEntity {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Long id;
-
-	@Column(nullable = false, updatable = false)
-	@CreatedDate
-	private LocalDateTime createdAt;
-
-	@LastModifiedDate
-	private LocalDateTime updatedAt;
-
-}

server/src/main/java/com/ticketing/server/global/health/L7checkController.java

@@ -1,43 +0,0 @@
-package com.ticketing.server.global.health;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.Status;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/l7check")
-@RequiredArgsConstructor
-public class L7checkController {
-
-	private final MutableHealthIndicator indicator;
-
-	@GetMapping
-	public ResponseEntity<Object> health() {
-		Health health = indicator.health();
-		boolean isUp = health.getStatus().equals(Status.UP);
-		return ResponseEntity
-			.status(isUp ? HttpStatus.OK : HttpStatus.SERVICE_UNAVAILABLE)
-			.build();
-	}
-
-	@DeleteMapping
-	@ResponseStatus(HttpStatus.NO_CONTENT)
-	public void down() {
-		indicator.setHealth(Health.down().build());
-	}
-
-	@PostMapping
-	@ResponseStatus(HttpStatus.CREATED)
-	public void up() {
-		indicator.setHealth(Health.up().build());
-	}
-
-}

server/src/main/java/com/ticketing/server/global/health/ManualHealthIndicator.java

@@ -1,22 +0,0 @@
-package com.ticketing.server.global.health;
-
-import java.util.concurrent.atomic.AtomicReference;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ManualHealthIndicator implements MutableHealthIndicator {
-
-	private final AtomicReference<Health> healthRef = new AtomicReference<>(Health.up().build());
-
-	@Override
-	public void setHealth(Health health) {
-		healthRef.set(health);
-	}
-
-	@Override
-	public Health health() {
-		return healthRef.get();
-	}
-
-}

server/src/main/java/com/ticketing/server/global/health/MutableHealthIndicator.java

@@ -1,10 +0,0 @@
-package com.ticketing.server.global.health;
-
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.HealthIndicator;
-
-public interface MutableHealthIndicator extends HealthIndicator {
-
-	void setHealth(Health health);
-
-}

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

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

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

@@ -1,8 +0,0 @@
-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/SeatController.java

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

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

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

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

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

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

@@ -1,18 +0,0 @@
-package com.ticketing.server.movie.domain;
-
-import com.ticketing.server.global.dto.repository.AbstractEntity;
-import javax.persistence.Entity;
-import javax.validation.constraints.NotNull;
-import lombok.Getter;
-
-@Entity
-@Getter
-public class Movie extends AbstractEntity {
-
-	@NotNull
-	private String title;
-
-	@NotNull
-	private Integer runningTime;
-
-}

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

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

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

@@ -1,25 +0,0 @@
-package com.ticketing.server.movie.domain;
-
-import com.ticketing.server.global.dto.repository.AbstractEntity;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.validation.constraints.NotNull;
-import lombok.Getter;
-
-@Entity
-@Getter
-public class Seat extends AbstractEntity {
-
-	@NotNull
-	@ManyToOne
-	@JoinColumn(name = "theater_id", referencedColumnName = "id", updatable = false)
-	private Theater theater;
-
-	@NotNull
-	private Integer seatColumn;
-
-	@NotNull
-	private Integer seatRow;
-
-}

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

@@ -1,17 +0,0 @@
-package com.ticketing.server.movie.domain;
-
-import com.ticketing.server.global.dto.repository.AbstractEntity;
-import javax.persistence.Entity;
-import javax.validation.constraints.NotNull;
-import lombok.Getter;
-
-@Entity
-@Getter
-public class Theater extends AbstractEntity {
-
-	@NotNull
-	private Integer theaterNumber;
-
-	private Integer seatCount;
-
-}

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

@@ -1,35 +0,0 @@
-package com.ticketing.server.movie.domain;
-
-import com.ticketing.server.global.dto.repository.AbstractEntity;
-import com.ticketing.server.payment.domain.Payment;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.validation.constraints.NotNull;
-import lombok.Getter;
-
-@Entity
-@Getter
-public class Ticket extends AbstractEntity {
-
-	@NotNull
-	@ManyToOne
-	@JoinColumn(name = "seat_id", referencedColumnName = "id", updatable = false)
-	private Seat seat;
-
-	@NotNull
-	@ManyToOne
-	@JoinColumn(name = "movie_times_id", referencedColumnName = "id", updatable = false)
-	private MovieTimes movieTimes;
-
-	@ManyToOne
-	@JoinColumn(name = "payment_id", referencedColumnName = "id", updatable = false)
-	private Payment payment;
-
-	@NotNull
-	private TicketStatus status;
-
-	@NotNull
-	private Integer ticketPrice;
-
-}

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

@@ -1,15 +0,0 @@
-package com.ticketing.server.movie.domain;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public enum TicketStatus {
-	SALE("판매가능"),
-	SCHEDULED("환불"),
-	SOLD("판매완료");
-
-	private String name;
-
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,38 +0,0 @@
-package com.ticketing.server.payment.domain;
-
-import com.ticketing.server.global.dto.repository.AbstractEntity;
-import com.ticketing.server.user.domain.User;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.validation.constraints.NotNull;
-import lombok.Getter;
-
-@Entity
-@Getter
-public class Payment extends AbstractEntity {
-
-	@NotNull
-	@ManyToOne
-	@JoinColumn(name = "user_id", referencedColumnName = "id", updatable = false)
-	private User user;
-
-	@NotNull
-	@Enumerated(value = EnumType.STRING)
-	private PaymentType type;
-
-	@NotNull
-	@Enumerated(value = EnumType.STRING)
-	private PaymentStatus status;
-
-	private String failedMessage;
-
-	@NotNull
-	private String paymentNumber;
-
-	@NotNull
-	private Integer totalPrice;
-
-}

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

@@ -1,5 +0,0 @@
-package com.ticketing.server.payment.domain;
-
-public enum PaymentStatus {
-	COMPLETED, REFUNDED, FAILED
-}

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

@@ -1,5 +0,0 @@
-package com.ticketing.server.payment.domain;
-
-public enum PaymentType {
-	KAKAO_PAY
-}

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

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

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

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

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

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

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

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

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

@@ -1,47 +0,0 @@
-package com.ticketing.server.user.domain;
-
-import com.ticketing.server.global.dto.repository.AbstractEntity;
-import java.time.LocalDateTime;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.validation.constraints.NotNull;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-
-@Entity
-@Getter
-@NoArgsConstructor
-public class User extends AbstractEntity {
-
-	@NotNull
-	private String name;
-
-	@NotNull
-	private String email;
-
-	@NotNull
-	private String password;
-
-	@NotNull
-	@Enumerated(value = EnumType.STRING)
-	private UserGrade grade;
-
-	@NotNull
-	private String phone;
-
-	private boolean isDeleted = false;
-
-	private LocalDateTime deletedAt;
-
-	@Builder
-	protected User(String name, String email, String password, UserGrade grade, String phone) {
-		this.name = name;
-		this.email = email;
-		this.password = password;
-		this.grade = grade;
-		this.phone = phone;
-	}
-
-}

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

@@ -1,5 +0,0 @@
-package com.ticketing.server.user.domain;
-
-public enum UserGrade {
-	GUEST, STAFF
-}

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

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

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

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

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

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

server/src/main/resources/application.yml

@@ -14,6 +14,17 @@ spring:
       connection-timeout: 30000 # default 30s
       maximum-pool-size: 10 # default 10
       max-lifetime: 1800000 # default 30 minutes
+      data-source-properties:
+        cachePrepStmts: true
+        prepStmtCacheSize: 250
+        prepStmtCacheSqlLimit: 2048
+        useServerPrepStmts: true
+        useLocalSessionState: true
+        rewriteBatchedStatements: true
+        cacheResultSetMetadata: true
+        cacheServerConfiguration: true
+        elideSetAutoCommits: true
+        maintainTimeStats: false
 
 jasypt:
   encryptor:

server/src/main/resources/log4j2.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Configuration status="INFO" monitorInterval="30">
-
-  <Properties>
-    <Property name="LOG_PATH">./logs/log</Property>
-    <Property name="LOG_PATTERN">%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n</Property>
-  </Properties>
-
-  <Appenders>
-    <Console name="ConsoleLog" target="SYSTEM_OUT">
-      <PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8"/>
-    </Console>
-
-    <RollingFile name="FileLog"
-      fileName="${LOG_PATH}.log"
-      filePattern="${LOG_PATH}-%d{yyyy-MM-dd}-%i.log">
-      <PatternLayout pattern="${LOG_PATTERN}" charset="UTF-8" />
-
-      <Policies>
-        <SizeBasedTriggeringPolicy size="15MB" />
-        <TimeBasedTriggeringPolicy modulate="true" interval="1" />
-      </Policies>
-
-      <DefaultRolloverStrategy>
-        <Delete basePath="${LOG_PATH}" maxDepth="1">
-          <IfLastModified age="30d"/>
-        </Delete>
-      </DefaultRolloverStrategy>
-    </RollingFile>
-  </Appenders>
-
-  <Loggers>
-    <Root level="info">
-      <AppenderRef ref="ConsoleLog" />
-      <AppenderRef ref="FileLog" />
-    </Root>
-  </Loggers>
-</Configuration>

server/src/test/java/com/ticketing/server/ServerApplicationTests.java

@@ -2,10 +2,8 @@ package com.ticketing.server;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 @SpringBootTest
-@EnableJpaAuditing
 class ServerApplicationTests {
 
 	@Test

server/src/test/java/com/ticketing/server/global/health/L7checkControllerTest.java

@@ -1,51 +0,0 @@
-package com.ticketing.server.global.health;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.concurrent.TimeUnit;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-class L7checkControllerTest {
-
-	private static final String L7CHECK = "/l7check";
-	private static final String HEALTH = "/actuator/health";
-
-	@Autowired
-	TestRestTemplate restTemplate;
-
-	@Test
-	void downAndUp() throws InterruptedException {
-		// before
-		expectUrlStatus(L7CHECK, HttpStatus.OK);
-		expectUrlStatus(HEALTH, HttpStatus.OK);
-
-		// down
-		restTemplate.delete(L7CHECK);
-
-		// then down
-		TimeUnit.MILLISECONDS.sleep(1000);
-		expectUrlStatus(L7CHECK, HttpStatus.SERVICE_UNAVAILABLE);
-		expectUrlStatus(HEALTH, HttpStatus.SERVICE_UNAVAILABLE);
-
-		// up
-		restTemplate.postForEntity(L7CHECK, null, Object.class);
-
-		// then up
-		TimeUnit.MILLISECONDS.sleep(1000);
-		expectUrlStatus(L7CHECK, HttpStatus.OK);
-		expectUrlStatus(HEALTH, HttpStatus.OK);
-	}
-
-	private void expectUrlStatus(String url, HttpStatus status) {
-		ResponseEntity<Object> res = restTemplate.getForEntity(url, Object.class);
-		assertThat(res.getStatusCode()).isEqualTo(status);
-	}
-
-}

server/src/test/java/com/ticketing/server/user/domain/repository/UserRepositoryTest.java

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

server/src/test/resources/application.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:mysql://localhost:3306/ticketing_test?serverTimezone=Asia/Seoul&characterEncoding=UTF-8
-    username: ENC(LowN1n4w0Ep/DqLD8+q5Bq6AXM4b8e3V)
-    password: ENC(OMvGcpZLpggFTiGNkqNe66Zq/SmJXF6o)
+    username: ticketing
+    password: ticketing
     driver-class-name: com.mysql.cj.jdbc.Driver
 
   jpa:
@@ -12,7 +12,3 @@ spring:
         format_sql: true
     hibernate:
       ddl-auto: create
-
-jasypt:
-  encryptor:
-    bean: jasyptStringEncryptor