[1 - 2단계 방탈출 예약 대기] 이든(최승준) 미션 제출합니다.

README.md

@@ -6,16 +6,21 @@
 |----------|--------|---------------------------------------------------------|-----------------------|----------------------------------------|-------------------|
 |          | GET    | `/`                                                     | 인기 테마 페이지 요청          | `templates/index.html`                 | `@Controller`     |
 |          | GET    | `/reservation`                                          | 사용자 예약 페이지 요청         | `templates/reservation.html`           | `@Controller`     |
+|          | GET    | `/reservation-mine`                                     | 내 예약 조회 페이지 요청        | `templates/reservation-mine.html`      | `@Controller`     |
 | `ADMIN`  | GET    | `/admin`                                                | 어드민 페이지 요청            | `templates/admin/index.html`           | `@Controller`     |
 | `ADMIN`  | GET    | `/admin/reservation`                                    | 예약 관리 페이지 요청          | `templates/admin/reservation-new.html` | `@Controller`     |
 | `ADMIN`  | GET    | `/admin/reservationTime`                                | 예약 시간 관리 페이지 요청       | `templates/admin/reservationTime.html` | `@Controller`     |
 | `ADMIN`  | GET    | `/admin/theme`                                          | 테마 관리 페이지 요청          | `templates/admin/theme.html`           | `@Controller`     |
 |          | GET    | `/login`                                                | 로그인 페이지 요청            | `templates/login.html`                 | `@Controller`     |
+|          | GET    | `/signup`                                               | 회원가입 페이지 요청           |                                        | `@Controller`     |
 |          | POST   | `/login`                                                | 로그인 요청                |                                        | `@RestController` |
+|          | POST   | `/signup`                                               | 회원가입 요청               |                                        | `@RestController` |
+|          | POST   | `/logout`                                               | 로그아웃 요청               |                                        | `@RestController` |
 |          | GET    | `/login/check`                                          | 인증 정보 조회              |                                        | `@RestController` |
-|          | GET    | `/token-reissue`                                        | JWT 토큰 재발급            |                                        | `@RestController` |
-|          | GET    | `/reservations`                                         | 예약 정보 조회              |                                        | `@RestController` |
-|          | GET    | `/reservations/search?themeId&memberId&dateFrom&dateTo` | 예약 정보 조건 검색           |                                        | `@RestController` |
+| `MEMBER` | GET    | `/token-reissue`                                        | JWT 토큰 재발급            |                                        | `@RestController` |
+| `ADMIN`  | GET    | `/reservations`                                         | 예약 정보 조회              |                                        | `@RestController` |
+| `MEMBER` | GET    | `/reservations-mine`                                    | 내 예약 정보 조회            |                                        | `@RestController` |
+| `ADMIN`  | GET    | `/reservations/search?themeId&memberId&dateFrom&dateTo` | 예약 정보 조건 검색           |                                        | `@RestController` |
 |          | GET    | `/reservations/themes/{themeId}/reservationTimes?date`  | 특정 날짜의 특정 테마 예약 정보 조회 |                                        | `@RestController` |
 | `MEMBER` | POST   | `/reservations`                                         | 예약 추가                 |                                        | `@RestController` |
 |          | DELETE | `/reservations/{id}`                                    | 예약 취소                 |                                        | `@RestController` |
@@ -55,6 +60,57 @@ Set-Cookie: refreshToken=eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxIiwibmFtZSI6ImFkbWluIi
 
 ---
 
+### 회원가입 요청 API
+
+- Request
+
+```
+POST /login HTTP/1.1
+Content-Type: application/json
+
+{
+        "name: "name"
+        "password": "password",
+        "email": "admin@email.com"
+}
+```
+
+- Response
+
+```
+HTTP/1.1 200 
+Content-Type: application/json
+Keep-Alive: timeout=60
+Set-Cookie: accessToken=eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxIiwibmFtZSI6ImFkbWluIiwicm9sZSI6IkFETUlOIn0.cwnHsltFeEtOzMHs2Q5-ItawgvBZ140OyWecppNlLoI; Path=/; HttpOnly
+Set-Cookie: refreshToken=eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxIiwibmFtZSI6ImFkbWluIiwicm9sZSI6IkFETUlOIn0.cwnHsltFeEtOzMHs2Q5-ItawgvBZ140OyWecppNlLoI; Path=/; HttpOnly
+```
+
+---
+
+### 로그아웃 요청 API
+
+- Request
+
+```
+POST /login HTTP/1.1
+Content-Type: application/json
+accessToken=eyJhbGciOiJIUzI1NiJ9.eyJtZW1iZXJJZCI6MSwiaWF0IjoxNzE1NjE1OTMyLCJleHAiOjE3MTU2MTc3MzJ9.nfu6IZlKBccnmBbMtKDTP-5TbNWUMhcVY_ee09aNwhE;
+```
+
+- Response
+
+> Cookie를 통해 만료된 토큰 Response
+
+```
+HTTP/1.1 200 
+Content-Type: application/json
+Keep-Alive: timeout=60
+Set-Cookie: accessToken=eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxIiwibmFtZSI6ImFkbWluIiwicm9sZSI6IkFETUlOIn0.cwnHsltFeEtOzMHs2Q5-ItawgvBZ140OyWecppNlLoI; Path=/; HttpOnly
+Set-Cookie: refreshToken=eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxIiwibmFtZSI6ImFkbWluIiwicm9sZSI6IkFETUlOIn0.cwnHsltFeEtOzMHs2Q5-ItawgvBZ140OyWecppNlLoI; Path=/; HttpOnly
+```
+
+---
+
 ### JWT 토큰 재발급 API
 
 - Request
@@ -134,6 +190,48 @@ Content-Type: application/json
 
 ---
 
+### 내 예약 정보 조회 API
+
+- Request
+
+```
+GET /reservations-mine HTTP/1.1
+Cookie: accessToken=eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxIiwibmFtZSI6IuyWtOuTnOuvvCIsInJvbGUiOiJBRE1JTiJ9.vcK93ONRQYPFCxT5KleSM6b7cl1FE-neSLKaFyslsZM;
+```
+
+- Response
+
+```
+HTTP/1.1 200 
+Content-Type: application/json
+
+[
+    {
+        "reservationId": 1,
+        "theme": "테마1",
+        "date": "2024-03-01",
+        "time": "10:00",
+        "status": "예약"
+    },
+    {
+        "reservationId": 2,
+        "theme": "테마2",
+        "date": "2024-03-01",
+        "time": "12:00",
+        "status": "예약"
+    },
+    {
+        "reservationId": 3,
+        "theme": "테마3",
+        "date": "2024-03-01",
+        "time": "14:00",
+        "status": "예약"
+    }
+]
+```
+
+---
+
 ### 예약 정보 조회 API
 
 - Request

build.gradle

@@ -16,8 +16,9 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
-
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+
     implementation 'io.jsonwebtoken:jjwt:0.9.1'
     implementation 'javax.xml.bind:jaxb-api:2.3.1'
 

src/main/java/roomescape/RoomescapeApplication.java

@@ -2,6 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication
 public class RoomescapeApplication {

src/main/java/roomescape/auth/controller/AuthController.java

@@ -3,14 +3,18 @@
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import roomescape.auth.dto.LoginCheckResponse;
 import roomescape.auth.dto.LoginRequest;
+import roomescape.auth.dto.SignUpRequest;
 import roomescape.auth.service.AuthService;
+import roomescape.global.auth.annotation.Auth;
 import roomescape.global.auth.annotation.MemberId;
+import roomescape.global.auth.jwt.JwtHandler;
 import roomescape.global.auth.jwt.dto.TokenDto;
 import roomescape.global.dto.response.ApiResponse;
 
@@ -22,20 +26,38 @@ public AuthController(final AuthService authService) {
         this.authService = authService;
     }
 
+    @PostMapping("/signup")
+    public ApiResponse<Void> signup(@Valid @RequestBody final SignUpRequest signupRequest, final HttpServletResponse response) {
+        TokenDto tokenDto = authService.signUp(signupRequest);
+        addTokensToCookie(tokenDto, response);
+
+        return ApiResponse.success();
+    }
+
     @PostMapping("/login")
-    public ApiResponse<Void> login(@RequestBody final LoginRequest loginRequest, final HttpServletResponse response) {
+    public ApiResponse<Void> login(@Valid @RequestBody final LoginRequest loginRequest, final HttpServletResponse response) {
         TokenDto tokenDto = authService.login(loginRequest);
         addTokensToCookie(tokenDto, response);
 
         return ApiResponse.success();
     }
 
+    @PostMapping("/logout")
+    public ApiResponse<Void> logout(final HttpServletResponse response) {
+        TokenDto logoutTokenDto = authService.logout();
+        addTokensToCookie(logoutTokenDto, response);
+
+        return ApiResponse.success();
+    }
+
+    @Auth
     @GetMapping("/login/check")
     public ApiResponse<LoginCheckResponse> checkLogin(@MemberId final Long memberId) {
         LoginCheckResponse response = authService.checkLogin(memberId);
         return ApiResponse.success(response);
     }
 
+    // TODO: 토큰 재발급 자동화 로직 구현
     @GetMapping("/token-reissue")
     public ApiResponse<Void> reissueToken(final HttpServletRequest request, final HttpServletResponse response) {
         TokenDto requestToken = getTokenFromCookie(request);
@@ -50,27 +72,26 @@ private TokenDto getTokenFromCookie(final HttpServletRequest request) {
         String accessToken = "";
         String refreshToken = "";
         for (Cookie cookie : request.getCookies()) {
-            if (cookie.getName().equals("accessToken")) {
+            if (cookie.getName().equals(JwtHandler.ACCESS_TOKEN_HEADER_KEY)) {
                 accessToken = cookie.getValue();
-                cookie.setMaxAge(0);
             }
-            if (cookie.getName().equals("refreshToken")) {
+            if (cookie.getName().equals(JwtHandler.REFRESH_TOKEN_HEADER_KEY)) {
                 refreshToken = cookie.getValue();
-                cookie.setMaxAge(0);
             }
         }
 
         return new TokenDto(accessToken, refreshToken);
     }
 
     private void addTokensToCookie(TokenDto tokenInfo, HttpServletResponse response) {
-        addTokenToCookie("accessToken", tokenInfo.accessToken(), response);
-        addTokenToCookie("refreshToken", tokenInfo.refreshToken(), response);
+        addTokenToCookie(JwtHandler.ACCESS_TOKEN_HEADER_KEY, tokenInfo.accessToken(), response, JwtHandler.ACCESS_TOKEN_EXPIRE_TIME);
+        addTokenToCookie(JwtHandler.REFRESH_TOKEN_HEADER_KEY, tokenInfo.refreshToken(), response, JwtHandler.REFRESH_TOKEN_EXPIRE_TIME);
     }
 
-    private void addTokenToCookie(String cookieName, String token, HttpServletResponse response) {
+    private void addTokenToCookie(String cookieName, String token, HttpServletResponse response, int maxAge) {
         Cookie cookie = new Cookie(cookieName, token);
         cookie.setHttpOnly(true);
+        cookie.setMaxAge(maxAge);
 
         response.addCookie(cookie);
     }

src/main/java/roomescape/auth/dto/LoginRequest.java

@@ -1,7 +1,13 @@
 package roomescape.auth.dto;
 
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+
 public record LoginRequest(
+        @NotBlank(message = "이메일은 null 또는 공백일 수 없습니다.")
+        @Email(message = "이메일 형식이 일치하지 않습니다. (xxx@xxx.xxx)")
         String email,
+        @NotBlank(message = "비밀번호는 null 또는 공백일 수 없습니다.")
         String password
 ) {
 }

src/main/java/roomescape/auth/dto/SignUpRequest.java

@@ -0,0 +1,27 @@
+package roomescape.auth.dto;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import roomescape.member.domain.Member;
+import roomescape.member.domain.MemberName;
+
+public record SignUpRequest(
+        @NotBlank(message = "회원명은 null 또는 공백일 수 없습니다.")
+        @Size(min = MemberName.MIN_LENGTH, max = MemberName.MAX_LENGTH, message = "회원명은 " + MemberName.MIN_LENGTH + "~" + MemberName.MAX_LENGTH + "글자 사이여야 합니다.")
+        String name,
+        @NotBlank(message = "이메일은 null 또는 공백일 수 없습니다.")
+        @Email(message = "이메일 형식이 일치하지 않습니다. (xxx@xxx.xxx)")
+        String email,
+        @NotBlank(message = "비밀번호는 null 또는 공백일 수 없습니다.")
+        String password
+) {
+    public Member toMemberEntity() {
+        return new Member(
+                name,
+                email,
+                password
+        );
+    }
+
+}

src/main/java/roomescape/auth/service/AuthService.java

@@ -3,6 +3,7 @@
 import org.springframework.stereotype.Service;
 import roomescape.auth.dto.LoginCheckResponse;
 import roomescape.auth.dto.LoginRequest;
+import roomescape.auth.dto.SignUpRequest;
 import roomescape.global.auth.jwt.JwtHandler;
 import roomescape.global.auth.jwt.dto.TokenDto;
 import roomescape.global.exception.error.ErrorType;
@@ -20,8 +21,14 @@ public AuthService(final MemberService memberService, final JwtHandler jwtHandle
         this.jwtHandler = jwtHandler;
     }
 
+    public TokenDto signUp(final SignUpRequest signupRequest) {
+        Member member = memberService.addMember(signupRequest);
+
+        return jwtHandler.createToken(member.getId());
+    }
+
     public TokenDto login(final LoginRequest request) {
-        Member member = memberService.findMemberByEmailAndPassword(request.email(), request.password());
+        Member member = memberService.findMemberByEmailAndPassword(request);
 
         return jwtHandler.createToken(member.getId());
     }
@@ -42,4 +49,8 @@ public TokenDto reissueToken(final String accessToken, final String refreshToken
         Long memberId = jwtHandler.getMemberIdFromTokenWithNotValidate(accessToken);
         return jwtHandler.createToken(memberId);
     }
+
+    public TokenDto logout() {
+        return jwtHandler.createLogoutToken();
+    }
 }

src/main/java/roomescape/global/auth/annotation/Auth.java

@@ -0,0 +1,11 @@
+package roomescape.global.auth.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Auth {
+}