[그리디] 이채현 SpringCore 7~9단계 제출합니다.

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 'dev.akkinoc.spring.boot:logback-access-spring-boot-starter:4.0.0'
 
@@ -27,6 +27,12 @@ dependencies {
     testImplementation 'io.rest-assured:rest-assured:5.3.1'
 
     runtimeOnly 'com.h2database:h2'
+
+    compileOnly 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok'
+
+    testCompileOnly 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
 }
 
 test {

script/deploy.sh

@@ -0,0 +1,14 @@
+git pull code JPA4
+./gradlew clean build
+PID=$(cat application.pid 2>/dev/null)
+
+if [ -n "$PID" ]; then
+    kill -15 "$PID"
+    sleep 5
+fi
+
+JAR=$(find build/libs -name "*.jar" | head -n 1)
+
+nohup java -jar "$JAR" > application.log 2>&1 &
+
+echo $! > application.pid

src/main/README.md

@@ -3,27 +3,28 @@
 안녕하세요. 세종대학교 그리디 백엔드 4기 이채현입니다.
 
 
----
-##  Spring MVC 미션 3단계 - 관리자 기능
-
-어드민 페이지 진입은 admin 권한이 있는 사람만 할 수 있도록 제한한다.
-만약 진입 권한이 없다면 401 코드를 응답하도록 한다.
 
 ---
-### 고민한 내용 🤔
+##  Spring JPA Spring Core 배포
 
-- HandlerInterceptor에서 기본적으로 preHandle/postHandle/afterCompletion으로 나뉘어져있던데,
-이번의 경우에는 admin페이지 접속만을 확인하면 되는거라서 preHandle만을 사용했습니다.
-이경우에는 postHandle과 afterCompletion을 어떻게 구성하면 좋을지..? 알고 싶네요.
+### 🚀 7단계 - @Configuration
+JWT 관련 로직을 roomescape와 같은 계층의 auth 패키지의 클래스로 분리하고,
+불필요한 DB 접근을 최소화하기.
 
 
-- WebConfig 같은 경우에는, admin 페이지를 접속할때의 role만을 확인해주면 되므로 /admin/***을 사용해주었습니다.
+### 🚀 8단계 - Profile과 Resource
 
-- token 만료시간도 있어야할 것 같아서 expire_time을 이용해서,만료시간을 구현해보았습니다. 만료시간을 구현할 더 좋은
-방법이 있을지?? 궁금합니다.
+schema.sql 대신 데이터베이스를 초기화 해주기 위해 실행하는 클래스를 생성.
+스프링이 실행될 때 동작해야 함.
+token 생성에 필요한 비밀키값을 외부 파일로 분리하기.
 
-- token을 accessToken과 refreshToken으로 나눠서 구현해주었는데, 구현하다보니 너무 어려워서 제대로 구현된건지 잘 
-모르겠습니다.
+### 🚀 9단계 - 배포 스크립트
 
+ec2나 서버에서 배포를 할 수 있게 배포 스크립트를 작성하기.
+
+---
+### 고민한 내용 🤔
+1. JwtProvider를 auth package를 생성해서,JwtConfig와 JwtUtils로 분리해줬는데, 이렇게 구성하면 장점이 궁금합니다.
 
+배포스크립트와 초기 설정의 시나리오가 어떻게 사용되는지 잘 모르겠습니다...
 

src/main/java/auth/JwtConfig.java

@@ -0,0 +1,18 @@
+package auth;
+
+import io.jsonwebtoken.security.Keys;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.nio.charset.StandardCharsets;
+import java.security.Key;
+
+@Configuration
+public class JwtConfig {
+    @Bean
+    public JwtUtils jwtUtils(@Value("${roomescape.auth.jwt.secret}")String secret){
+        Key key = Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8));
+        return new JwtUtils(key);
+    }
+}

src/main/java/auth/JwtUtils.java

@@ -0,0 +1,54 @@
+package auth;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import roomescape.member.Member;
+
+import java.security.Key;
+import java.util.Date;
+
+
+public class JwtUtils {
+    private final Key secretKey;
+    private final long expireAccessTime = 30L * 60 * 1000;
+    private final long expireRefreshTime = 14L * 24 * 60 * 60 * 1000;
+
+    public JwtUtils(Key secretKey) {
+        this.secretKey = secretKey;
+    }
+
+    public String createAccessToken(Member member) {
+        return createToken(member.getId(),expireAccessTime);
+    }
+
+    public String createRefreshToken(Member member) {
+        return createToken(member.getId(),expireRefreshTime);
+    }
+    private String createToken(Long memberId, long expireTime){
+        Date now= new Date();
+
+        return Jwts.builder()
+                .setSubject(memberId.toString())
+                .setIssuedAt(now)
+                .setExpiration(new Date(now.getTime()+expireTime))
+                .signWith(secretKey)
+                .compact();
+    }
+
+    public Long getMemberId(String token) {
+        Claims claims = parseClaims(token);
+        return Long.parseLong(claims.getSubject());
+    }
+
+    private Claims parseClaims(String token) {
+        try {
+            return Jwts.parserBuilder()
+                    .setSigningKey(secretKey)
+                    .build()
+                    .parseClaimsJws(token)
+                    .getBody();
+        } catch (Exception e) {
+            throw new IllegalArgumentException("유효하지 않거나 만료된 토큰입니다.", e);
+        }
+    }
+}

src/main/java/roomescape/CookieManager.java

@@ -1,13 +1,13 @@
 package roomescape;
 
 import jakarta.servlet.http.Cookie;
+import org.springframework.stereotype.Component;
 import roomescape.exception.TokenNotFoundException;
 
 import java.util.Arrays;
 
+@Component
 public class CookieManager {
-
-
     public String extractToken(Cookie[] cookies, String cookieName) {
         return Arrays.stream(cookies)
                 .filter(cookie -> cookieName.equals(cookie.getName()))

src/main/java/roomescape/RoomescapeApplication.java

@@ -3,7 +3,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages={"roomescape","auth"})
 public class RoomescapeApplication {
     public static void main(String[] args) {
         SpringApplication.run(RoomescapeApplication.class, args);

src/main/java/roomescape/dataLoader/DataLoader.java

@@ -0,0 +1,41 @@
+package roomescape.dataLoader;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+import roomescape.member.Member;
+import roomescape.member.MemberRepository;
+
+
+@Component
+public class DataLoader implements CommandLineRunner {
+
+    @Autowired
+    private MemberRepository memberRepository;
+
+    public DataLoader(MemberRepository memberRepository) {
+        this.memberRepository = memberRepository;
+    }
+
+    @Override
+    public void run(String ...args){
+        if(memberRepository.count()>0){
+            return;
+        }
+
+        Member admin= Member.builder()
+                        .name("어드민")
+                        .email("admin@email.com")
+                        .password("password")
+                        .role("ADMIN").build();
+
+        Member brown= Member.builder()
+                .name("브라운")
+                .email("brown@email.com")
+                .password("password")
+                .role("USER").build();
+
+        memberRepository.save(admin);
+        memberRepository.save(brown);
+    }
+}

src/main/java/roomescape/dataLoader/TestDataLoader.java

@@ -0,0 +1,109 @@
+package roomescape.dataLoader;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+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;
+
+@Component
+public class TestDataLoader implements CommandLineRunner {
+
+    @Autowired
+    private final ThemeRepository themeRepository;
+    private final TimeRepository timeRepository;
+    private final ReservationRepository reservationRepository;
+    private final MemberRepository memberRepository;
+
+    public TestDataLoader(ThemeRepository themeRepository, TimeRepository timeRepository,
+                          ReservationRepository reservationRepository, MemberRepository memberRepository) {
+        this.themeRepository = themeRepository;
+        this.timeRepository = timeRepository;
+        this.reservationRepository = reservationRepository;
+        this.memberRepository = memberRepository;
+    }
+
+    @Override
+    public void run(String... args) {
+        Member admin = memberRepository.findByName("ADMIN")
+                .orElseThrow();
+        Member brown = memberRepository.findByName("브라운")
+                .orElseThrow();
+        if (themeRepository.count() > 0) {
+            return;
+        }
+        Theme theme1 = Theme.builder()
+                .name("테마1")
+                .description("테마1입니다.")
+                .build();
+        Theme theme2 = Theme.builder()
+                .name("테마2")
+                .description("테마2입니다.")
+                .build();
+        Theme theme3 = Theme.builder()
+                .name("테마3")
+                .description("테마3입니다.")
+                .build();
+
+        themeRepository.save(theme1);
+        themeRepository.save(theme2);
+        themeRepository.save(theme3);
+
+        if (timeRepository.count() > 0) {
+            return;
+        }
+        Time time1 = Time.builder()
+                .value("10:00")
+                .build();
+        Time time2 = Time.builder()
+                .value("12:00")
+                .build();
+        Time time3 = Time.builder()
+                .value("14:00")
+                .build();
+        Time time4 = Time.builder()
+                .value("16:00")
+                .build();
+        Time time5 = Time.builder()
+                .value("18:00")
+                .build();
+        Time time6 = Time.builder()
+                .value("20:00")
+                .build();
+        timeRepository.save(time1);
+        timeRepository.save(time2);
+        timeRepository.save(time3);
+        timeRepository.save(time4);
+        timeRepository.save(time5);
+        timeRepository.save(time6);
+
+        reservationRepository.save(
+                Reservation.builder()
+                        .member(admin)
+                        .date("2024-03-01")
+                        .time(time1)
+                        .theme(theme1)
+                        .build());
+        reservationRepository.save(
+                Reservation.builder()
+                        .member(admin)
+                        .date("2024-03-01")
+                        .time(time2)
+                        .theme(theme2)
+                        .build());
+        reservationRepository.save(
+                Reservation.builder()
+                        .member(brown)
+                        .date("2024-03-01")
+                        .time(time3)
+                        .theme(theme3)
+                        .build());
+    }
+}