[그리디] 김하은 SpringCore 7~9단계 제출합니다.

deploy.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# 1. 최신 코드 불러오기
+echo ">>> Git Pull 실행"
+git pull origin main
+
+# 2. 프로젝트 빌드
+echo ">>> 프로젝트 빌드 시작"
+./gradlew build -x test
+
+# 3. 기존 실행 중인 프로세스 종료
+echo ">>> 기존 애플리케이션 PID 확인"
+CURRENT_PID=$(pgrep -f roomescape-0.0.1-SNAPSHOT.jar)
+
+if [ -z "$CURRENT_PID" ]; then
+    echo ">>> 실행 중인 애플리케이션이 없습니다."
+else
+    echo ">>> 기존 애플리케이션 종료 (PID: $CURRENT_PID)"
+    kill -15 $CURRENT_PID
+    sleep 5
+fi
+
+# 4. 새 애플리케이션 실행
+echo ">>> 새 애플리케이션 배포 및 실행"
+JAR_NAME=$(ls -tr build/libs/*.jar | tail -n 1)
+
+nohup java -jar $JAR_NAME > app.log 2>&1 &
+
+echo ">>> 배포 완료!"

src/main/java/roomescape/DataLoader.java

@@ -0,0 +1,47 @@
+package roomescape;
+
+
+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.theme.Theme;
+import roomescape.theme.ThemeRepository;
+import roomescape.time.Time;
+import roomescape.time.TimeRepository;
+
+@Profile("!test") //테스트 환경이 아닐때 실행되게 하는 기능
+@Component
+public class DataLoader implements CommandLineRunner {
+
+    private final MemberRepository memberRepository;
+    private final ThemeRepository themeRepository;
+    private final TimeRepository timeRepository;
+
+    public DataLoader(MemberRepository memberRepository, ThemeRepository themeRepository, TimeRepository timeRepository) {
+        this.memberRepository = memberRepository;
+        this.themeRepository = themeRepository;
+        this.timeRepository = timeRepository;
+    }
+
+    @Override
+    public void run(String... args) throws Exception {
+        // 1. 회원 저장 (ID: 1, 2)
+        memberRepository.save(new Member("어드민", "admin@email.com", "password", "ADMIN"));
+        memberRepository.save(new Member("브라운", "brown@email.com", "password", "USER"));
+
+        // 2. 테마 저장
+        themeRepository.save(new Theme("테마1", "테마1입니다."));
+        themeRepository.save(new Theme("테마2", "테마2입니다."));
+        themeRepository.save(new Theme("테마3", "테마3입니다."));
+
+        // 3. 시간 저장
+        timeRepository.save(new Time("10:00"));
+        timeRepository.save(new Time("12:00"));
+        timeRepository.save(new Time("14:00"));
+        timeRepository.save(new Time("16:00"));
+        timeRepository.save(new Time("18:00"));
+        timeRepository.save(new Time("20:00"));
+    }
+}

src/main/java/roomescape/TestDataLoader.java

@@ -0,0 +1,56 @@
+package roomescape;
+
+
+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
+public class TestDataLoader implements CommandLineRunner {
+
+    private final MemberRepository memberRepository;
+    private final ThemeRepository themeRepository;
+    private final TimeRepository timeRepository;
+    private final ReservationRepository reservationRepository;
+
+    public TestDataLoader(MemberRepository memberRepository,
+                          ThemeRepository themeRepository,
+                          TimeRepository timeRepository,
+                          ReservationRepository reservationRepository) {
+        this.memberRepository = memberRepository;
+        this.themeRepository = themeRepository;
+        this.timeRepository = timeRepository;
+        this.reservationRepository = reservationRepository;
+    }
+
+    @Override
+    public void run(String... args) throws Exception {
+        // 1. 회원 저장 (1L: 어드민, 2L: 브라운)
+        Member admin = memberRepository.save(new Member("어드민", "admin@email.com", "password", "ADMIN"));
+        Member brown = memberRepository.save(new Member("브라운", "brown@email.com", "password", "USER"));
+
+        // 2. 테마 저장
+        Theme theme1 = themeRepository.save(new Theme("테마1", "테마1입니다."));
+        Theme theme2 = themeRepository.save(new Theme("테마2", "테마2입니다."));
+        Theme theme3 = themeRepository.save(new Theme("테마3", "테마3입니다."));
+
+        // 3. 시간 저장
+        Time time1 = timeRepository.save(new Time("10:00"));
+        Time time2 = timeRepository.save(new Time("12:00"));
+        Time time3 = timeRepository.save(new Time("14:00"));
+
+        // 4. 5단계, 6단계 테스트에서 요구하는 예약 데이터 저장
+        reservationRepository.save(new Reservation("어드민", "2024-03-01", time1, theme1, admin));
+        reservationRepository.save(new Reservation("어드민", "2024-03-01", time1, theme2, admin));
+        reservationRepository.save(new Reservation("어드민", "2024-03-01", time3, theme3, admin));
+    }
+}

src/main/java/roomescape/WebMvcConfiguration.java

@@ -1,12 +1,11 @@
 package roomescape;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import roomescape.auth.JwtUtils;
 import roomescape.member.AdminInterceptor;
-import roomescape.member.JwtTokenProvider;
 import roomescape.member.LoginMemberArgumentResolver;
 import roomescape.member.MemberRepository;
 
@@ -15,21 +14,19 @@
 @Configuration
 public class WebMvcConfiguration implements WebMvcConfigurer {
 
-    private final JwtTokenProvider jwtTokenProvider;
-    private final MemberRepository memberRepository;
+    private final JwtUtils jwtUtils;
 
-    public WebMvcConfiguration(JwtTokenProvider jwtTokenProvider, MemberRepository memberRepository){
-        this.jwtTokenProvider =  jwtTokenProvider;
-        this.memberRepository = memberRepository;
+    public WebMvcConfiguration(JwtUtils jwtUtils){
+        this.jwtUtils = jwtUtils;
     }
     @Override
     public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
-        resolvers.add(new LoginMemberArgumentResolver(jwtTokenProvider, memberRepository));
+        resolvers.add(new LoginMemberArgumentResolver(jwtUtils));
     }
 
     @Override
     public void addInterceptors(InterceptorRegistry registry){
-        registry.addInterceptor(new AdminInterceptor(jwtTokenProvider))
+        registry.addInterceptor(new AdminInterceptor(jwtUtils))
                 .addPathPatterns("/admin/**", "/admin");
     }
 }

src/main/java/roomescape/auth/AuthConfig.java

@@ -0,0 +1,18 @@
+package roomescape.auth;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class AuthConfig {
+
+    @Value("${roomescape.auth.jwt.secret}")
+    private String secretKey;
+
+    @Bean
+    public JwtUtils jwtUtils() {
+        // 1시간(3600000ms) 만료 기준
+        return new JwtUtils(secretKey, 3600000L);
+    }
+}

src/main/java/roomescape/auth/JwtUtils.java

@@ -0,0 +1,47 @@
+package roomescape.auth;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+
+import java.nio.charset.StandardCharsets;
+import java.security.Key;
+import java.util.Date;
+
+public class JwtUtils {
+
+    private final String secretKey;
+    private final long validityInMilliseconds;
+
+    public JwtUtils(String secretKey, long validityInMilliseconds) {
+        this.secretKey = secretKey;
+        this.validityInMilliseconds = validityInMilliseconds;
+    }
+
+    private Key getSigningKey() {
+        return Keys.hmacShaKeyFor(secretKey.getBytes(StandardCharsets.UTF_8));
+    }
+
+    public String createToken(String id, String role) {
+        Claims claims = Jwts.claims().setSubject(id);
+        claims.put("role", role);
+
+        Date now = new Date();
+        Date validity = new Date(now.getTime() + validityInMilliseconds);
+
+        return Jwts.builder()
+                .setClaims(claims)
+                .setIssuedAt(now)
+                .setExpiration(validity)
+                .signWith(getSigningKey())
+                .compact();
+    }
+
+    public Claims parseToken(String token) {
+        return Jwts.parserBuilder()
+                .setSigningKey(getSigningKey())
+                .build()
+                .parseClaimsJws(token)
+                .getBody();
+    }
+}

src/main/java/roomescape/member/AdminInterceptor.java

@@ -9,12 +9,13 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
+import roomescape.auth.JwtUtils;
 
 public class AdminInterceptor implements HandlerInterceptor {
-    private final JwtTokenProvider jwtTokenProvider;
+    private final JwtUtils jwtUtils;
 
-    public AdminInterceptor(JwtTokenProvider jwtTokenProvider) {
-        this.jwtTokenProvider =  jwtTokenProvider;
+    public AdminInterceptor(JwtUtils jwtUtils) {
+        this.jwtUtils = jwtUtils;
     }
 
     @Override
@@ -44,7 +45,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
         }
 
         try {
-            Claims claims = jwtTokenProvider.parseToken(token);
+            Claims claims = jwtUtils.parseToken(token);
 
             String role = claims.get("role", String.class);
 

src/main/java/roomescape/member/LoginMemberArgumentResolver.java

@@ -6,19 +6,20 @@
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.core.MethodParameter;
+import org.springframework.stereotype.Component;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
+import roomescape.auth.JwtUtils;
 
 //컨트롤러의 매개변수를 자동으로 만들어주는 클래스
+@Component
 public class LoginMemberArgumentResolver implements HandlerMethodArgumentResolver {
-    private final JwtTokenProvider jwtTokenProvider;
-    private final MemberRepository memberRepository;
+    private final JwtUtils jwtUtils;
 
-    public LoginMemberArgumentResolver(JwtTokenProvider jwtTokenProvider,MemberRepository memberRepository){
-        this.jwtTokenProvider = jwtTokenProvider;
-        this.memberRepository = memberRepository;
+    public LoginMemberArgumentResolver(JwtUtils jwtUtils){
+        this.jwtUtils = jwtUtils;
     }
 
     @Override
@@ -30,30 +31,28 @@ public boolean supportsParameter(MethodParameter parameter) {
     public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
                                   NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception {
         HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest(); //현재 HTTP 요청 가져오기
-        Cookie[] cookies = request.getCookies(); //쿠키 가져오기
+        String token = extractToken(request);
 
-        if (cookies == null) {
-            throw new IllegalArgumentException("토큰 쿠키가 존재하지 않습니다.");
+        if (token == null) {
+            throw new IllegalArgumentException("토큰이 존재하지 않습니다.");
         }
 
-        String token = "";
-        for (Cookie cookie : cookies) {
-            if ("token".equals(cookie.getName())) {//이름이 token인 쿠키 찾기
-                token = cookie.getValue(); //JWT 문자열 저장
-            }
-        }
-
-        if(token.isBlank()){
-            throw new IllegalArgumentException("토큰 값이 비어있습니다.");
-        }
-
-        // 토큰 파싱하여 회원 정보 추출
-        Claims claims = jwtTokenProvider.parseToken(token);
-        //정보 꺼내기
+        Claims claims = jwtUtils.parseToken(token);
         Long id = Long.parseLong(claims.getSubject());
+        String role = claims.get("role", String.class);
+        return new Member(id, role); // 필요한 id와 role만 가진 객체 반환
+    }
 
-        return memberRepository.findById(id)
-                .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 회원입니다."));
+    private String extractToken(HttpServletRequest request) {
+        Cookie[] cookies = request.getCookies();
+        if (cookies != null) {
+            for (Cookie cookie : cookies) {
+                if ("token".equals(cookie.getName())) {
+                    return cookie.getValue();
+                }
+            }
+        }
+        return null;
     }
 }
 //브라우저가 보낸 JWT 쿠키를 읽어서 그 안에 저장된 회원 정보를 Member 객체로 복원한 뒤, 컨트롤러의 Member loginMember 매개변수에 자동으로