Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,17 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-h2console'
implementation 'org.springframework.boot:spring-boot-starter-security'

compileOnly 'org.projectlombok:lombok'
runtimeOnly 'com.h2database:h2'

annotationProcessor 'org.projectlombok:lombok'

testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.boot:spring-boot-starter-security-test'

testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation("org.assertj:assertj-core:3.27.7")
}

test {
Expand Down
7 changes: 6 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
요구사항
## <div style="text-align: center;">Queue Ticket</div>
<div style="text-align: center;">대량 트래픽 환경의 티켓 예매 시스템</div>

---

### 요구사항
- 로그인, 로그아웃
- 세션기반
- 예매 버튼 클릭시 대기열 진입
Expand Down
44 changes: 44 additions & 0 deletions src/main/java/com/queuetix/global/config/LocalSecurityConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package com.queuetix.global.config;

import jakarta.servlet.http.HttpServletResponse;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
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.configurers.AbstractHttpConfigurer;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.SecurityFilterChain;

@Configuration
@EnableWebSecurity
@Profile("local")
public class LocalSecurityConfig {
@Bean
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
http
.authorizeHttpRequests(auth -> auth
.requestMatchers("/api/login","/api/members").permitAll()
.anyRequest().authenticated()
)
.csrf(AbstractHttpConfigurer::disable)
.formLogin(AbstractHttpConfigurer::disable)
.httpBasic(AbstractHttpConfigurer::disable)
.logout(logout -> logout
.logoutUrl("/api/logout")
.invalidateHttpSession(true)
.clearAuthentication(true)
.deleteCookies("JSESSIONID")
.logoutSuccessHandler((request, response, authentication) -> {
response.setStatus(HttpServletResponse.SC_NO_CONTENT);
response.sendRedirect("/");
}));
return http.build();
}

@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
}
43 changes: 43 additions & 0 deletions src/main/java/com/queuetix/global/config/SecurityConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package com.queuetix.global.config;

import jakarta.servlet.http.HttpServletResponse;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
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.configurers.AbstractHttpConfigurer;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.SecurityFilterChain;

@Configuration
@EnableWebSecurity
@Profile("!local")
public class SecurityConfig {
@Bean
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
http
.authorizeHttpRequests(auth -> auth
.requestMatchers("/api/login","/api/members").permitAll()
.anyRequest().authenticated()
)
.formLogin(AbstractHttpConfigurer::disable)
.httpBasic(AbstractHttpConfigurer::disable)
.logout(logout -> logout
.logoutUrl("/api/logout")
.invalidateHttpSession(true)
.clearAuthentication(true)
.deleteCookies("JSESSIONID")
.logoutSuccessHandler((request, response, authentication) -> {
response.setStatus(HttpServletResponse.SC_NO_CONTENT);
response.sendRedirect("/");
}));
return http.build();
}

@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
package com.queuetix.global.exception;
package com.queuetix.global.exception.code;

import com.queuetix.global.exception.ErrorCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.HttpStatusCode;

@Getter
@RequiredArgsConstructor
public enum AuthErrorCode implements ErrorCode {
UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "인증에 실패하였습니다.")
, FORBIDDEN(HttpStatus.FORBIDDEN, "권한이 없습니다.");

private final HttpStatusCode httpStatusCode;
private final String message;

AuthErrorCode(HttpStatusCode httpStatusCode, String message) {
this.httpStatusCode = httpStatusCode;
this.message = message;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.queuetix.global.exception.code;

import com.queuetix.global.exception.ErrorCode;
import lombok.Getter;
import org.springframework.http.HttpStatus;
import org.springframework.http.HttpStatusCode;

@Getter
public enum MemberErrorCode implements ErrorCode {
MEMBER_DUPLICATED_LOGIN_ID(HttpStatus.CONFLICT, "중복된 아이디입니다.")
, MEMBER_DUPLICATED_EMAIL(HttpStatus.CONFLICT, "중복된 이메일입니다.")
, MEMBER_DUPLICATED_PHONE(HttpStatus.CONFLICT, "중복된 전화번호입니다.");

private final HttpStatusCode httpStatusCode;
private final String message;

MemberErrorCode(HttpStatusCode httpStatusCode, String message) {
this.httpStatusCode = httpStatusCode;
this.message = message;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import org.springframework.http.HttpStatusCode;

@Getter
@RequiredArgsConstructor
public enum QueueErrorCode implements ErrorCode {
QUEUE_TOKEN_REQUIRED(HttpStatus.FORBIDDEN, "대기열 접근 권한이 없습니다.")
, QUEUE_TOKEN_INVALID(HttpStatus.FORBIDDEN, "유효한 권한이 없습니다.")
Expand All @@ -16,4 +15,9 @@ public enum QueueErrorCode implements ErrorCode {

private final HttpStatusCode httpStatusCode;
private final String message;

QueueErrorCode(HttpStatusCode httpStatusCode, String message) {
this.httpStatusCode = httpStatusCode;
this.message = message;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@
import org.springframework.http.HttpStatusCode;

@Getter
@RequiredArgsConstructor
public enum RequestErrorCode implements ErrorCode {
INVALID_REQUEST(HttpStatus.BAD_REQUEST, "유효하지 않은 요청입니다.")
, INVALID_INPUT_VALUE(HttpStatus.BAD_REQUEST, "유효하지 않은 입력입니다.");

private final HttpStatusCode httpStatusCode;
private final String message;

RequestErrorCode(HttpStatusCode httpStatusCode, String message) {
this.httpStatusCode = httpStatusCode;
this.message = message;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import org.springframework.http.HttpStatusCode;

@Getter
@RequiredArgsConstructor
public enum ReservationErrorCode implements ErrorCode {
RESERVATION_NOT_OPENED(HttpStatus.CONFLICT, "티켓 예매 오픈 전입니다.")
, SEAT_ALREADY_RESERVED(HttpStatus.CONFLICT, "이미 예약된 좌석입니다.")
Expand All @@ -18,4 +17,9 @@ public enum ReservationErrorCode implements ErrorCode {

private final HttpStatusCode httpStatusCode;
private final String message;

ReservationErrorCode(HttpStatusCode httpStatusCode, String message) {
this.httpStatusCode = httpStatusCode;
this.message = message;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@
import org.springframework.http.HttpStatusCode;

@Getter
@RequiredArgsConstructor
public enum SystemErrorCode implements ErrorCode {
INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "시스템 오류가 발생하였습니다.");

private final HttpStatusCode httpStatusCode;
private final String message;

SystemErrorCode(HttpStatusCode httpStatusCode, String message) {
this.httpStatusCode = httpStatusCode;
this.message = message;
}
}
35 changes: 35 additions & 0 deletions src/main/java/com/queuetix/global/support/TestController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package com.queuetix.global.support;

import com.queuetix.global.exception.QueueTixException;
import com.queuetix.global.exception.code.ReservationErrorCode;
import com.queuetix.member.dto.MemberLoginRequest;
import jakarta.validation.Valid;
import org.springframework.context.annotation.Profile;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@Profile("local")
@RestController
@RequestMapping("/test")
public class TestController {
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 컨트롤러는 사용되지 않으면 삭제하면 어떨까요?
controller test 를 위해서 @WebMvcTest를 이용하여 테스트코드로 작성해보면 어떨까요?

@GetMapping("queue-tix")
public void queueTixException() {
throw new QueueTixException(ReservationErrorCode.RESERVATION_NOT_FOUND);
}

@GetMapping("/illlegal-argument")
public void illegalArgumentException() {
throw new IllegalArgumentException("부적절한 파라미터 오류 테스트");
}

@GetMapping("/server-error")
public void serverError() throws Exception {
throw new Exception("서버 오류 테스트");
}

@GetMapping("/validation")
public void validation(@RequestBody @Valid MemberLoginRequest request) {
}
}
24 changes: 24 additions & 0 deletions src/main/java/com/queuetix/member/controller/MemberController.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,31 @@
package com.queuetix.member.controller;

import com.queuetix.global.exception.QueueTixException;
import com.queuetix.global.exception.code.MemberErrorCode;
import com.queuetix.member.dto.MemberSignUpRequest;
import com.queuetix.member.service.MemberService;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/api")
public class MemberController {
private final MemberService memberService;
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

controller test 를 추가해보면 어떨까요?


@Autowired
public MemberController(MemberService memberService) {
this.memberService = memberService;
}

@PostMapping("/members")
public ResponseEntity<Void> addMember(@RequestBody @Valid MemberSignUpRequest request) {
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MemberSignUpRequest가 valid한지 체크하는 부분도 테스트해볼 수 있을까요?

memberService.addMember(request);
return ResponseEntity.status(HttpStatus.CREATED).build();
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

회원가입이 되고 나서 생성된 회원에 대한 정보를 필요로 할 수 있어 보입니다.
그리고 DB에 저장하게 되면 ID도 생성될 것 같고요!
회원 정보를 응답 바디로 내려주면 어떨까요?

}
}
5 changes: 2 additions & 3 deletions src/main/java/com/queuetix/member/domain/Member.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.queuetix.member.domain;

import jakarta.persistence.*;
import lombok.Getter;
import lombok.Setter;
import lombok.*;

@Entity
@Getter
Expand All @@ -19,7 +18,7 @@ public class Member {
private String name;
@Column(unique = true)
private String email;
@Column
@Column(unique = true)
private String phone;
@Column
private String address;
Expand Down
21 changes: 11 additions & 10 deletions src/main/java/com/queuetix/member/dto/MemberSignUpRequest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,24 @@

import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Null;
import jakarta.validation.constraints.Pattern;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;

@Getter
@Setter
public class MemberSignUpRequest {
public record MemberSignUpRequest (
@NotBlank(message = "로그인 아이디를 입력해주세요")
private String loginId;
String loginId,
Comment on lines -13 to +14
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

private을 지우신 이유가 있으실까요?

@NotBlank(message = "비밀번호를 입력해주세요.")
private String password;
String password,
@NotBlank(message = "성함을 입력해주세요.")
private String name;
String name,
@Email(message = "이메일 형식이 올바르지 않습니다.")
@NotBlank(message = "이메일을 입력해주세요.")
private String email;
String email,
@Pattern(regexp = "^\\d{2,3}-\\d{3,4}-\\d{4}$", message = "휴대폰 형식이 올바르지 않습니다.")
private String phone;
private String address;
}
String phone,
String address
) {}
17 changes: 17 additions & 0 deletions src/main/java/com/queuetix/member/repository/MemberRepository.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.queuetix.member.repository;

import com.queuetix.member.domain.Member;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.Optional;

public interface MemberRepository extends JpaRepository<Member, Long> {
Optional<Member> findByLoginId(String loginId);

Optional<Member> findByEmail(String email);

Optional<Member> findByPhone(String phone);
}
Loading
Loading