Compare commits

...

10 Commits

Author SHA1 Message Date
손창현
ac30d96b6f feat: TheaterRepositoryTest - save 2022-05-31 20:06:31 +09:00
손창현
0db2d78dee refactor: Movie Entity - 영화 제목 unique 설정 2022-05-31 18:37:17 +09:00
손창현
30ef20be3f feat: MovieRepositoryTest - save, find with title 2022-05-31 17:11:38 +09:00
손창현
952c1a1070 add: SwaggerConfig 2022-05-31 10:02:11 +09:00
손창현
585206d528 add: swagger implementation 추가 2022-05-31 09:26:43 +09:00
Kim DongHyo
0c26555665 #3 회원탈퇴 및 패스워드 변경 구현 (#16)
* feat: user delete 메소드 구현 및 테스트 객체 MethodSource 형식으로 분리

* feat: 회원탈퇴 구현

* refactor: PasswordMismatchException 패키지 위치 변경

* feat: oldpassword, newpassword properties 추가

* test: 패스워드 변경 메소드 테스트 코드 작성

* feat: 패스워드 변경 메소드 구현

* feat: 패스워드 변경 서비스 구현

* feat: 패스워드 변경 컨트롤러 구현

* refactor: controller log 추가

* feat: UserPasswordModifyRequest -> UserModifyPasswordRequest 네이밍 변경

* refactor: param name 변경

* refactor: 패스워드 변경 시 삭제된 이메일 제외하고 불러오는 형식으로 변경

* refactor: 메소드 네이밍 수정

* feat: User ResponseDTO 작성

* refactor: controller delete -> deleteUser 메소드 명 변경

* refactor: modifyPassword @Transactional 적용

* refactor: dto 객체 명 DTO 붙여서 구분

* refactor: register method Optional 반환 -> Exception 처리

Optional 반환과 Exception 반환이 혼용되어 사용되고 있어, Exception 으로 통일

* refactor: NotFoundEmailException 구현

* refactor: User delete method Optional 반환 -> Exception 처리 

Optional 반환과 Exception 반환이 혼용되어 사용되고 있어, Exception 으로 통일

* refactor: modifyPassword method Optional 반환 -> Exception 처리

Optional 반환과 Exception 반환이 혼용되어 사용되고 있어, Exception 으로 통일

* refactor: comparePassword -> checkPassword 메서드 네이밍 변경

* refactor: modifyPassword -> changePassword 네이밍 변경

* refactor: provide 메소드 선언 위치 하단으로 변경 및 users Map 추가

정상적인 users 를 재사용하기 위해 분리하여 선언

* refactor: provideDeleteUsers 공통 users 사용하는 방식으로 수정

* refactor: changePassword 공통 users 사용하는 방식으로 수정

* refactor: UserModifyPasswordResponse -> UserChangePasswordResponse

* refactor: dto 클래스 네이밍 변경으로 인한 인수, 변수, 메소드 네이밍 수정
2022-05-26 10:51:38 +09:00
Kim DongHyo
9f70ee0ed9 #3 회원가입 기능 구현 (#15)
* feat: Create Phone validator annotation

* feat: validation annotation 변경 및 @Builder 제거

* refactor: builder 에서 생성자로 변경

* refactor: value null or empty 시 true 반환

* test: user validator 테스트 코드 작성

* refactor: grade @NotNull message 추가

* feat: spring-boot-starter-security 주석해제

* feat: 시큐리티 disable 및 psswordEncoder 빈등록

* feat: 회원가입 Service 메소드 구현

* feat: findByEmail Repository add

* feat: email 중복 시 예외 클래스 생성

* feat: 회원가입 컨트롤러 생성

* test: 회원가입 서비스 테스트 코드 작성

* docs: logs 디렉토리 추가

* refactor: 맨 하단 공백 추가

* refactor: properties message 다국어 적용

* refactor: 재정렬

* fix: @EnableJpaAuditing 중복 선언 제거

* fix: service 구현체와 동일하게 파라미터 수정

* refactor: validateEmail 메소드 병합

* refactor: SignUp 에서 UserEntity 생성하도록 변경

* refactor: message 외부로 분리

* refactor: 중복 이메일일 경우 Exception 대신 Optional 처리

* test: signUp toUser 메소드 테스트

* refactor: Phone 애노테이션 적용 부분 message 제거

* refactor: email error log add

* refactor: PasswordEncoder 를 SignUp 생성 시 적용

서비스에서는 파라미터로 넘어온 SignUp을 바로 엔티티로 저장하는 구조로 변경
2022-05-21 00:43:14 +09:00
Kim DongHyo
38365de76c Update pull_request_template.md 2022-05-17 00:56:42 +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
90 changed files with 2096 additions and 34 deletions

9
.idea/Ticketing.iml generated Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Ticketing.iml" filepath="$PROJECT_DIR$/.idea/Ticketing.iml" />
</modules>
</component>
</project>

10
.idea/runConfigurations.xml generated Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
</set>
</option>
</component>
</project>

6
.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

36
.idea/workspace.xml generated Normal file
View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="2a93e153-a90c-44db-b1da-6c4424693422" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/server/src/main/java/com/ticketing/server/global/config/SwaggerConfig.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/server/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/server/build.gradle.kts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectId" id="29uM8tIDp7UqdPYE3auX216NPaN" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="2a93e153-a90c-44db-b1da-6c4424693422" name="Changes" comment="" />
<created>1653958362269</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1653958362269</updated>
</task>
<servers />
</component>
</project>

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 "탈퇴일시"

View File

@@ -1,4 +1,4 @@
## 작업 내용
## 작업 분류
- [ ] 기능 추가
- [ ] 코드 수정
- [ ] 환경 설정
@@ -30,4 +30,3 @@
- [ ] 구현 사항에 대한 테스트를 완료했습니다.
- [ ] 의도한 내용 이외에 다른 코드에는 변경 사항이 없는지 확인했습니다.
- [ ] 코드 스타일을 적용하여 팀 코딩 컨벤션에 맞게 작성했습니다.
- [ ] 팀원 모두 구현 내용 및 코드에 대해 이해하고 있습니다.

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,35 @@ 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("org.springframework.boot:spring-boot-starter-log4j2")
implementation("org.projectlombok:lombok:1.18.20")
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.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")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.springframework.security:spring-security-test")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
testImplementation ("org.springframework.boot:spring-boot-starter-test")
testImplementation ("org.springframework.security:spring-security-test")
compileOnly("org.projectlombok:lombok")
runtimeOnly("mysql:mysql-connector-java")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
annotationProcessor("org.projectlombok:lombok")
}
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,69 @@
package com.ticketing.server.global.config;
import java.util.Arrays;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import springfox.documentation.builders.ApiInfoBuilder;
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;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger.web.UiConfiguration;
import springfox.documentation.swagger.web.UiConfigurationBuilder;
@Configuration
@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()
.apis(RequestHandlerSelectors.any())
.paths(PathSelectors.ant("/api/**")).build()
.apiInfo(apiInfo())
.securityContexts(Arrays.asList(securityContext()))
.securitySchemes(Arrays.asList(apiKey()));
}
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
.title("Ticketing REST API Document")
.version("v1")
.description("Ticketing REST API 문서").build();
}
private ApiKey apiKey() {
return new ApiKey(SECURITY_SCHEMA_NAME, "Authorization", "header");
}
private SecurityContext securityContext() {
return SecurityContext.builder().securityReferences(defaultAuth()).build();
}
private List<SecurityReference> defaultAuth() {
AuthorizationScope authorizationScope = new AuthorizationScope(AUTHORIZATION_SCOPE_GLOBAL,
AUTHORIZATION_SCOPE_GLOBAL_DESC);
AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
authorizationScopes[0] = authorizationScope;
return Arrays.asList(new SecurityReference(SECURITY_SCHEMA_NAME, authorizationScopes));
}
@Bean
UiConfiguration uiConfig() {
return UiConfigurationBuilder.builder()
.build();
}
}

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,9 @@
package com.ticketing.server.global.exception;
public class AlreadyDeletedException extends RuntimeException {
public AlreadyDeletedException(String message) {
super(message);
}
}

View File

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

View File

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

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,24 @@
package com.ticketing.server.movie.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Entity
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class Movie extends AbstractEntity {
@NotNull
@Column(unique = true)
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,21 @@
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.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Entity
@Getter
@NoArgsConstructor
@AllArgsConstructor
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,13 @@
package com.ticketing.server.movie.domain.repository;
import com.ticketing.server.movie.domain.Movie;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface MovieRepository extends JpaRepository<Movie, Long> {
Optional<Movie> findByTitle(String title);
}

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,13 @@
package com.ticketing.server.movie.domain.repository;
import com.ticketing.server.movie.domain.Theater;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface TheaterRepository extends JpaRepository<Theater, Long> {
Optional<Theater> findByTheaterNumber(Integer theaterNumber);
}

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,56 @@
package com.ticketing.server.user.application;
import com.ticketing.server.user.application.request.SignUpRequest;
import com.ticketing.server.user.application.request.UserDeleteRequest;
import com.ticketing.server.user.application.request.UserModifyPasswordRequest;
import com.ticketing.server.user.application.response.SignUpResponse;
import com.ticketing.server.user.application.response.UserDeleteResponse;
import com.ticketing.server.user.application.response.UserChangePasswordResponse;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.service.UserServiceImpl;
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.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PatchMapping;
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")
@Slf4j
public class UserController {
private final UserServiceImpl userService;
private final PasswordEncoder passwordEncoder;
@PostMapping
public ResponseEntity<Object> register(@RequestBody @Valid SignUpRequest request) {
User user = userService.register(request.toSignUpDto(passwordEncoder));
return ResponseEntity.status(HttpStatus.CREATED).body(SignUpResponse.of(user));
}
@DeleteMapping
public ResponseEntity<Object> deleteUser(@RequestBody @Valid UserDeleteRequest request) {
User user = userService.delete(request.toDeleteUserDto(passwordEncoder));
return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.of(user));
}
@PatchMapping("/password")
public ResponseEntity<Object> changePassword(@RequestBody @Valid UserModifyPasswordRequest request) {
if (request.oldEqualNew()) {
log.error("기존 패스워드와 동일한 패스워드로 변경할 수 없습니다.");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
}
User user = userService.changePassword(request.toChangePasswordDto(passwordEncoder));
return ResponseEntity.status(HttpStatus.OK).body(UserChangePasswordResponse.of(user));
}
}

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.SignUpDTO;
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 SignUpDTO toSignUpDto(PasswordEncoder passwordEncoder) {
return new SignUpDTO(name, email, getEncodePassword(passwordEncoder), phone);
}
private String getEncodePassword(PasswordEncoder passwordEncoder) {
return passwordEncoder.encode(password);
}
}

View File

@@ -0,0 +1,23 @@
package com.ticketing.server.user.application.request;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import lombok.Getter;
import org.springframework.security.crypto.password.PasswordEncoder;
@Getter
public class UserDeleteRequest {
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotEmpty(message = "{validation.not.empty.password}")
private String password;
public DeleteUserDTO toDeleteUserDto(PasswordEncoder passwordEncoder) {
return new DeleteUserDTO(email, password, passwordEncoder);
}
}

View File

@@ -0,0 +1,30 @@
package com.ticketing.server.user.application.request;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import lombok.Getter;
import org.springframework.security.crypto.password.PasswordEncoder;
@Getter
public class UserModifyPasswordRequest {
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotEmpty(message = "{validation.not.empty.oldpassword}")
private String oldPassword;
@NotEmpty(message = "{validation.not.empty.newpassword}")
private String newPassword;
public ChangePasswordDTO toChangePasswordDto(PasswordEncoder passwordEncoder) {
return new ChangePasswordDTO(email, oldPassword, newPassword, passwordEncoder);
}
public boolean oldEqualNew() {
return oldPassword.equals(newPassword);
}
}

View File

@@ -0,0 +1,20 @@
package com.ticketing.server.user.application.response;
import com.ticketing.server.user.domain.User;
public class SignUpResponse {
public static SignUpResponse of(User user) {
return new SignUpResponse(user.getName(), user.getEmail());
}
public SignUpResponse(String name, String email) {
this.name = name;
this.email = email;
}
private String name;
private String email;
}

View File

@@ -0,0 +1,20 @@
package com.ticketing.server.user.application.response;
import com.ticketing.server.user.domain.User;
public class UserChangePasswordResponse {
public static SignUpResponse of(User user) {
return new SignUpResponse(user.getName(), user.getEmail());
}
public UserChangePasswordResponse(String name, String email) {
this.name = name;
this.email = email;
}
private String name;
private String email;
}

View File

@@ -0,0 +1,20 @@
package com.ticketing.server.user.application.response;
import com.ticketing.server.user.domain.User;
public class UserDeleteResponse {
public static SignUpResponse of(User user) {
return new SignUpResponse(user.getName(), user.getEmail());
}
public UserDeleteResponse(String name, String email) {
this.name = name;
this.email = email;
}
private String name;
private String email;
}

View File

@@ -0,0 +1,86 @@
package com.ticketing.server.user.domain;
import com.ticketing.server.global.dto.repository.AbstractEntity;
import com.ticketing.server.global.exception.AlreadyDeletedException;
import com.ticketing.server.global.exception.PasswordMismatchException;
import com.ticketing.server.global.validator.constraints.Phone;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
import com.ticketing.server.user.service.dto.PasswordMatches;
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 {
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;
}
@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 delete(DeleteUserDTO deleteUser) {
if (isDeleted) {
throw new AlreadyDeletedException("이미 탈퇴된 회원 입니다.");
}
checkPassword(deleteUser);
isDeleted = true;
deletedAt = LocalDateTime.now();
return this;
}
public User changePassword(ChangePasswordDTO changePassword) {
checkPassword(changePassword);
this.password = changePassword.getEncodePassword();
return this;
}
private void checkPassword(PasswordMatches passwordMatches) {
if (!passwordMatches.passwordMatches(password)) {
throw new PasswordMismatchException();
}
}
}

View File

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

View File

@@ -0,0 +1,15 @@
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);
Optional<User> findByEmailAndIsDeletedFalse(String email);
}

View File

@@ -0,0 +1,65 @@
package com.ticketing.server.user.service;
import com.ticketing.server.global.exception.NotFoundEmailException;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.domain.repository.UserRepository;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
import com.ticketing.server.user.service.dto.SignUpDTO;
import com.ticketing.server.user.service.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 User register(@Valid SignUpDTO signUpDto) {
Optional<User> user = userRepository.findByEmail(signUpDto.getEmail());
if (user.isPresent()) {
log.error("이미 존재하는 이메일이기 때문에 신규 회원가입을 진행할 수 없습니다. :: {}", signUpDto);
throw new IllegalArgumentException("이미 존재하는 이메일이기 때문에 신규 회원가입을 진행할 수 없습니다.");
}
return userRepository.save(signUpDto.toUser());
}
@Override
@Transactional
public User delete(@Valid DeleteUserDTO deleteUserDto) {
Optional<User> optionalUser = userRepository.findByEmail(deleteUserDto.getEmail());
if (optionalUser.isEmpty()) {
log.error("존재하지 않는 이메일 입니다. :: {}", deleteUserDto);
throw new NotFoundEmailException();
}
User user = optionalUser.get();
return user.delete(deleteUserDto);
}
@Override
@Transactional
public User changePassword(@Valid ChangePasswordDTO changePasswordDto) {
Optional<User> optionalUser = userRepository.findByEmailAndIsDeletedFalse(changePasswordDto.getEmail());
if (optionalUser.isEmpty()) {
log.error("존재하지 않는 이메일 입니다. :: {}", changePasswordDto);
throw new NotFoundEmailException();
}
User user = optionalUser.get();
return user.changePassword(changePasswordDto);
}
}

View File

@@ -0,0 +1,47 @@
package com.ticketing.server.user.service.dto;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import org.springframework.security.crypto.password.PasswordEncoder;
public class ChangePasswordDTO implements PasswordMatches {
public ChangePasswordDTO(String email, String oldPassword, String newPassword, PasswordEncoder passwordEncoder) {
this.email = email;
this.oldPassword = oldPassword;
this.newPassword = newPassword;
this.passwordEncoder = passwordEncoder;
}
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotEmpty(message = "{validation.not.empty.oldpassword}")
private String oldPassword;
@NotEmpty(message = "{validation.not.empty.newpassword}")
private String newPassword;
private PasswordEncoder passwordEncoder;
public String getEmail() {
return email;
}
@Override
public boolean passwordMatches(String password) {
return passwordEncoder.matches(oldPassword, password);
}
public String getEncodePassword() {
return passwordEncoder.encode(newPassword);
}
@Override
public String toString() {
return "ChangePassword{" +
"email='" + email + '\'' +
'}';
}
}

View File

@@ -0,0 +1,40 @@
package com.ticketing.server.user.service.dto;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotEmpty;
import org.springframework.security.crypto.password.PasswordEncoder;
public class DeleteUserDTO implements PasswordMatches {
public DeleteUserDTO(String email, String inputPassword, PasswordEncoder passwordEncoder) {
this.email = email;
this.inputPassword = inputPassword;
this.passwordEncoder = passwordEncoder;
}
@NotEmpty(message = "{validation.not.empty.email}")
@Email(message = "{validation.email}")
private String email;
@NotEmpty(message = "{validation.not.empty.password}")
private String inputPassword;
private PasswordEncoder passwordEncoder;
@Override
public boolean passwordMatches(String password) {
return passwordEncoder.matches(this.inputPassword, password);
}
public String getEmail() {
return email;
}
@Override
public String toString() {
return "DeleteUser{" +
"email='" + email + '\'' +
'}';
}
}

View File

@@ -0,0 +1,7 @@
package com.ticketing.server.user.service.dto;
@FunctionalInterface
public interface PasswordMatches {
boolean passwordMatches(String password);
}

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 SignUpDTO {
@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 SignUpDTO(String name, String email, String password, String phone) {
this.name = name;
this.email = email;
this.password = password;
this.phone = phone;
}
public User toUser() {
return new User(this.name, this.email, password, UserGrade.GUEST, this.phone);
}
@Override
public String toString() {
return "SignUp{" +
"name='" + name + '\'' +
", email='" + email + '\'' +
", phone='" + phone + '\'' +
'}';
}
}

View File

@@ -0,0 +1,17 @@
package com.ticketing.server.user.service.interfaces;
import com.ticketing.server.user.domain.User;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
import com.ticketing.server.user.service.dto.SignUpDTO;
import javax.validation.Valid;
public interface UserService {
User register(@Valid SignUpDTO signUpDto);
User delete(@Valid DeleteUserDTO deleteUserDto);
User changePassword(@Valid ChangePasswordDTO changePasswordDto);
}

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,9 @@
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.oldpassword="\uD604\uC7AC \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.newpassword="\uBCC0\uACBD\uD560 \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.grade="\uC0AC\uC6A9\uC790 \uB4F1\uAE09\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.phone="\uD734\uB300\uBC88\uD638\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.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,9 @@
validation.not.empty.name="name is required."
validation.not.empty.email="email is required."
validation.not.empty.password="password is required."
validation.not.empty.oldpassword="Old Password is required."
validation.not.empty.newpassword="New Password is required."
validation.not.empty.grade="user grade is required."
validation.not.empty.phone="phone is required."
validation.email="email is not valid."
validation.phone="phone is not valid."

View File

@@ -0,0 +1,9 @@
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.oldpassword="\uD604\uC7AC \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.newpassword="\uBCC0\uACBD\uD560 \uD328\uC2A4\uC6CC\uB4DC\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.grade="\uC0AC\uC6A9\uC790 \uB4F1\uAE09\uC740 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.not.empty.phone="\uD734\uB300\uBC88\uD638\uB294 \uD544\uC218 \uC785\uB2C8\uB2E4."
validation.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,5 @@
package com.ticketing.server.movie.domain;
public class MovieTest {
}

View File

@@ -0,0 +1,63 @@
package com.ticketing.server.movie.domain.repository;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import com.ticketing.server.movie.domain.Movie;
import java.util.Optional;
import javax.transaction.Transactional;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Rollback;
@SpringBootTest
@Transactional
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
public class MovieRepositoryTest {
@Autowired
MovieRepository movieRepository;
@Order(1)
@Test
@Rollback(value = false)
@DisplayName("Movie Repository - test saving movie")
void shouldAbleToSaveMovie() {
// given
Movie movie = new Movie("범죄도시 2", 106);
// when
Movie savedMovie = movieRepository.save(movie);
// then
assertEquals(movie.getTitle(), savedMovie.getTitle());
}
@Order(2)
@Test
@DisplayName("Movie Repository Test - finding movie with title")
void ShouldAbleToFindMovieWithTitle() {
// given, when
Optional<Movie> optionalMovie = movieRepository.findByTitle("범죄도시 2");
// then
assertTrue(optionalMovie.isPresent());
}
@Order(3)
@Test
@DisplayName("Movie Repository Test - finding movie that doesn't exist")
void ShouldNotAbleToFindMovie() {
// given, when
Optional<Movie> optionalMovie = movieRepository.findByTitle("존재하지 않는 영화");
// then
assertFalse(optionalMovie.isPresent());
}
}

View File

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

View File

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

View File

@@ -0,0 +1,32 @@
package com.ticketing.server.movie.domain.repository;
import static org.junit.jupiter.api.Assertions.assertEquals;
import com.ticketing.server.movie.domain.Theater;
import javax.transaction.Transactional;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
@Transactional
public class TheaterRepositoryTest {
@Autowired
TheaterRepository theaterRepository;
@Test
@DisplayName("Theater Repository Test - saving theater")
void ShouldAbleToSaveTheater() {
// given
Theater theater = new Theater(1, 100);
// when
Theater savedTheater = theaterRepository.save(theater);
// then
assertEquals(theater.getTheaterNumber(), savedTheater.getTheaterNumber());
}
}

View File

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

View File

@@ -0,0 +1,9 @@
package com.ticketing.server.movie.service;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
public class MovieServiceImplTest {
}

View File

@@ -0,0 +1,280 @@
package com.ticketing.server.user.domain;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertAll;
import com.ticketing.server.global.exception.AlreadyDeletedException;
import com.ticketing.server.global.exception.PasswordMismatchException;
import com.ticketing.server.user.service.dto.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
import com.ticketing.server.user.service.dto.DeleteUserDtoTest;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
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.MethodSource;
class UserTest {
private Validator validator;
private Map<String, User> users;
@BeforeEach
void init() {
ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
validator = factory.getValidator();
users = provideCorrectUsers().collect(Collectors.toMap(User::getEmail, user -> user));
}
@ParameterizedTest
@MethodSource("provideDifferentPasswordDeleteUsers")
@DisplayName("입력된 패스워드가 다를 경우")
void passwordMismatchException(DeleteUserDTO deleteUser) {
// given
User user = users.get(deleteUser.getEmail());
// when
// then
assertThatThrownBy(() -> user.delete(deleteUser))
.isInstanceOf(PasswordMismatchException.class);
}
@ParameterizedTest
@MethodSource("provideDeleteUsers")
@DisplayName("이미 회원탈퇴 되어 있는 경우")
void alreadyDeletedException(DeleteUserDTO deleteUserDto) {
// given
User user = users.get(deleteUserDto.getEmail());
// when
user.delete(deleteUserDto);
// then
assertThatThrownBy(() -> user.delete(deleteUserDto))
.isInstanceOf(AlreadyDeletedException.class);
}
@ParameterizedTest
@MethodSource("provideDeleteUsers")
@DisplayName("회원탈퇴 성공")
void deleteSuccess(DeleteUserDTO deleteUserDto) {
// given
User user = users.get(deleteUserDto.getEmail());
// when
User deletedUser = user.delete(deleteUserDto);
// then
assertAll(
() -> assertThat(deletedUser.getDeletedAt()).isNotNull()
, () -> assertThat(deletedUser.isDeleted()).isTrue()
);
}
@Test
@DisplayName("입력받은 패스워드와 불일치로 변경 실패")
void changePasswordFail() {
// given
ChangePasswordDTO changePasswordDto = new ChangePasswordDTO("ticketing1@gmail.com", "1234567", "ticketing1234", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER);
User user = users.get(changePasswordDto.getEmail());
// when
// then
assertThatThrownBy(() -> user.changePassword(changePasswordDto))
.isInstanceOf(PasswordMismatchException.class);
}
@Test
@DisplayName("패스워드 변경 성공")
void changePasswordSuccess() {
// given
ChangePasswordDTO changePasswordDto = new ChangePasswordDTO("ticketing1@gmail.com", "123456", "ticketing1234", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER);
User user = users.get(changePasswordDto.getEmail());
String oldPassword = user.getPassword();
// when
User modifiedUser = user.changePassword(changePasswordDto);
// then
assertThat(modifiedUser.getPassword()).isNotEqualTo(oldPassword);
}
@ParameterizedTest
@MethodSource("provideCorrectUsers")
@DisplayName("유저 검증 성공")
void validateSuccess(User user) {
// given
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).isEmpty();
}
@ParameterizedTest
@MethodSource("provideNullOrEmptyOfName")
@DisplayName("name null 혹은 빈값 검증")
void nameNullOrEmpty(User user) {
// given
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@MethodSource("provideNullOrEmptyOfEmail")
@DisplayName("email null or empty 검증")
void emailNullOrEmpty(User user) {
// given
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@MethodSource("provideValidationFailedOfEmail")
@DisplayName("email 실패 검증")
void emailValid(User user) {
// given
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@MethodSource("provideNullOrEmptyOfPassword")
@DisplayName("password null 혹은 빈값 검증")
void passwordNullOrEmpty(User user) {
// given
// 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
@MethodSource("provideNullOrEmptyOfPhone")
@DisplayName("phone null or empty 검증")
void phoneNullOrEmpty(User user) {
// given
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
@ParameterizedTest
@MethodSource("provideValidationFailedOfPhone")
@DisplayName("phone 실패 검증")
void phoneValid(User user) {
// given
// when
Set<ConstraintViolation<User>> constraintViolations = validator.validate(user);
// then
assertThat(constraintViolations).hasSize(1);
}
public static Stream<User> provideCorrectUsers() {
return Stream.of(
new User("유저1", "ticketing1@gmail.com", "123456", UserGrade.GUEST, "010-1234-5678")
, new User("유저2", "ticketing2@gmail.com", "qwe123", UserGrade.GUEST, "010-2234-5678")
, new User("유저3", "ticketing3@gmail.com", "ticketing", UserGrade.STAFF, "010-3234-5678")
, new User("유저4", "ticketing4@gmail.com", "ticketing123456", UserGrade.STAFF, "010-4234-5678")
);
}
public static Stream<User> provideNullOrEmptyOfName() {
return Stream.of(
new User(null, "ticketing1@gmail.com", "123456", UserGrade.GUEST, "010-1234-5678")
, new User("", "ticketing2@gmail.com", "qwe123", UserGrade.GUEST, "010-2234-5678")
);
}
public static Stream<User> provideNullOrEmptyOfEmail() {
return Stream.of(
new User("유저1", null, "123456", UserGrade.GUEST, "010-1234-5678")
, new User("유저2", "", "qwe123", UserGrade.GUEST, "010-2234-5678")
);
}
public static Stream<User> provideValidationFailedOfEmail() {
return Stream.of(
new User("유저1", "email", "123456", UserGrade.GUEST, "010-1234-5678")
, new User("유저2", "@gmail.com", "qwe123", UserGrade.GUEST, "010-2234-5678")
, new User("유저3", "12Bye#domain.com", "ticketing", UserGrade.STAFF, "010-3234-5678")
);
}
public static Stream<User> provideNullOrEmptyOfPassword() {
return Stream.of(
new User("유저1", "ticketing1@gmail.com", null, UserGrade.GUEST, "010-1234-5678")
, new User("유저2", "ticketing2@gmail.com", "", UserGrade.GUEST, "010-2234-5678")
);
}
public static Stream<User> provideNullOrEmptyOfPhone() {
return Stream.of(
new User("유저1", "ticketing1@gmail.com", "123456", UserGrade.GUEST, null)
, new User("유저2", "ticketing2@gmail.com", "qwe123", UserGrade.GUEST, "")
);
}
public static Stream<User> provideValidationFailedOfPhone() {
return Stream.of(
new User("유저1", "ticketing1@gmail.com", "123456", UserGrade.GUEST, "010-123-1234")
, new User("유저2", "ticketing2@gmail.com", "qwe123", UserGrade.GUEST, "02-0444-4044")
, new User("유저3", "ticketing3@gmail.com", "ticketing", UserGrade.STAFF, "033-7953")
, new User("유저4", "ticketing4@gmail.com", "ticketing123456", UserGrade.STAFF, "033-0455-504")
);
}
public static Stream<DeleteUserDTO> provideDifferentPasswordDeleteUsers() {
return Stream.of(
new DeleteUserDTO("ticketing1@gmail.com", "1234561", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
, new DeleteUserDTO("ticketing2@gmail.com", "qwe1231", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
, new DeleteUserDTO("ticketing3@gmail.com", "ticketing1", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
, new DeleteUserDTO("ticketing4@gmail.com", "ticketing1234561", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
);
}
public static Stream<DeleteUserDTO> provideDeleteUsers() {
return Stream.of(
new DeleteUserDTO("ticketing1@gmail.com", "123456", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
, new DeleteUserDTO("ticketing2@gmail.com", "qwe123", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
, new DeleteUserDTO("ticketing3@gmail.com", "ticketing", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
, new DeleteUserDTO("ticketing4@gmail.com", "ticketing123456", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER)
);
}
}

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,123 @@
package com.ticketing.server.user.service;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import com.ticketing.server.global.exception.NotFoundEmailException;
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.ChangePasswordDTO;
import com.ticketing.server.user.service.dto.DeleteUserDTO;
import com.ticketing.server.user.service.dto.DeleteUserDtoTest;
import com.ticketing.server.user.service.dto.SignUpDTO;
import java.util.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;
SignUpDTO signUpDto;
DeleteUserDTO deleteUserDto;
ChangePasswordDTO changePasswordDto;
@Mock
UserRepository userRepository;
@InjectMocks
UserServiceImpl userService;
@BeforeEach
void init() {
signUpDto = new SignUpDTO("유저", "ticketing@gmail.com", "123456", "010-1234-5678");
user = new User("유저", "ticketing@gmail.com", "123456", UserGrade.GUEST, "010-1234-5678");
deleteUserDto = new DeleteUserDTO("ticketing@gmail.com", "123456", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER);
changePasswordDto = new ChangePasswordDTO("ticketing@gmail.com", "123456", "ticketing1234", DeleteUserDtoTest.CUSTOM_PASSWORD_ENCODER);
}
@Test
@DisplayName("이미 동일한 이메일이 있을 경우")
void duplicateEmailException() {
// given
when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.of(user));
// when
// then
assertThatThrownBy(() -> userService.register(signUpDto))
.isInstanceOf(IllegalArgumentException.class);
}
@Test
@DisplayName("회원가입 성공했을 경우")
void registerSuccess() {
// given
when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.empty());
when(userRepository.save(any())).thenReturn(user);
// when
User user = userService.register(signUpDto);
// then
assertThat(user).isNotNull();
}
@Test
@DisplayName("회원탈퇴 시 이메일이 존재하지 않을 경우")
void deleteFail() {
// given
when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.empty());
// when
// then
assertThatThrownBy(() -> userService.delete(deleteUserDto))
.isInstanceOf(NotFoundEmailException.class);
}
@Test
@DisplayName("회원탈퇴 성공했을 경우")
void deleteSuccess() {
// given
when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.of(user));
// when
User user = userService.delete(deleteUserDto);
// then
assertThat(user).isNotNull();
}
@Test
@DisplayName("패스워드 변경 시 이메일이 존재하지 않을 경우")
void changePasswordFail() {
// given
when(userRepository.findByEmailAndIsDeletedFalse("ticketing@gmail.com")).thenReturn(Optional.empty());
// when
// then
assertThatThrownBy(() -> userService.changePassword(changePasswordDto))
.isInstanceOf(NotFoundEmailException.class);
}
@Test
@DisplayName("패스워드 변경 성공했을 경우")
void changePasswordSuccess() {
// given
when(userRepository.findByEmailAndIsDeletedFalse("ticketing@gmail.com")).thenReturn(Optional.of(user));
// when
User user = userService.changePassword(changePasswordDto);
// then
assertThat(user).isNotNull();
}
}

View File

@@ -0,0 +1,37 @@
package com.ticketing.server.user.service.dto;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.security.crypto.password.PasswordEncoder;
public class DeleteUserDtoTest {
public static PasswordEncoder CUSTOM_PASSWORD_ENCODER = new CustomPasswordEncoder();
public static class CustomPasswordEncoder implements PasswordEncoder {
@Override
public String encode(CharSequence rawPassword) {
return null;
}
@Override
public boolean matches(CharSequence rawPassword, String encodedPassword) {
return rawPassword.toString().equals(encodedPassword);
}
}
@Test
@DisplayName("CustomPasswordEncoder matches 테스트")
void customPasswordEncoderMatches() {
// given
DeleteUserDTO deleteUserDto = new DeleteUserDTO("ticketing@gmail.com", "123456", CUSTOM_PASSWORD_ENCODER);
// when
// then
assertThat(deleteUserDto.passwordMatches("123456")).isTrue();
}
}

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 SignUpDtoTest {
@Test
@DisplayName("toUser 메소드로 User 객체 생성")
void toUser() {
// given
SignUpDTO signUp = new SignUpDTO("유저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