[Spring Core] (배포) 안금서 미션 제출합니다.

build.gradle

@@ -15,7 +15,7 @@ repositories {
 dependencies {
     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'
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'

src/main/java/roomescape/DataLoader.java

@@ -0,0 +1,25 @@
+package roomescape;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+import roomescape.member.Member;
+import roomescape.member.MemberRepository;
+
+@Profile("default")
+@Component
+@RequiredArgsConstructor
+public class DataLoader implements CommandLineRunner {
+
+    private final MemberRepository memberRepository;
+
+    @Override
+    public void run(String... args) throws Exception {
+        Member member1 = new Member("어드민", "admin@email.com", "password", "ADMIN");
+        Member member2 = new Member("브라운", "brown@email.com", "password", "USER");
+
+        memberRepository.save(member1);
+        memberRepository.save(member2);
+    }
+}

src/main/java/roomescape/TestDataLoader.java

@@ -0,0 +1,48 @@
+package roomescape;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+import roomescape.member.Member;
+import roomescape.member.MemberRepository;
+import roomescape.reservation.Reservation;
+import roomescape.reservation.ReservationRepository;
+import roomescape.theme.Theme;
+import roomescape.theme.ThemeRepository;
+import roomescape.time.Time;
+import roomescape.time.TimeRepository;
+
+@Profile("test")
+@Component
+@RequiredArgsConstructor
+public class TestDataLoader implements CommandLineRunner {
+
+    private final TimeRepository timeRepository;
+    private final ThemeRepository themeRepository;
+    private final MemberRepository memberRepository;
+    private final ReservationRepository reservationRepository;
+
+    @Override
+    public void run(String... args) throws Exception {
+        Member adminMember = memberRepository.save(new Member("어드민", "admin@email.com", "password", "ADMIN"));
+        Member userMember = memberRepository.save(new Member("브라운", "brown@email.com", "password", "USER"));
+
+        final Time time1 = timeRepository.save(new Time("10:00"));
+        final Time time2 = timeRepository.save(new Time("12:00"));
+        final Time time3 = timeRepository.save(new Time("14:00"));
+        final Time time4 = timeRepository.save(new Time("16:00"));
+        final Time time5 = timeRepository.save(new Time("18:00"));
+        final Time time6 = timeRepository.save(new Time("20:00"));
+
+        final Theme theme1 = themeRepository.save(new Theme("테마1", "테마1입니다."));
+        final Theme theme2 = themeRepository.save(new Theme("테마2", "테마2입니다."));
+        final Theme theme3 = themeRepository.save(new Theme("테마3", "테마3입니다."));
+
+        reservationRepository.save(new Reservation("어드민", "2024-03-01", time1, theme1, adminMember));
+        reservationRepository.save(new Reservation("어드민", "2024-03-01", time2, theme2, adminMember));
+        reservationRepository.save(new Reservation("어드민", "2024-03-01", time3, theme3, adminMember));
+
+        reservationRepository.save(new Reservation("브라운", "2024-03-01", time1, theme2, userMember));
+    }
+}

src/main/java/roomescape/authentication/AuthenticationExtractor.java

@@ -0,0 +1,10 @@
+package roomescape.authentication;
+
+import jakarta.servlet.http.Cookie;
+
+public interface AuthenticationExtractor {
+
+    MemberAuthInfo extractMemberAuthInfoFromToken(String token);
+
+    AuthenticationResponse extractTokenFromCookie(Cookie[] cookies);
+}

src/main/java/roomescape/authentication/AuthenticationService.java

@@ -3,25 +3,29 @@
 import jakarta.servlet.http.Cookie;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import roomescape.authentication.jwt.JwtAuthenticationInfoExtractor;
 import roomescape.member.Member;
 
 @Service
 @RequiredArgsConstructor
 public class AuthenticationService {
 
     private final AuthenticationProvider authenticationProvider;
-    private final JwtAuthenticationInfoExtractor jwtAuthenticationInfoExtractor;
+    private final AuthenticationExtractor authenticationExtractor;
 
     public AuthenticationResponse createToken(Member member) {
         return authenticationProvider.createAuthenticationMethod(member);
     }
 
     public AuthenticationResponse extractToken(Cookie [] cookies){
-        return jwtAuthenticationInfoExtractor.extractTokenFromCookie(cookies);
+        return authenticationExtractor.extractTokenFromCookie(cookies);
     }
 
     public MemberAuthInfo extractMemberInfo(String token) {
-        return jwtAuthenticationInfoExtractor.extractMemberAuthInfoFromToken(token);
+        return authenticationExtractor.extractMemberAuthInfoFromToken(token);
+    }
+
+    public MemberAuthInfo getMemberAuthInfoFromCookies(Cookie[] cookies) {
+        AuthenticationResponse authenticationResponse = extractToken(cookies);
+        return extractMemberInfo(authenticationResponse.accessToken());
     }
 }

src/main/java/roomescape/authentication/AuthenticationConfig.java → src/main/java/roomescape/authentication/AuthenticationWebConfig.java

@@ -10,7 +10,7 @@
 
 @Configuration
 @RequiredArgsConstructor
-public class AuthenticationConfig implements WebMvcConfigurer {
+public class AuthenticationWebConfig implements WebMvcConfigurer {
 
     private final LoginMemberArgumentResolver loginMemberArgumentResolver;
     private final AuthAdminRoleInterceptor authAdminRoleInterceptor;

src/main/java/roomescape/authentication/LoginMemberArgumentResolver.java

@@ -25,11 +25,12 @@ public boolean supportsParameter(MethodParameter parameter) {
     public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
         HttpServletRequest request = ((ServletWebRequest) webRequest).getRequest();
 
-        AuthenticationResponse authenticationResponse = authenticationService.extractToken(request.getCookies());
-        if (authenticationResponse.accessToken() == null) {
+        MemberAuthInfo memberAuthInfo = authenticationService.getMemberAuthInfoFromCookies(request.getCookies());
+
+        if (memberAuthInfo == null){
             return null;
         }
 
-        return authenticationService.extractMemberInfo(authenticationResponse.accessToken());
+        return memberAuthInfo;
     }
 }

src/main/java/roomescape/authentication/MemberAuthInfo.java

@@ -1,6 +1,7 @@
 package roomescape.authentication;
 
 public record MemberAuthInfo(
+        Long id,
         String name,
         String role) {
 }

src/main/java/roomescape/authentication/WebConfig.java

@@ -0,0 +1,22 @@
+package roomescape.authentication;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import roomescape.authentication.jwt.JwtAuthenticationInfoExtractor;
+import roomescape.authentication.jwt.JwtAuthenticationProvider;
+
+@Configuration
+@RequiredArgsConstructor
+public class WebConfig {
+
+    @Bean
+    AuthenticationProvider authenticationProvider(){
+        return new JwtAuthenticationProvider();
+    }
+
+    @Bean
+    AuthenticationExtractor authenticationExtractor(){
+        return new JwtAuthenticationInfoExtractor();
+    }
+}

src/main/java/roomescape/authentication/jwt/JwtAuthenticationInfoExtractor.java

@@ -7,16 +7,15 @@
 import jakarta.servlet.http.Cookie;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
+import roomescape.authentication.AuthenticationExtractor;
 import roomescape.authentication.AuthenticationResponse;
 import roomescape.authentication.MemberAuthInfo;
 import roomescape.exception.JwtValidationException;
 
 import java.util.Arrays;
 
-@Component
 @RequiredArgsConstructor
-public class JwtAuthenticationInfoExtractor {
+public class JwtAuthenticationInfoExtractor implements AuthenticationExtractor {
 
     @Value("${roomescape.auth.jwt.secret}")
     private String secretKey;
@@ -33,10 +32,11 @@ public MemberAuthInfo extractMemberAuthInfoFromToken(String token) {
                     .parseClaimsJws(token)
                     .getBody();
 
+            Long id = Long.valueOf(claims.getSubject());
             String name = claims.get("name", String.class);
             String role = claims.get("role", String.class);
 
-            return new MemberAuthInfo(name, role);
+            return new MemberAuthInfo(id, name, role);
         } catch (JwtException e) {
             throw new JwtValidationException("유효하지 않은 JWT 토큰입니다.", e);
         }

src/main/java/roomescape/authentication/jwt/JwtAuthenticationProvider.java

@@ -5,13 +5,11 @@
 import io.jsonwebtoken.security.Keys;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
 import roomescape.authentication.AuthenticationProvider;
 import roomescape.authentication.AuthenticationResponse;
 import roomescape.exception.JwtProviderException;
 import roomescape.member.Member;
 
-@Component
 @RequiredArgsConstructor
 public class JwtAuthenticationProvider implements AuthenticationProvider {
 

src/main/java/roomescape/exception/DuplicateReservationException.java

@@ -0,0 +1,7 @@
+package roomescape.exception;
+
+public class DuplicateReservationException extends RuntimeException {
+    public DuplicateReservationException(String message) {
+        super(message);
+    }
+}

src/main/java/roomescape/exception/ErrorResponse.java

@@ -0,0 +1,19 @@
+package roomescape.exception;
+
+public class ErrorResponse {
+    private final String message;
+    private final String type;
+
+    public ErrorResponse(String message, String type) {
+        this.message = message;
+        this.type = type;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public String getType() {
+        return type;
+    }
+}

src/main/java/roomescape/exception/GeneralExceptionHandler.java

@@ -1,31 +1,37 @@
 package roomescape.exception;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
+@Slf4j
 @RestControllerAdvice
 public class GeneralExceptionHandler {
 
-    @ExceptionHandler(MemberNotFoundException.class)
-    public ResponseEntity<String> handleMemberNotFound(MemberNotFoundException e) {
-        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(e.getMessage());
+    @ExceptionHandler({MemberNotFoundException.class, JwtValidationException.class, JwtProviderException.class})
+    public ResponseEntity<ErrorResponse> handleMemberNotFound(Exception e) {
+        ErrorResponse authenticationErrorResponse = new ErrorResponse(e.getMessage(), "authentication_error");
+        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(authenticationErrorResponse);
     }
 
-    @ExceptionHandler(JwtValidationException.class)
-    public ResponseEntity<String> handleJwtValidationException(JwtValidationException e) {
-        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(e.getMessage());
+    @ExceptionHandler({TimeNotFoundException.class, ThemeNotFoundException.class})
+    public ResponseEntity<ErrorResponse> handleTimeNotFound(Exception e) {
+        ErrorResponse notFoundErrorResponse = new ErrorResponse(e.getMessage(), "not_found");
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(notFoundErrorResponse);
     }
 
-    @ExceptionHandler(JwtProviderException.class)
-    public ResponseEntity<String> handleJwtProviderException(JwtProviderException e) {
-        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(e.getMessage());
+    @ExceptionHandler(DuplicateReservationException.class)
+    public ResponseEntity<ErrorResponse> handleDuplicatedReservation(DuplicateReservationException e) {
+        ErrorResponse duplicationErrorResponse = new ErrorResponse(e.getMessage(), "duplicate_reservation");
+        return ResponseEntity.status(HttpStatus.CONFLICT).body(duplicationErrorResponse);
     }
 
     @ExceptionHandler(Exception.class)
-    public ResponseEntity<String> handleGeneralException(Exception e) {
-        e.printStackTrace();
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage());
+    public ResponseEntity<ErrorResponse> handleGeneralException(Exception e) {
+        log.error("Exception [Err_Location] : {}", e.getStackTrace()[0], e);
+        ErrorResponse errorResponse = new ErrorResponse("잠깐 문제가 생겼어요. 다음에 다시 시도해주세요.", "internal_server_error");
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
     }
 }

src/main/java/roomescape/exception/MemberNotFoundException.java

@@ -1,7 +1,8 @@
 package roomescape.exception;
 
 public class MemberNotFoundException extends RuntimeException {
-    public MemberNotFoundException(String message, Throwable cause) {
-        super(message, cause);
+
+    public MemberNotFoundException(String message) {
+        super(message);
     }
 }

src/main/java/roomescape/exception/ThemeNotFoundException.java

@@ -0,0 +1,7 @@
+package roomescape.exception;
+
+public class ThemeNotFoundException extends RuntimeException {
+    public ThemeNotFoundException(String message) {
+        super(message);
+    }
+}

src/main/java/roomescape/exception/TimeNotFoundException.java

@@ -0,0 +1,7 @@
+package roomescape.exception;
+
+public class TimeNotFoundException extends RuntimeException {
+    public TimeNotFoundException(String message) {
+        super(message);
+    }
+}

src/main/java/roomescape/login/LoginController.java

@@ -9,16 +9,13 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import roomescape.authentication.AuthenticationService;
-import roomescape.authentication.MemberAuthInfo;
 import roomescape.authentication.AuthenticationResponse;
 
 @RestController
 @RequiredArgsConstructor
 public class LoginController {
 
     private final LoginService loginService;
-    private final AuthenticationService authenticationService;
 
     @PostMapping("/login")
     public void login(@Valid @RequestBody LoginRequest loginRequest, HttpServletResponse response) {
@@ -32,10 +29,7 @@ public void login(@Valid @RequestBody LoginRequest loginRequest, HttpServletResp
 
     @GetMapping("/login/check")
     public LoginCheckResponse checkLogin(HttpServletRequest request) {
-        AuthenticationResponse authenticationResponse = authenticationService.extractToken(request.getCookies());
-        MemberAuthInfo memberAuthInfo = authenticationService.extractMemberInfo(authenticationResponse.accessToken());
-        LoginCheckResponse loginCheckResponse = loginService.checkLogin(memberAuthInfo);
-
+        LoginCheckResponse loginCheckResponse = loginService.checkLogin(request.getCookies());
         return loginCheckResponse;
     }