[1 - 2단계 방탈출 예약 대기] 페드로(류형욱) 미션 제출합니다.

README.md

@@ -67,6 +67,12 @@
 - uri: /login
 - file path: templates/login.html
 
+### 내 예약 페이지 접근
+- http method: GET
+- uri: /member/reservation
+- file path: templates/reservation-mine.html
+
+
 ### 모든 예약 조회
 - http method: GET
 - uri: /reservations
@@ -635,30 +641,42 @@
       }
     ```
 
-## 기능 명세서
-
-### 예약
-- [x] 예약 정보는 식별자, 이름, 일정으로 이뤄져있다.
-  - [x] 이름은 1자 이상, 20자 이하여야 한다.
-
-### 일정
-- [x] 일정은 날짜, 예약 시간으로 이뤄져있다.
-  - [x] 일정은 현재 이후여야 한다.
-  - [x] 날짜는 올바른 형식으로 주어져야 한다.
-  - [x] 예약 시간은 이미 존재하는 시간들 중 하나이어야 한다.
-  - [x] 테마는 이미 존재하는 테마들 중 하나이어야 한다.
-
-### 시간
-- [x] 시간 정보는 식별자, 시작하는 시간으로 이뤄져있다.
+### 사용자 예약 조회
+- http method: GET
+- uri: /reservations-mine
+- request
+```
+GET /members/reservations HTTP/1.1
+cookie: token={token}
+host: localhost:8080
+```
 
-### 테마
-- [x] 테마는 식별자, 이름, 설명, 썸네일로 이뤄져있다.
-  - [x] 이름은 중복될 수 없다.
-  - [x] 이름은 1자 이상, 20자 이하여야 한다.
-  - [x] 설명은 100자를 초과할 수 없다.
+- response
+```
+HTTP/1.1 200
+Content-Type: application/json
 
-### 사용자
-- [x] 사용자는 식별자, 이름, 이메일, 비밀번호, 역할로 이뤄져있다.
-  - [x] 이름은 1자 이상, 20자 이하여야 한다.
-  - [x] 이메일은 중복될 수 없다.
-  - [x] 비밀번호는 6~12자리 이내이어야 한다.
+[
+  {
+    "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": "예약"
+  }
+]
+```

build.gradle

@@ -16,7 +16,7 @@ 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'
     runtimeOnly 'com.h2database:h2'
     implementation 'io.jsonwebtoken:jjwt:0.9.1'

docs/README.md

@@ -0,0 +1,29 @@
+## 요구사항 분석
+
+### 예약
+- [x] 예약 정보는 식별자, 이름, 일정, 예약 상태로 이뤄져있다.
+    - [x] 이름은 1자 이상, 20자 이하여야 한다.
+- [x] 사용자의 식별자를 통해 해당하는 예약을 조회할 수 있다.
+
+### 일정
+- [x] 일정은 날짜, 예약 시간으로 이뤄져있다.
+    - [x] 일정은 현재 이후여야 한다.
+    - [x] 날짜는 올바른 형식으로 주어져야 한다.
+    - [x] 예약 시간은 이미 존재하는 시간들 중 하나이어야 한다.
+    - [x] 테마는 이미 존재하는 테마들 중 하나이어야 한다.
+
+### 시간
+- [x] 시간 정보는 식별자, 시작하는 시간으로 이뤄져있다.
+
+### 테마
+- [x] 테마는 식별자, 이름, 설명, 썸네일로 이뤄져있다.
+    - [x] 이름은 중복될 수 없다.
+    - [x] 이름은 1자 이상, 20자 이하여야 한다.
+    - [x] 설명은 100자를 초과할 수 없다.
+
+### 사용자
+- [x] 사용자는 식별자, 이름, 이메일, 비밀번호, 역할로 이뤄져있다.
+    - [x] 이름은 1자 이상, 20자 이하여야 한다.
+    - [x] 이메일은 중복될 수 없다.
+    - [x] 비밀번호는 6~12자리 이내이어야 한다.
+

src/main/java/roomescape/auth/AdminRoleHandlerInterceptor.java

@@ -3,14 +3,13 @@
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 import roomescape.domain.member.Role;
 import roomescape.exception.ForbiddenException;
 import roomescape.exception.UnauthorizedException;
 
-import java.util.Arrays;
-
 @Component
 public class AdminRoleHandlerInterceptor implements HandlerInterceptor {
     private static final String KEY = "token";

src/main/java/roomescape/auth/LoginMemberIdArgumentResolver.java

@@ -2,6 +2,7 @@
 
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
 import org.springframework.stereotype.Component;
@@ -11,11 +12,9 @@
 import org.springframework.web.method.support.ModelAndViewContainer;
 import roomescape.exception.UnauthorizedException;
 
-import java.util.Arrays;
-
 @Component
 public class LoginMemberIdArgumentResolver implements HandlerMethodArgumentResolver {
-    private final static String KEY = "token";
+    private static final String KEY = "token";
 
     private final TokenProvider tokenProvider;
 
@@ -30,7 +29,8 @@ public boolean supportsParameter(MethodParameter parameter) {
     }
 
     @Override
-    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
+    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
+                                  NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
         HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest();
         Cookie[] cookies = request.getCookies();
         if (cookies == null) {

src/main/java/roomescape/auth/TokenProvider.java

@@ -4,13 +4,12 @@
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
+import java.util.Date;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import roomescape.domain.member.Member;
 import roomescape.exception.UnauthorizedException;
 
-import java.util.Date;
-
 @Component
 public class TokenProvider {
     @Value("${security.jwt.token.secret-key}")
@@ -24,8 +23,8 @@ public String create(Member member) {
 
         return Jwts.builder()
                 .claim("id", member.getId())
-                .claim("role", member.getRole())
-                .claim("email", member.getEmail())
+                .claim("role", member.getRole().name())
+                .claim("email", member.getEmail().getValue())
                 .setIssuedAt(now)
                 .setExpiration(validity)
                 .signWith(SignatureAlgorithm.HS256, secretKey.getBytes())

src/main/java/roomescape/config/GlobalExceptionHandler.java

@@ -1,32 +1,50 @@
 package roomescape.config;
 
+import java.time.format.DateTimeParseException;
+import java.util.Optional;
+import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
-import roomescape.exception.*;
+import roomescape.exception.ExceptionTemplate;
+import roomescape.exception.ForbiddenException;
+import roomescape.exception.InvalidMemberException;
+import roomescape.exception.InvalidReservationException;
+import roomescape.exception.UnauthorizedException;
 
 @ControllerAdvice
 public class GlobalExceptionHandler {
     @ExceptionHandler(value = {InvalidReservationException.class, InvalidMemberException.class})
-    protected ResponseEntity<ExceptionTemplate> handleInvalidReservationException(Exception exception) {
+    public ResponseEntity<ExceptionTemplate> handleInvalidReservationException(Exception exception) {
         return ResponseEntity.badRequest().body(new ExceptionTemplate(exception.getMessage()));
     }
 
     @ExceptionHandler(value = {UnauthorizedException.class})
-    protected ResponseEntity<ExceptionTemplate> handleUnauthorizedException(Exception exception) {
+    public ResponseEntity<ExceptionTemplate> handleUnauthorizedException(UnauthorizedException exception) {
         return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(new ExceptionTemplate(exception.getMessage()));
     }
 
     @ExceptionHandler(value = {ForbiddenException.class})
-    protected ResponseEntity<ExceptionTemplate> handlerForbiddenException(Exception exception) {
+    public ResponseEntity<ExceptionTemplate> handlerForbiddenException(ForbiddenException exception) {
         return ResponseEntity.status(HttpStatus.FORBIDDEN).body(new ExceptionTemplate(exception.getMessage()));
     }
 
-    @ExceptionHandler
-    protected ResponseEntity<ExceptionTemplate> handleValidationException(MethodArgumentNotValidException exception) {
-        String message = exception.getBindingResult().getFieldError().getDefaultMessage();
+    @ExceptionHandler(value = {MethodArgumentNotValidException.class})
+    public ResponseEntity<ExceptionTemplate> handleValidationException(MethodArgumentNotValidException exception) {
+        String message = Optional.ofNullable(exception.getBindingResult().getFieldError())
+                .map(DefaultMessageSourceResolvable::getDefaultMessage)
+                .orElse("요청 형식이 잘못되었습니다.");
         return ResponseEntity.badRequest().body(new ExceptionTemplate(message));
     }
+
+    @ExceptionHandler(value = {HttpMessageNotReadableException.class})
+    public ResponseEntity<ExceptionTemplate> handleValidationException(HttpMessageNotReadableException exception) {
+        if (exception.getRootCause() instanceof DateTimeParseException) {
+            return ResponseEntity.badRequest().body(new ExceptionTemplate("시간/날짜 형식이 잘못되었습니다."));
+        }
+        return ResponseEntity.badRequest().body(new ExceptionTemplate("잘못된 요청입니다."));
+    }
 }

src/main/java/roomescape/config/WebMvcConfiguration.java

@@ -1,5 +1,6 @@
 package roomescape.config;
 
+import java.util.List;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -8,8 +9,6 @@
 import roomescape.auth.LoginMemberIdArgumentResolver;
 import roomescape.auth.TokenProvider;
 
-import java.util.List;
-
 @Configuration
 public class WebMvcConfiguration implements WebMvcConfigurer {
 

src/main/java/roomescape/controller/reservation/AdminReservationController.java → src/main/java/roomescape/controller/AdminReservationController.java

@@ -1,16 +1,22 @@
-package roomescape.controller.reservation;
+package roomescape.controller;
 
 import jakarta.validation.Valid;
+import java.net.URI;
+import java.util.List;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+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;
 import roomescape.service.reservation.ReservationService;
 import roomescape.service.reservation.dto.AdminReservationRequest;
-import roomescape.service.reservation.dto.ReservationFindRequest;
+import roomescape.service.reservation.dto.ReservationFilterRequest;
 import roomescape.service.reservation.dto.ReservationResponse;
 
-import java.net.URI;
-import java.util.List;
-
 @RestController
 @RequestMapping("/admin/reservations")
 public class AdminReservationController {
@@ -21,7 +27,8 @@ public AdminReservationController(ReservationService reservationService) {
     }
 
     @PostMapping
-    public ResponseEntity<ReservationResponse> createReservation(@RequestBody @Valid AdminReservationRequest adminReservationRequest) {
+    public ResponseEntity<ReservationResponse> createReservation(
+            @RequestBody @Valid AdminReservationRequest adminReservationRequest) {
         ReservationResponse reservationResponse = reservationService.create(adminReservationRequest);
         return ResponseEntity.created(URI.create("/reservations/" + reservationResponse.id()))
                 .body(reservationResponse);
@@ -34,8 +41,9 @@ public ResponseEntity<Void> deleteReservation(@PathVariable("id") long id) {
     }
 
     @GetMapping("/search")
-    public List<ReservationResponse> findReservations(@ModelAttribute("ReservationFindRequest") ReservationFindRequest reservationFindRequest) {
-        return reservationService.findByCondition(reservationFindRequest);
+    public List<ReservationResponse> findReservations(
+            @ModelAttribute("ReservationFindRequest") ReservationFilterRequest reservationFilterRequest) {
+        return reservationService.findByCondition(reservationFilterRequest);
     }
 
 }

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

@@ -1,9 +1,11 @@
-package roomescape.controller.auth;
+package roomescape.controller;
 
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
+import java.net.URI;
+import java.util.Arrays;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,9 +18,6 @@
 import roomescape.service.auth.dto.SignUpRequest;
 import roomescape.service.member.dto.MemberResponse;
 
-import java.net.URI;
-import java.util.Arrays;
-
 @RestController
 public class AuthController {
 

src/main/java/roomescape/controller/member/MemberController.java → src/main/java/roomescape/controller/MemberController.java

@@ -1,13 +1,14 @@
-package roomescape.controller.member;
+package roomescape.controller;
 
+import java.util.List;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import roomescape.auth.LoginMemberId;
 import roomescape.service.member.MemberService;
+import roomescape.service.member.dto.MemberReservationResponse;
 import roomescape.service.member.dto.MemberResponse;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/members")
 public class MemberController {
@@ -21,4 +22,9 @@ public MemberController(MemberService memberService) {
     public List<MemberResponse> findAllMembers() {
         return memberService.findAll();
     }
+
+    @GetMapping("/reservations")
+    public List<MemberReservationResponse> findReservations(@LoginMemberId long memberId) {
+        return memberService.findReservations(memberId);
+    }
 }