Compare commits

...

29 Commits

Author SHA1 Message Date
dongHyo
56e475c119 refactor: PasswordEncoder 를 SignUp 생성 시 적용
서비스에서는 파라미터로 넘어온 SignUp을 바로 엔티티로 저장하는 구조로 변경
2022-05-19 20:53:39 +09:00
dongHyo
f7b6f019b9 refactor: email error log add 2022-05-19 17:29:15 +09:00
dongHyo
e6e8139171 refactor: Phone 애노테이션 적용 부분 message 제거 2022-05-19 17:19:27 +09:00
dongHyo
587b27ac35 test: signUp toUser 메소드 테스트 2022-05-19 17:11:51 +09:00
dongHyo
4b07ac0ac6 refactor: 중복 이메일일 경우 Exception 대신 Optional 처리 2022-05-19 17:11:33 +09:00
dongHyo
032ec69e25 refactor: message 외부로 분리 2022-05-19 16:41:31 +09:00
dongHyo
812a646e07 refactor: SignUp 에서 UserEntity 생성하도록 변경 2022-05-19 16:33:42 +09:00
dongHyo
9d35115ed4 refactor: validateEmail 메소드 병합 2022-05-19 16:29:04 +09:00
dongHyo
a1a4f39d19 fix: service 구현체와 동일하게 파라미터 수정 2022-05-19 01:36:44 +09:00
dongHyo
6a3885a12e fix: @EnableJpaAuditing 중복 선언 제거 2022-05-19 01:36:24 +09:00
dongHyo
ca16370bfc refactor: 재정렬 2022-05-19 01:36:03 +09:00
dongHyo
0c8386f6f6 refactor: properties message 다국어 적용 2022-05-19 01:35:34 +09:00
dongHyo
ccf2b95201 refactor: 맨 하단 공백 추가 2022-05-17 01:10:02 +09:00
dongHyo
cd3e1bdea2 docs: logs 디렉토리 추가 2022-05-17 00:43:07 +09:00
dongHyo
1f4b06b102 test: 회원가입 서비스 테스트 코드 작성 2022-05-17 00:41:04 +09:00
dongHyo
45b5bbb02a feat: 회원가입 컨트롤러 생성 2022-05-17 00:07:14 +09:00
dongHyo
7ad71a0445 feat: email 중복 시 예외 클래스 생성 2022-05-17 00:05:50 +09:00
dongHyo
f6c80ce1cc feat: findByEmail Repository add 2022-05-17 00:05:33 +09:00
dongHyo
08219996bf feat: 회원가입 Service 메소드 구현 2022-05-17 00:01:06 +09:00
dongHyo
b60f641b1d feat: 시큐리티 disable 및 psswordEncoder 빈등록 2022-05-16 23:59:14 +09:00
dongHyo
12b86fab36 feat: spring-boot-starter-security 주석해제 2022-05-16 23:57:56 +09:00
dongHyo
7cc661521f refactor: grade @NotNull message 추가 2022-05-13 17:25:58 +09:00
dongHyo
3c6fbbe304 test: user validator 테스트 코드 작성 2022-05-13 17:25:28 +09:00
dongHyo
64036fa8a6 refactor: value null or empty 시 true 반환 2022-05-13 17:07:35 +09:00
dongHyo
7e22abb9dd refactor: builder 에서 생성자로 변경 2022-05-13 17:07:14 +09:00
dongHyo
1138860305 feat: validation annotation 변경 및 @Builder 제거 2022-05-13 17:06:44 +09:00
dongHyo
2870351d99 feat: Create Phone validator annotation 2022-05-13 15:52:11 +09:00
Kim DongHyo
b36a58f965 Feature/init - 프로젝트 설정 추가 진행 (#14)
* feat: jasypt 적용

* refactor: data-source-properties 제거

* feat: BaseEntity add

* feat: User 패키지 구조 및 파일 세팅

* feat: Payment 패키지 구조 및 파일 세팅

* feat: Movie 패키지 구조 및 파일 세팅

* refactor: security 주석 및 actuator 추가

security 사용 시 주석 해제 (아직 사용하지 않아 주석처리)
actuator 을 통해 health check 구현

* feat: 헬스 상태 수동 변경 컨트롤러 구현

* refactor: @Component 등록

* test: health check test 작성

* refactor: intellij warring 해결

* feat: log4j2 설정

* feat: @EnableJpaAuditing 추가

Jpa Auditing 활성화

* feat: user insert db 연결 테스트

* refactor: @Transactional 추가

* refactor: import 정리 및 하단 공백 추가
2022-05-11 00:03:33 +09:00
Kim DongHyo
2028f3e508 Update README.md 2022-05-07 01:25:49 +09:00
64 changed files with 1247 additions and 32 deletions

View File

@@ -51,10 +51,10 @@ erDiagram
bigint id PK "상영시간표 ID"
bigint movie_id FK "영화 ID"
bigint theater_id FK "상영관 ID"
date date "상영 날짜"
date running_date "상영 날짜"
int round "회차"
time start_time "시작 시간"
time end_time "종료 시간"
time start_at "시작 시간"
time end_at "종료 시간"
datetime created_at "등록일시"
datetime updated_at "수정일시"
}
@@ -63,7 +63,7 @@ erDiagram
bigint seat_id FK "좌석 ID"
bigint movie_times_id FK "상영시간표 ID"
bigint payment_id FK "결제 ID"
varchar ticket_status "상태 - 구매가능/예약진행중/판매완료"
varchar status "상태 - 구매가능/예약진행중/판매완료"
int ticket_price "가격"
datetime created_at "등록일시"
datetime updated_at "수정일시"
@@ -73,8 +73,8 @@ erDiagram
bigint id PK "결제 ID"
bigint user_id FK "유저ID"
varchar type "결제 타입 - 예) 네이버페이, 카카오페이"
varchar payment_status "상태 - 완료/환불/실패"
varchar failed_reason "실패사유 - 컬럼명을 알아보기 쉬운가?"
varchar status "상태 - 완료/환불/실패"
varchar failed_message "실패사유 - 컬럼명을 알아보기 쉬운가?"
varchar payment_number "예매번호"
int total_price "결제 금액"
datetime created_at "결제일시"
@@ -83,9 +83,10 @@ erDiagram
USER ||--o{ PAYMENT : ""
USER {
bigint id "회원"
varchar name "이름"
varchar email "이메일"
varchar password "비밀번호"
varchar grade "등급 - 고객/임직원"
varchar email "이메일"
varchar phone "휴대폰 번호"
boolean is_deleted "탈퇴여부"
datetime deleted_at "탈퇴일시"

3
server/.gitignore vendored
View File

@@ -200,4 +200,7 @@ gradle-app.setting
# JDT-specific (Eclipse Java Development Tools)
.classpath
# log
/logs
# End of https://www.toptal.com/developers/gitignore/api/macos,windows,intellij+all,gradle,visualstudiocode

View File

@@ -1,7 +1,7 @@
plugins {
java
id ("org.springframework.boot") version "2.6.7"
id ("io.spring.dependency-management") version "1.0.11.RELEASE"
id("org.springframework.boot") version "2.6.7"
id("io.spring.dependency-management") version "1.0.11.RELEASE"
}
group = "com.ticketing"
@@ -23,20 +23,30 @@ 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-validation")
implementation ("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
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")
implementation ("com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.4")
modules {
module("org.springframework.boot:spring-boot-starter-logging") {
replacedBy("org.springframework.boot:spring-boot-starter-log4j2", "Use Log4j2 instead of Logback")
}
}
compileOnly ("org.projectlombok:lombok")
runtimeOnly ("mysql:mysql-connector-java")
annotationProcessor ("org.projectlombok:lombok")
compileOnly("org.projectlombok:lombok")
runtimeOnly("mysql:mysql-connector-java")
annotationProcessor("org.projectlombok:lombok")
testImplementation ("org.springframework.boot:spring-boot-starter-test")
testImplementation ("org.springframework.security:spring-security-test")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.springframework.security:spring-security-test")
}
tasks.withType<Test> {

View File

@@ -2,7 +2,9 @@ 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 {

View File

@@ -0,0 +1,28 @@
package com.ticketing.server.global.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.ResourceBundleMessageSource;
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
@Configuration
public class MessagesConfig {
@Bean
public ResourceBundleMessageSource messageSource() {
ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
messageSource.setBasename("i18n/messages");
messageSource.setDefaultEncoding("UTF-8");
return messageSource;
}
@Bean
public LocalValidatorFactoryBean getValidator() {
LocalValidatorFactoryBean factoryBean = new LocalValidatorFactoryBean();
factoryBean.setValidationMessageSource(messageSource());
return factoryBean;
}
}

View File

@@ -0,0 +1,29 @@
package com.ticketing.server.global.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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;
import org.springframework.security.crypto.factory.PasswordEncoderFactories;
import org.springframework.security.crypto.password.PasswordEncoder;
@Configuration
@EnableWebSecurity
public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
@Bean
public PasswordEncoder passwordEncoder() {
return PasswordEncoderFactories.createDelegatingPasswordEncoder();
}
@Override
protected void configure(HttpSecurity http) throws Exception {
http
.cors().disable()
.csrf().disable()
.formLogin().disable()
.headers().frameOptions().disable();
}
}

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,24 @@
package com.ticketing.server.global.validator.constraints;
import com.ticketing.server.global.validator.constraintvalidators.PhoneValidator;
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;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = {PhoneValidator.class})
@Documented
public @interface Phone {
String message() default "{validation.phone}";
Class<?>[] groups() default {};
Class<? extends Payload>[] payload() default {};
}

View File

@@ -0,0 +1,21 @@
package com.ticketing.server.global.validator.constraintvalidators;
import com.ticketing.server.global.validator.constraints.Phone;
import java.util.regex.Pattern;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
public class PhoneValidator implements ConstraintValidator<Phone, String> {
private static final String PATTERN = "\\d{3}-\\d{4}-\\d{4}";
@Override
public boolean isValid(String value, ConstraintValidatorContext context) {
if (value == null || value.isEmpty()) {
return true;
}
return Pattern.matches(PATTERN, value);
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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> {
}

View File

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

View File

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

View File

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

View File

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

View File

@@ -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 {
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -0,0 +1,36 @@
package com.ticketing.server.user.application;
import com.ticketing.server.user.application.request.SignUpRequest;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.service.UserServiceImpl;
import java.util.Optional;
import javax.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.crypto.password.PasswordEncoder;
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
@RequiredArgsConstructor
@RequestMapping("/user")
public class UserController {
private final UserServiceImpl userService;
private final PasswordEncoder passwordEncoder;
@PostMapping
public ResponseEntity<Object> register(@RequestBody @Valid SignUpRequest signUpRequest) {
Optional<User> user = userService.register(signUpRequest.toSignUp(passwordEncoder));
if (user.isEmpty()) {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
}
return ResponseEntity.status(HttpStatus.CREATED).build();
}
}

View File

@@ -0,0 +1,35 @@
package com.ticketing.server.user.application.request;
import com.ticketing.server.global.validator.constraints.Phone;
import com.ticketing.server.user.service.dto.SignUp;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import lombok.Getter;
import org.springframework.security.crypto.password.PasswordEncoder;
@Getter
public class SignUpRequest {
@NotEmpty(message = "{validation.not.empty.name}")
private String name;
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotEmpty(message = "{validation.not.empty.password}")
private String password;
@NotEmpty(message = "{validation.not.empty.phone}")
@Phone
private String phone;
public SignUp toSignUp(PasswordEncoder passwordEncoder) {
return new SignUp(name, email, getEncodePassword(passwordEncoder), phone);
}
private String getEncodePassword(PasswordEncoder passwordEncoder) {
return passwordEncoder.encode(password);
}
}

View File

@@ -0,0 +1,56 @@
package com.ticketing.server.user.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import com.ticketing.server.global.validator.constraints.Phone;
import java.time.LocalDateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Entity
@Getter
@NoArgsConstructor
public class User extends AbstractEntity {
@Column(name = "name")
@NotEmpty(message = "{validation.not.empty.name}")
private String name;
@Column(name = "email")
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@Column(name = "password")
@NotEmpty(message = "{validation.not.empty.password}")
private String password;
@Column(name = "grade")
@NotNull(message = "{validation.not.empty.grade}")
@Enumerated(value = EnumType.STRING)
private UserGrade grade = UserGrade.GUEST;
@Column(name = "phone")
@NotEmpty(message = "{validation.not.empty.phone}")
@Phone
private String phone;
private boolean isDeleted = false;
private LocalDateTime deletedAt;
public 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;
}
}

View File

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

View File

@@ -0,0 +1,13 @@
package com.ticketing.server.user.domain.repository;
import com.ticketing.server.user.domain.User;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface UserRepository extends JpaRepository<User, Long> {
Optional<User> findByEmail(String email);
}

View File

@@ -0,0 +1,37 @@
package com.ticketing.server.user.service;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.repository.UserRepository;
import com.ticketing.server.user.service.dto.SignUp;
import com.ticketing.server.user.service.interfaces.UserService;
import java.util.Optional;
import javax.validation.Valid;
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 UserServiceImpl implements UserService {
private final UserRepository userRepository;
@Override
@Transactional
public Optional<User> register(@Valid SignUp signUpDto) {
Optional<User> user = userRepository.findByEmail(signUpDto.getEmail());
if (user.isPresent()) {
log.error("이미 존재하는 이메일이기 때문에 신규 회원가입을 진행할 수 없습니다. :: {}", signUpDto);
return Optional.empty();
}
User newUser = userRepository.save(signUpDto.toUser());
return Optional.of(newUser);
}
}

View File

@@ -0,0 +1,47 @@
package com.ticketing.server.user.service.dto;
import com.ticketing.server.global.validator.constraints.Phone;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.UserGrade;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import lombok.Getter;
@Getter
public class SignUp {
@NotEmpty(message = "{validation.not.empty.name}")
private String name;
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotEmpty(message = "{validation.not.empty.password}")
private String password;
@NotEmpty(message = "{validation.not.empty.phone}")
@Phone
private String phone;
public SignUp(String name, String email, String password, String phone) {
this.name = name;
this.email = email;
this.password = password;
this.phone = phone;
}
public User toUser() {
return new User(this.name, this.email, password, UserGrade.GUEST, this.phone);
}
@Override
public String toString() {
return "SignUp{" +
"name='" + name + '\'' +
", email='" + email + '\'' +
", phone='" + phone + '\'' +
'}';
}
}

View File

@@ -0,0 +1,12 @@
package com.ticketing.server.user.service.interfaces;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.service.dto.SignUp;
import java.util.Optional;
import javax.validation.Valid;
public interface UserService {
Optional<User> register(@Valid SignUp signUpDto);
}

View File

@@ -14,17 +14,6 @@ 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:

View File

@@ -0,0 +1,7 @@
validation.not.empty.name="\uC774\uB984\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.email="\uC774\uBA54\uC77C\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.password="\uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.grade="\uC0AC\uC6A9\uC790 \uB4F1\uAE09\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.phone="\uD734\uB300\uBC88\uD638\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.email="\uC774\uBA54\uC77C\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."
validation.phone="\uD734\uB300\uBC88\uD638\uAC00 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."

View File

@@ -0,0 +1,7 @@
validation.not.empty.name="name is required."
validation.not.empty.email="email is required."
validation.not.empty.password="password is required."
validation.not.empty.grade="user grade is required."
validation.not.empty.phone="phone is required."
validation.email="email is not valid."
validation.phone="phone is not valid."

View File

@@ -0,0 +1,7 @@
validation.not.empty.name="\uC774\uB984\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.email="\uC774\uBA54\uC77C\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.password="\uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.grade="\uC0AC\uC6A9\uC790 \uB4F1\uAE09\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.phone="\uD734\uB300\uBC88\uD638\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.email="\uC774\uBA54\uC77C\uC774 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."
validation.phone="\uD734\uB300\uBC88\uD638\uAC00 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4."

View File

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

View File

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

View File

@@ -0,0 +1,138 @@
package com.ticketing.server.user.domain;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.NullAndEmptySource;
import org.junit.jupiter.params.provider.ValueSource;
class UserTest {
private static Validator validator;
@BeforeEach
void init() {
ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
validator = factory.getValidator();
}
@Test
@DisplayName("유저 검증 성공")
void validateSuccess() {
// given
User user = new User("유저1", "email@gmail.com", "testPassword01", UserGrade.GUEST, "010-1234-5678");
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).isEmpty();
}
@ParameterizedTest
@NullAndEmptySource
@DisplayName("name null 혹은 빈값 검증")
void nameNullOrEmpty(String name) {
// given
User user = new User(name, "email@gmail.com", "testPassword01", UserGrade.GUEST, "010-1234-5678");
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@NullAndEmptySource
@DisplayName("email null or empty 검증")
void emailNullOrEmpty(String email) {
// given
User user = new User("유저1", email, "testPassword01", UserGrade.GUEST, "010-1234-5678");
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@ValueSource(strings = {"email", "@hello.com", "12Bye#domain.com"})
@DisplayName("email 실패 검증")
void emailValid(String email) {
// given
User user = new User("유저1", email, "testPassword01", UserGrade.GUEST, "010-1234-5678");
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@NullAndEmptySource
@DisplayName("password null 혹은 빈값 검증")
void passwordNullOrEmpty(String password) {
// given
User user = new User("유저1", "email@gmail.com", password, UserGrade.GUEST, "010-1234-5678");
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@Test
@DisplayName("grade null 검증")
void gradeNull() {
// given
User user = new User("유저1", "email@gmail.com", "testPassword01", null, "010-1234-5678");
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@DisplayName("phone null or empty 검증")
@NullAndEmptySource
void phoneNullOrEmpty(String phone) {
// given
User user = new User("유저1", "email@gmail.com", "testPassword01", UserGrade.GUEST, phone);
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@DisplayName("phone 실패 검증")
@ValueSource(strings = {"010-123-1234", "02-0444-4044", "033-7953", "033-0455-504"})
void phoneValid(String phone) {
// given
User user = new User("유저1", "email@gmail.com", "testPassword01", UserGrade.GUEST, phone);
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
}

View File

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

View File

@@ -0,0 +1,66 @@
package com.ticketing.server.user.service;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.UserGrade;
import com.ticketing.server.user.domain.repository.UserRepository;
import com.ticketing.server.user.service.dto.SignUp;
import java.util.Optional;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
class UserServiceImplTest {
User user;
SignUp signUp;
@Mock
UserRepository userRepository;
@InjectMocks
UserServiceImpl userService;
@BeforeEach
void init() {
signUp = new SignUp("유저", "ticketing@gmail.com", "123456", "010-1234-5678");
user = new User("유저", "ticketing@gmail.com", "123456", UserGrade.GUEST, "010-1234-5678");
}
@Test
@DisplayName("이미 동일한 이메일이 있을 경우")
void duplicateEmailException() {
// given
when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.of(user));
// when
Optional<User> user = userService.register(signUp);
// then
assertThat(user).isEmpty();
}
@Test
@DisplayName("회원가입 성공했을 경우")
void UserServiceImplTest() {
// given
when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.empty());
when(userRepository.save(any())).thenReturn(user);
// when
Optional<User> user = userService.register(signUp);
// then
assertThat(user).isPresent();
}
}

View File

@@ -0,0 +1,24 @@
package com.ticketing.server.user.service.dto;
import static org.assertj.core.api.Assertions.assertThat;
import com.ticketing.server.user.domain.User;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
class SignUpTest {
@Test
@DisplayName("toUser 메소드로 User 객체 생성")
void toUser() {
// given
SignUp signUp = new SignUp("유저1", "ticketing@gmail.com", "123456", "010-1234-5678");
// when
User user = signUp.toUser();
// then
assertThat(user).isInstanceOf(User.class);
}
}

View File

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