[그리디] 이창희 Spring Core (배포) 7,8,9 단계 제출합니다

README.md

@@ -128,6 +128,77 @@
 
 
 
+<br>
+
+---
+## 🚀 7단계 - @Configuration
+
+### 📝 기능 요구사항
+✅ JWT 관련 로직을 roomescape와 같은 계층의 auth 패키지의 클래스로 분리하세요.  
+✅ 불필요한 DB 접근을 최소화 하세요.  
+
+
+
+### 💻 구현 전략
+
+1. jwt 모듈 분리     
+   ➡️ Jwt 토큰을 발급, 파싱했던 `JwtTokenProvider`와    
+   ➡️ Jwt관련 환경변수를 담은 `JwtProperties` 클래스를 외부 jwt 패키지로 분리하고  
+   ➡️ 해당 객체들을 `JwtConfig`를 통해 빈으로 등록
+
+이렇게 분리된 설정을 Application 클래스에 `@Import`
+
+
+
+
+<br>
+
+---
+## 🚀 8단계 - Profile과 Resource
+
+### 📝 기능 요구사항
+✅ schema.sql 대신 데이터베이스를 초기화 해주기 위해 실행하는 클래스를 만드세요.    
+✅ token 생성에 필요한 비밀키값을 외부 파일로 분리하세요  
+
+
+
+### 💻 구현 전략
+
+1. DB 초기화     
+   ➡️ Production용과 DataLoader    
+   ➡️ Test용 TestDataLoader를 따로 만들어 DB 초기화
+
+2. prod 환경과 test 환경 분리  
+   ➡️ test 에 관한 설정은 test 패키지 하위 application.yml 파일 생성
+
+
+
+
+
+<br>
+
+---
+## 🚀 9단계 - 배포 스크립트
+
+### 📝 기능 요구사항
+✅ ec2나 서버에서 배포를 할 수 있게 배포 스크립트를 작성하세요.    
+
+
+
+### 💻 구현 전략
+
+1. EC2 인스턴스 생성       
+
+
+
+2. 인스턴스에 ssh 접속 후 메모리 스왑 설정  
+   ➡️ 부족한 인스턴스의 메모리를 디스크를 활용해 메모리의 내용을 스왑함으로써, 사용가능한 메모리 상한 올림  
+
+
+3. github 에 코드를 pull
+
 
+4. 프로젝트 빌드
 
 
+5. 빌드된 jar 파일 백 그라운드로 실행

src/main/java/jwt/JwtConfig.java

@@ -0,0 +1,15 @@
+package jwt;
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableConfigurationProperties(JwtProperties.class)
+public class JwtConfig {
+
+    @Bean
+    public JwtTokenProvider jwtTokenProvider(JwtProperties jwtProperties) {
+        return new JwtTokenProvider(jwtProperties);
+    }
+}

src/main/java/roomescape/auth/JwtProperties.java → src/main/java/jwt/JwtProperties.java

@@ -1,4 +1,4 @@
-package roomescape.auth;
+package jwt;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

src/main/java/roomescape/auth/JwtTokenProvider.java → src/main/java/jwt/JwtTokenProvider.java

@@ -1,14 +1,13 @@
-package roomescape.auth;
+package jwt;
 
 import io.jsonwebtoken.*;
 import io.jsonwebtoken.security.Keys;
-import org.springframework.stereotype.Component;
+import roomescape.auth.AuthException;
 import roomescape.exception.ApplicationException;
 import roomescape.member.domain.Member;
 
 import java.util.Date;
 
-@Component
 public class JwtTokenProvider {
 
     private final String secretKey;

src/main/java/roomescape/DataLoader.java

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

src/main/java/roomescape/RoomescapeApplication.java

@@ -1,11 +1,12 @@
 package roomescape;
 
+import jwt.JwtConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
+import org.springframework.context.annotation.Import;
 
 @SpringBootApplication
-@ConfigurationPropertiesScan(basePackages = "roomescape")
+@Import(JwtConfig.class)
 public class RoomescapeApplication {
     public static void main(String[] args) {
         SpringApplication.run(RoomescapeApplication.class, args);

src/main/java/roomescape/auth/AdminAuthInterceptor.java

@@ -1,5 +1,6 @@
 package roomescape.auth;
 
+import jwt.JwtTokenProvider;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Component;

src/main/java/roomescape/auth/LoginMemberArgumentResolver.java

@@ -1,5 +1,6 @@
 package roomescape.auth;
 
+import jwt.JwtTokenProvider;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.core.MethodParameter;
 import org.springframework.stereotype.Component;

src/main/java/roomescape/common/CookieUtil.java

@@ -10,6 +10,7 @@ public class CookieUtil {
     public static void setToken(String accessToken, int cookieExpirationSeconds, HttpServletResponse response) {
         Cookie cookie = new Cookie("token", accessToken);
         cookie.setHttpOnly(true);
+        cookie.setSecure(true);
         cookie.setPath("/");
         cookie.setMaxAge(cookieExpirationSeconds);
         response.addCookie(cookie);

src/main/java/roomescape/member/presentation/MemberController.java

@@ -8,8 +8,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import roomescape.auth.AuthenticatedMember;
-import roomescape.auth.JwtProperties;
-import roomescape.auth.JwtTokenProvider;
+import jwt.JwtProperties;
+import jwt.JwtTokenProvider;
 import roomescape.auth.LoginMember;
 import roomescape.common.CookieUtil;
 import roomescape.member.application.MemberService;

src/main/resources/application.yml

@@ -0,0 +1,27 @@
+server:
+  port: 8080
+
+spring:
+  profiles:
+    active: prod
+
+  h2:
+    console:
+      enabled: true
+      path: /h2-console
+
+  datasource:
+    url: jdbc:h2:mem:database
+
+  jpa:
+    show-sql: true
+    properties:
+      hibernate:
+        format_sql: true
+    ddl-auto: create
+
+roomescape:
+  auth:
+    jwt:
+      secret: Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E=
+      expiration: 1800000

src/test/java/roomescape/JpaTest.java

@@ -3,15 +3,21 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
 import roomescape.time.domain.Time;
 import roomescape.time.domain.TimeRepository;
 
+import static org.assertj.core.api.Assertions.*;
+
 
 @DataJpaTest
 public class JpaTest {
 
+    @Value("${roomescape.auth.jwt.secret}")
+    private String secretKey;
+
     @Autowired
     private TestEntityManager entityManager;
 
@@ -26,6 +32,11 @@ public class JpaTest {
 
         Time persistTime = timeRepository.findById(time.getId()).orElse(null);
 
-        Assertions.assertThat(persistTime.getValue()).isEqualTo(time.getValue());
+        assertThat(persistTime.getValue()).isEqualTo(time.getValue());
+    }
+
+    @Test
+    void 팔단계() {
+        assertThat(secretKey).isNotBlank();
     }
 }

src/test/java/roomescape/MissionStepTest.java

@@ -1,12 +1,17 @@
 package roomescape;
 
+import jwt.JwtTokenProvider;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import io.restassured.response.ExtractableResponse;
 import io.restassured.response.Response;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.stereotype.Component;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ActiveProfiles;
 import roomescape.reservation.presentation.response.MyReservationResponse;
 import roomescape.reservation.presentation.response.ReservationResponse;
 import roomescape.waiting.presentation.response.WaitingResponse;
@@ -20,8 +25,17 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+@ActiveProfiles("test")
 public class MissionStepTest {
 
+    @LocalServerPort
+    private int port;
+
+    @BeforeEach
+    void setUp() {
+        RestAssured.port = port;
+    }
+
     @Test
     void 일단계() {
         String token = createToken("admin@email.com", "password");
@@ -154,4 +168,10 @@ private static String createToken(String email, String password) {
 
         assertThat(status).isEqualTo("1번째 예약대기");
     }
+
+    @Test
+    void 칠단계() {
+        Component componentAnnotation = JwtTokenProvider.class.getAnnotation(Component.class);
+        assertThat(componentAnnotation).isNull();
+    }
 }