[Feature] 작품 퀴즈 없을 시, 지역 퀴즈 연결 기능 구현

.github/workflows/gradle.yml

@@ -0,0 +1,98 @@
+name: Java CI/CD with Gradle
+
+on:
+  push:
+    branches: [ "dev" ]
+  pull_request:
+    branches: [ "dev" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Run chmod to make gradlew executable
+        run: chmod +x ./gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew clean build -x test
+
+      - name: Upload Build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-artifacts
+          path: |
+            build/libs/*.jar
+
+  deploy:
+    needs: build
+    name: Deploy
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Download Build artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: build-artifacts
+          path: build/libs/
+
+      - name: Setup SSH
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y openssh-client
+          mkdir -p ~/.ssh
+          echo "${{ secrets.EC2_KEY_DEV }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan -H ${{ secrets.EC2_HOST_DEV }} >> ~/.ssh/known_hosts
+
+      - name: Upload new JAR to EC2
+        shell: bash
+        run: |
+          scp -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no build/libs/spotserver-0.0.1-SNAPSHOT.jar ${{ secrets.EC2_USER_DEV }}@${{ secrets.EC2_HOST_DEV }}:/home/${{ secrets.EC2_USER_DEV }}/
+
+      - name: Execute commands on EC2
+        run: |
+          ssh -i ~/.ssh/id_rsa -o StrictHostKeyChecking=no ${{ secrets.EC2_USER_DEV }}@${{ secrets.EC2_HOST_DEV }} << 'EOF'
+            # Set PATH if needed
+            export PATH=/usr/bin:/bin:/sbin:/usr/sbin
+
+            # Start Redis server
+            sudo systemctl start redis-server
+
+            # Ensure no other process is using the port
+            sudo fuser -k -n tcp 8080
+
+            # Wait for a moment to ensure Redis and port are ready
+            sleep 10
+
+            # Kill any existing Java processes
+            pgrep java | xargs kill -9
+
+            # Remove old JAR if exists
+            rm -f /home/${{ secrets.EC2_USER_DEV }}/spotserver-0.0.1-SNAPSHOT.jar
+
+            # Run the new Java application with environment variables
+            nohup java -jar /home/${{ secrets.EC2_USER_DEV }}/spotserver-0.0.1-SNAPSHOT.jar \
+              --spring.datasource.url=${{ secrets.RDS_URL }} \
+              --spring.datasource.username=${{ secrets.RDS_USERNAME }} \
+              --spring.datasource.password=${{ secrets.RDS_PASSWORD }} \
+              --cloud.aws.credentials.access-key=${{ secrets.AWS_ACCESS_KEY }} \
+              --cloud.aws.credentials.secret-key=${{ secrets.AWS_SECRET_KEY }} \
+              > /home/${{ secrets.EC2_USER_DEV }}/nohup.out 2>&1 &
+
+            # Check if the application is running on the expected port
+            sudo lsof -i tcp:8080
+          EOF

.gitignore

@@ -18,6 +18,8 @@ bin/
 !**/src/test/**/bin/
 
 ### IntelliJ IDEA ###
+application-secret.yml
+
 .idea
 *.iws
 *.iml

build.gradle

@@ -28,6 +28,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 	implementation 'org.springframework.boot:spring-boot-devtools'
 
 	compileOnly 'org.projectlombok:lombok'
@@ -36,8 +37,32 @@ dependencies {
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+	//openfeign
+	implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
+	implementation 'io.github.openfeign:feign-micrometer'
+	implementation 'io.github.openfeign:feign-jackson:12.3'
+
+	//jwt
+	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+	runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+	runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+	//s3
+	implementation platform('software.amazon.awssdk:bom:2.17.230')
+	implementation 'software.amazon.awssdk:s3'
 }
 
 tasks.named('test') {
 	useJUnitPlatform()
 }
+
+ext {
+	set('springCloudVersion', "2023.0.2")
+}
+
+dependencyManagement {
+	imports {
+		mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+	}
+}

src/main/java/com/spot/spotserver/SpotserverApplication.java

@@ -2,7 +2,11 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
+@EnableJpaAuditing
+@EnableFeignClients
 @SpringBootApplication
 public class SpotserverApplication {
 

src/main/java/com/spot/spotserver/api/auth/client/KakaoAccount.java

@@ -0,0 +1,17 @@
+package com.spot.spotserver.api.auth.client;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public record KakaoAccount(
+        Boolean profile_nickname_needs_agreement,
+        Boolean profile_image_needs_agreement,
+        KakaoProfile profile,
+        Boolean has_email,
+        Boolean email_needs_agreement,
+        Boolean is_email_valid,
+        Boolean is_email_verified,
+        String email
+) {
+}

src/main/java/com/spot/spotserver/api/auth/client/KakaoApiClient.java

@@ -0,0 +1,18 @@
+package com.spot.spotserver.api.auth.client;
+
+import com.spot.spotserver.api.auth.dto.response.KakaoUserResponse;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+
+@Configuration
+@Import(FeignAutoConfiguration.class)
+@FeignClient(name = "kakaoApiClient", url = "https://kapi.kakao.com")
+public interface KakaoApiClient {
+    @GetMapping(value = "/v2/user/me")
+    KakaoUserResponse getUserInformation(@RequestHeader(HttpHeaders.AUTHORIZATION) String accessToken);
+}

src/main/java/com/spot/spotserver/api/auth/client/KakaoAuthApiClient.java

@@ -0,0 +1,19 @@
+package com.spot.spotserver.api.auth.client;
+
+import com.spot.spotserver.api.auth.dto.response.KakaoAccessTokenResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(name = "kakaoAuthApiClient", url = "https://kauth.kakao.com")
+public interface KakaoAuthApiClient {
+    @PostMapping(value = "/oauth/token", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    KakaoAccessTokenResponse getOAuth2AccessToken(
+            @RequestParam("grant_type") String grantType,
+            @RequestParam("client_id") String clientId,
+            @RequestParam("redirect_uri") String redirectUri,
+            @RequestParam("code") String code,
+            @RequestParam("client_secret") String clientSecret
+    );
+}

src/main/java/com/spot/spotserver/api/auth/client/KakaoProfile.java

@@ -0,0 +1,14 @@
+package com.spot.spotserver.api.auth.client;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public record KakaoProfile(
+        String nickname,
+        String thumbnail_image_url,
+        String profile_image_url,
+        Boolean is_default_image,
+        Boolean is_default_nickname
+) {
+}

src/main/java/com/spot/spotserver/api/auth/client/KakaoProperties.java

@@ -0,0 +1,12 @@
+package com.spot.spotserver.api.auth.client;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public record KakaoProperties(
+        String nickname,
+        String profile_image,
+        String thumbnail_image
+) {
+}

src/main/java/com/spot/spotserver/api/auth/controller/AuthController.java

@@ -1,7 +1,40 @@
 package com.spot.spotserver.api.auth.controller;
 
+import com.spot.spotserver.api.auth.dto.request.TokenRequest;
+import com.spot.spotserver.api.auth.dto.response.TokenResponse;
+import com.spot.spotserver.api.auth.service.AuthService;
+import com.spot.spotserver.api.user.service.UserService;
+import com.spot.spotserver.common.payload.ApiResponse;
+import com.spot.spotserver.common.payload.SuccessCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
+@RequiredArgsConstructor
 public class AuthController {
+
+    private final AuthService authService;
+    private final UserService userService;
+
+    @PostMapping("/api/login/kakao")
+    public ApiResponse<TokenResponse> login(@RequestParam final String accessToken) {
+
+        TokenResponse successResponse = authService.login(accessToken);
+
+        TokenResponse result = new TokenResponse(
+                successResponse.accessToken(),
+                successResponse.refreshToken()
+        );
+        return ApiResponse.success(SuccessCode.LOGIN_SUCCESS, result);
+    }
+
+    @PostMapping("/api/refresh")
+    public ApiResponse<TokenResponse> reissueToken(@RequestBody TokenRequest request) {
+
+        TokenResponse result = userService.reissueToken(request.refreshToken());
+        return ApiResponse.success(SuccessCode.REISSUE_TOKEN_SUCCESS, result);
+    }
 }

src/main/java/com/spot/spotserver/api/auth/dto/request/TokenRequest.java

@@ -0,0 +1,6 @@
+package com.spot.spotserver.api.auth.dto.request;
+
+public record TokenRequest(
+        String refreshToken
+) {
+}

src/main/java/com/spot/spotserver/api/auth/dto/response/KakaoAccessTokenResponse.java

@@ -0,0 +1,17 @@
+package com.spot.spotserver.api.auth.dto.response;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public record KakaoAccessTokenResponse(
+        String accessToken
+) {
+    public static KakaoAccessTokenResponse of(
+            final String accessToken
+    ) {
+        return new KakaoAccessTokenResponse(
+                accessToken
+        );
+    }
+}

src/main/java/com/spot/spotserver/api/auth/dto/response/KakaoUserResponse.java

@@ -0,0 +1,15 @@
+package com.spot.spotserver.api.auth.dto.response;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.spot.spotserver.api.auth.client.KakaoAccount;
+import com.spot.spotserver.api.auth.client.KakaoProperties;
+
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public record KakaoUserResponse(
+        Long id,
+        String connected_at,
+        KakaoProperties properties,
+        KakaoAccount kakaoAccount
+) {
+}

src/main/java/com/spot/spotserver/api/auth/dto/response/TokenResponse.java

@@ -0,0 +1,13 @@
+package com.spot.spotserver.api.auth.dto.response;
+
+public record TokenResponse(
+        String accessToken,
+        String refreshToken
+) {
+    public static TokenResponse of(
+            final String accessToken,
+            final String refreshToken
+    ) {
+        return new TokenResponse(accessToken, refreshToken);
+    }
+}

src/main/java/com/spot/spotserver/api/auth/exception/EmptyJwtTokenException.java

@@ -0,0 +1,10 @@
+package com.spot.spotserver.api.auth.exception;
+
+import com.spot.spotserver.common.advice.BaseException;
+import com.spot.spotserver.common.payload.ErrorCode;
+
+public class EmptyJwtTokenException extends BaseException {
+    public EmptyJwtTokenException(ErrorCode errorCode) {
+        super(errorCode);
+    }
+}

src/main/java/com/spot/spotserver/api/auth/exception/ExpiredJwtTokenException.java

@@ -0,0 +1,10 @@
+package com.spot.spotserver.api.auth.exception;
+
+import com.spot.spotserver.common.advice.BaseException;
+import com.spot.spotserver.common.payload.ErrorCode;
+
+public class ExpiredJwtTokenException extends BaseException {
+    public ExpiredJwtTokenException(ErrorCode errorCode) {
+        super(errorCode);
+    }
+}

src/main/java/com/spot/spotserver/api/auth/exception/InvalidJwtTokenException.java

@@ -0,0 +1,10 @@
+package com.spot.spotserver.api.auth.exception;
+
+import com.spot.spotserver.common.advice.BaseException;
+import com.spot.spotserver.common.payload.ErrorCode;
+
+public class InvalidJwtTokenException extends BaseException {
+    public InvalidJwtTokenException(ErrorCode errorCode) {
+        super(errorCode);
+    }
+}

src/main/java/com/spot/spotserver/api/auth/exception/JwtCustomException.java

@@ -0,0 +1,14 @@
+package com.spot.spotserver.api.auth.exception;
+
+import com.spot.spotserver.common.advice.BaseException;
+import com.spot.spotserver.common.payload.ErrorCode;
+
+public class JwtCustomException extends BaseException {
+    public JwtCustomException(ErrorCode errorCode, Throwable cause) {
+        super(errorCode, cause);
+    }
+
+    public JwtCustomException(ErrorCode errorCode) {
+        super(errorCode);
+    }
+}