[그리디] 정명준 Spring Core(배포) 7~9단계 제출합니다.

build.gradle

@@ -24,6 +24,11 @@ dependencies {
     implementation 'io.jsonwebtoken:jjwt-impl:0.11.2'
     implementation 'io.jsonwebtoken:jjwt-gson:0.11.2'
 
+    compileOnly 'org.projectlombok:lombok:1.18.34'
+    annotationProcessor 'org.projectlombok:lombok:1.18.34'
+    testCompileOnly 'org.projectlombok:lombok:1.18.34'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.34'
+
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.rest-assured:rest-assured:5.3.1'
 

deploy.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+REPOSITORY=/home/ubuntu/app
+REPO_URL="https://github.com/htdufhc-bit/spring-basic-roomescape-playground"
+PID_FILE="$REPOSITORY/app.pid"
+
+echo "[INFO] 최신 코드 pull"
+cd $REPOSITORY
+git pull $REPO_URL
+
+echo "[INFO] 프로젝트 빌드"
+cd $REPOSITORY
+./gradlew build
+
+if [ $? -ne 0 ]; then
+  echo "[ERROR] 빌드에 실패했습니다. 배포를 중단합니다."
+  exit 1
+fi
+
+echo "[INFO] 기존에 실행 중인 애플리케이션 PID 종료"
+CURRENT_PID=$(pgrep -f "$REPOSITORY/build/libs/*.jar")
+
+if [ -z "$CURRENT_PID" ]; then
+  echo "[INFO] 종료할 애플리케이션이 없습니다."
+else
+  echo "[INFO] kill -15 $CURRENT_PID"
+  kill -15 $CURRENT_PID
+  sleep 5
+fi
+
+echo "[INFO] 새 애플리케이션 실행"
+JAR_NAME=$(ls $REPOSITORY/build/libs/*.jar | grep -v plain)
+
+nohup java -jar $JAR_NAME > $REPOSITORY/nohup.log 2>&1 &
+
+echo $! > $PID_FILE
+echo "[INFO] 애플리케이션이 실행되었습니다. PID: $(cat $PID_FILE)"

setup.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+REPOSITORY=/home/ubuntu/app
+REPO_URL="https://github.com/htdufhc-bit/spring-basic-roomescape-playground"
+PID_FILE="$REPOSITORY/app.pid"
+
+echo "[INFO] 시스템 패키지 업데이트"
+sudo apt update
+
+echo "[INFO] JDK 17 설치"
+sudo apt install -y openjdk-17-jdk
+
+echo "[INFO] 프로젝트 디렉토리 생성 및 이동"
+mkdir -p $REPOSITORY
+cd $REPOSITORY
+
+echo "[INFO] Git Repository 클론 또는 최신화"
+if [ -d ".git" ]; then
+    echo "이미 git repository가 존재합니다. 최신 코드를 받아옵니다."
+    git pull
+else
+    git clone $REPO_URL .
+fi
+
+echo "[INFO] 초기 설정 완료"

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

@@ -15,7 +15,7 @@
 import roomescape.auth.service.AuthService;
 import roomescape.auth.web.Login;
 import roomescape.auth.web.TokenExtractor;
-import roomescape.util.CookieUtil;
+import roomescape.global.util.CookieUtil;
 
 @RestController
 public class AuthController {
@@ -52,7 +52,7 @@ public ResponseEntity<Void> loginByRefreshToken(HttpServletRequest request,
 
     @GetMapping("/login/check")
     public ResponseEntity<LoginCheckResponse> checkLogin(@Login LoginMember loginMember) {
-        return ResponseEntity.ok(new LoginCheckResponse(loginMember.name()));
+        return ResponseEntity.ok(LoginCheckResponse.from(loginMember));
     }
 
     @PostMapping("/logout")

src/main/java/roomescape/auth/dto/LoginCheckResponse.java

@@ -1,6 +1,12 @@
 package roomescape.auth.dto;
 
+import roomescape.auth.domain.LoginMember;
+
 public record LoginCheckResponse(
         String name
 ) {
+
+    public static LoginCheckResponse from(LoginMember loginMember) {
+        return new LoginCheckResponse(loginMember.name());
+    }
 }

src/main/java/roomescape/auth/dto/TokenResponse.java

@@ -4,4 +4,8 @@ public record TokenResponse(
         String accessToken,
         String refreshToken
 ) {
+
+    public static TokenResponse of(String accessToken, String refreshToken) {
+        return new TokenResponse(accessToken, refreshToken);
+    }
 }

src/main/java/roomescape/auth/entity/RefreshToken.java

@@ -8,9 +8,13 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import roomescape.member.entity.Member;
 
 @Entity(name = "refresh_token")
+@NoArgsConstructor
+@Getter
 public class RefreshToken {
 
     @Id
@@ -24,23 +28,12 @@ public class RefreshToken {
     @Column(nullable = false, length = 500)
     private String token;
 
-    public RefreshToken() {
-    }
-
-    public RefreshToken(Member member, String token) {
+    private RefreshToken(Member member, String token) {
         this.member = member;
         this.token = token;
     }
 
-    public Long getId() {
-        return id;
-    }
-
-    public Member getMember() {
-        return member;
-    }
-
-    public String getToken() {
-        return token;
+    public static RefreshToken of(Member member, String token) {
+        return new RefreshToken(member, token);
     }
 }

src/main/java/roomescape/auth/exception/AuthErrorCode.java

@@ -1,7 +1,7 @@
 package roomescape.auth.exception;
 
 import org.springframework.http.HttpStatus;
-import roomescape.exception.ErrorCode;
+import roomescape.global.exception.ErrorCode;
 
 public enum AuthErrorCode implements ErrorCode {
     ACCESS_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "토큰이 만료되었습니다."),

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

@@ -7,27 +7,29 @@
 import io.jsonwebtoken.UnsupportedJwtException;
 import io.jsonwebtoken.security.Keys;
 import io.jsonwebtoken.security.SignatureException;
-import org.springframework.stereotype.Component;
 import roomescape.auth.exception.AuthErrorCode;
-import roomescape.exception.ApplicationException;
+import roomescape.global.exception.ApplicationException;
 import roomescape.member.entity.Member;
 
 import java.security.Key;
 import java.util.Base64;
 import java.util.Date;
 
-@Component
 public class JwtTokenProvider {
 
     private final Key secretKey;
     private final long accessTokenExpiration;
     private final long refreshTokenExpiration;
 
-    public JwtTokenProvider(JwtTokenProperty tokenProperty) {
+    public JwtTokenProvider(
+            String secretKey,
+            long accessTokenExpiration,
+            long refreshTokenExpiration
+    ) {
         this.secretKey = Keys.hmacShaKeyFor(
-                Base64.getDecoder().decode(tokenProperty.secretKey()));
-        this.accessTokenExpiration = tokenProperty.accessTokenExpiration();
-        this.refreshTokenExpiration = tokenProperty.refreshTokenExpiration();
+                Base64.getDecoder().decode(secretKey));
+        this.accessTokenExpiration = accessTokenExpiration;
+        this.refreshTokenExpiration = refreshTokenExpiration;
     }
 
     public String createAccessToken(Member member) {

src/main/java/roomescape/auth/repository/RefreshTokenRepository.java

@@ -1,18 +1,15 @@
 package roomescape.auth.repository;
 
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 import roomescape.auth.entity.RefreshToken;
 
 import java.util.Optional;
 
-public interface RefreshTokenRepository {
-
-    void save(RefreshToken refreshToken);
+@Repository
+public interface RefreshTokenRepository extends JpaRepository<RefreshToken, Long> {
 
     Optional<RefreshToken> findByToken(String token);
 
-    Optional<RefreshToken> findByMemberId(Long memberId);
-
     void deleteByMemberId(Long memberId);
-
-    void flush();
 }

src/main/java/roomescape/auth/service/AuthService.java

@@ -9,7 +9,7 @@
 import roomescape.auth.exception.AuthErrorCode;
 import roomescape.auth.jwt.JwtTokenProvider;
 import roomescape.auth.repository.RefreshTokenRepository;
-import roomescape.exception.ApplicationException;
+import roomescape.global.exception.ApplicationException;
 import roomescape.member.entity.Member;
 import roomescape.member.exception.MemberErrorCode;
 import roomescape.member.repository.MemberRepository;
@@ -68,8 +68,8 @@ private TokenResponse createTokens(Member member) {
 
         refreshTokenRepository.deleteByMemberId(member.getId());
         refreshTokenRepository.flush();
-        refreshTokenRepository.save(new RefreshToken(member, refreshToken));
+        refreshTokenRepository.save(RefreshToken.of(member, refreshToken));
 
-        return new TokenResponse(accessToken, refreshToken);
+        return TokenResponse.of(accessToken, refreshToken);
     }
 }

src/main/java/roomescape/auth/web/CheckAdminInterceptor.java

@@ -7,7 +7,7 @@
 import roomescape.auth.domain.LoginMember;
 import roomescape.auth.exception.AuthErrorCode;
 import roomescape.auth.service.AuthService;
-import roomescape.exception.ApplicationException;
+import roomescape.global.exception.ApplicationException;
 
 @Component
 public class CheckAdminInterceptor implements HandlerInterceptor {

src/main/java/roomescape/auth/web/TokenExtractor.java

@@ -3,8 +3,8 @@
 import jakarta.servlet.http.Cookie;
 import org.springframework.stereotype.Component;
 import roomescape.auth.exception.AuthErrorCode;
-import roomescape.exception.ApplicationException;
-import roomescape.util.CookieUtil;
+import roomescape.global.exception.ApplicationException;
+import roomescape.global.util.CookieUtil;
 
 @Component
 public class TokenExtractor {

src/main/java/roomescape/global/config/DataLoader.java

@@ -0,0 +1,38 @@
+package roomescape.global.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.entity.Member;
+import roomescape.member.entity.Role;
+import roomescape.member.repository.MemberRepository;
+
+@Component
+@Profile("prod")
+public class DataLoader implements CommandLineRunner {
+
+    @Autowired
+    private MemberRepository memberRepository;
+
+    @Override
+    @Transactional
+    public void run(String... args) throws Exception {
+        createMember("어드민", "admil@email.com", "password", Role.ADMIN);
+        createMember("브라운", "brown@email.com", "password", Role.USER);
+    }
+
+    private void createMember(String name, String email, String password, Role role) {
+        if (!validateMemberExists(email)) {
+            memberRepository.save(
+                    Member.of(name, email, password, role)
+            );
+        }
+    }
+
+    private boolean validateMemberExists(String email) {
+        return memberRepository.findByEmail(email)
+                .isPresent();
+    }
+}

src/main/java/roomescape/global/config/SecureConfig.java

@@ -0,0 +1,24 @@
+package roomescape.global.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import roomescape.auth.jwt.JwtTokenProvider;
+
+@Configuration
+public class SecureConfig {
+
+    @Value("${roomescape.auth.jwt.secret-key}")
+    String secretKey;
+
+    @Value("${roomescape.auth.jwt.access-token-expiration}")
+    long accessTokenExpiration;
+
+    @Value("${roomescape.auth.jwt.refresh-token-expiration}")
+    long refreshTokenExpiration;
+
+    @Bean
+    public JwtTokenProvider jwtTokenProvider() {
+        return new JwtTokenProvider(secretKey, accessTokenExpiration, refreshTokenExpiration);
+    }
+}