[Region] 지역 API 작업 완료

.github/workflows/ci-develop.yml

@@ -1,39 +1,50 @@
 name: Build and Deploy to EC2
-
 on:
   push:
     branches: [ "develop" ]
   pull_request:
     branches: [ "develop" ]
-
   workflow_dispatch:
-
 env:
   BUCKET_NAME: team09-cicd-bucket
   PROJECT_NAME: studay
   DEPLOYMENT_GROUP_NAME: studay_cicd
   CODE_DEPLOY_APP_NAME: studay_cicd
-
 jobs:
   # 작업의 이름
   build_and_test:
     # GitHub Actions 러너의 운영 체제
     runs-on: ubuntu-latest
-
+    services:
+      mysql:
+        image: mysql:8.0.21
+        env:
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: test
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=10
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+        options: --entrypoint redis-server
     # 순차적으로 실행될 단계들을 정의하는 섹션
     steps:
       - name: Checkout code
         uses: actions/[email protected]
-
       - name: Set up JDK 17
         uses: actions/[email protected]
         with:
           java-version: '17'
           distribution: 'corretto'
-
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew
-
+      - name: Create application.yml
+        run: |
+          mkdir -p src/main/resources
+          echo "${{ secrets.APPLICATION_YML_CONTENT }}" > src/main/resources/application.yml
+          echo "${{ secrets.APPLICATION_DEV_YML_CONTENT }}" > src/main/resources/application-dev.yml
+          echo "${{ secrets.APPLICATION_OAUTH_YML_CONTENT }}" > src/main/resources/application-oauth.yml
       - name: Build with gradle
-        run: ./gradlew build
-
+        run: ./gradlew build

.github/workflows/cicd.yml

@@ -44,16 +44,16 @@ jobs:
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
         with:
-         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-         aws-secret-access-key: ${{ secrets.AWS_PRIVATE_ACCESS_KEY }}
-         aws-region: ap-northeast-1
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_PRIVATE_ACCESS_KEY }}
+          aws-region: ap-northeast-1
 
       - name: Upload to S3
         run: aws s3 cp --region ap-northeast-1 ./$GITHUB_SHA.zip s3://$BUCKET_NAME/$PROJECT_NAME/$GITHUB_SHA.zip
 
       - name: Code Deploy To EC2 instance
         run: aws deploy create-deployment
-         --application-name $CODE_DEPLOY_APP_NAME
-         --deployment-config-name CodeDeployDefault.AllAtOnce
-         --deployment-group-name $DEPLOYMENT_GROUP_NAME
-         --s3-location bucket=$BUCKET_NAME,bundleType=zip,key=$PROJECT_NAME/$GITHUB_SHA.zip
+          --application-name $CODE_DEPLOY_APP_NAME
+          --deployment-config-name CodeDeployDefault.AllAtOnce
+          --deployment-group-name $DEPLOYMENT_GROUP_NAME
+          --s3-location bucket=$BUCKET_NAME,bundleType=zip,key=$PROJECT_NAME/$GITHUB_SHA.zip

.gitignore

@@ -7,7 +7,7 @@ HELP.md
 .gradle/
 build/
 studay_server.iml
-src/main/resources/application.yaml
+*.yaml
 
 ### Intellij+all ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider

src/main/java/org/guzzing/studayserver/domain/auth/client/ClientGoogle.java

@@ -1,11 +1,11 @@
 package org.guzzing.studayserver.domain.auth.client;
 
-import org.guzzing.studayserver.global.error.response.ErrorCode;
 import org.guzzing.studayserver.domain.auth.dto.GoogleUserResponse;
 import org.guzzing.studayserver.domain.auth.exception.TokenValidFailedException;
 import org.guzzing.studayserver.domain.member.model.Member;
 import org.guzzing.studayserver.domain.member.model.vo.MemberProvider;
 import org.guzzing.studayserver.domain.member.model.vo.RoleType;
+import org.guzzing.studayserver.global.error.response.ErrorCode;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
@@ -26,8 +26,10 @@ public Member getUserData(String accessToken) {
                 .uri("https://www.googleapis.com/oauth2/v3/userinfo")
                 .headers(h -> h.set("Authorization", accessToken))
                 .retrieve()
-                .onStatus(status -> status.is4xxClientError(), response -> Mono.error(new TokenValidFailedException(ErrorCode.UNAUTHORIZED_TOKEN)))
-                .onStatus(status -> status.is5xxServerError(), response -> Mono.error(new TokenValidFailedException(ErrorCode.OAUTH_CLIENT_SERVER_ERROR)))
+                .onStatus(status -> status.is4xxClientError(),
+                        response -> Mono.error(new TokenValidFailedException(ErrorCode.UNAUTHORIZED_TOKEN)))
+                .onStatus(status -> status.is5xxServerError(),
+                        response -> Mono.error(new TokenValidFailedException(ErrorCode.OAUTH_CLIENT_SERVER_ERROR)))
                 .bodyToMono(GoogleUserResponse.class)
                 .block();
 

src/main/java/org/guzzing/studayserver/domain/auth/client/ClientKakao.java

@@ -1,11 +1,11 @@
 package org.guzzing.studayserver.domain.auth.client;
 
-import org.guzzing.studayserver.global.error.response.ErrorCode;
 import org.guzzing.studayserver.domain.auth.dto.KakaoUserResponse;
 import org.guzzing.studayserver.domain.auth.exception.TokenValidFailedException;
 import org.guzzing.studayserver.domain.member.model.Member;
 import org.guzzing.studayserver.domain.member.model.vo.MemberProvider;
 import org.guzzing.studayserver.domain.member.model.vo.RoleType;
+import org.guzzing.studayserver.global.error.response.ErrorCode;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
@@ -26,8 +26,10 @@ public Member getUserData(String accessToken) {
                 .uri("https://kapi.kakao.com/v2/user/me")
                 .headers(h -> h.set("Authorization", accessToken))
                 .retrieve()
-                .onStatus(status -> status.is4xxClientError(), response -> Mono.error(new TokenValidFailedException(ErrorCode.UNAUTHORIZED_TOKEN)))
-                .onStatus(status -> status.is5xxServerError(), response -> Mono.error(new TokenValidFailedException(ErrorCode.OAUTH_CLIENT_SERVER_ERROR)))
+                .onStatus(status -> status.is4xxClientError(),
+                        response -> Mono.error(new TokenValidFailedException(ErrorCode.UNAUTHORIZED_TOKEN)))
+                .onStatus(status -> status.is5xxServerError(),
+                        response -> Mono.error(new TokenValidFailedException(ErrorCode.OAUTH_CLIENT_SERVER_ERROR)))
                 .bodyToMono(KakaoUserResponse.class)
                 .block();
 

src/main/java/org/guzzing/studayserver/domain/auth/client/ClientStrategy.java

@@ -1,12 +1,11 @@
 package org.guzzing.studayserver.domain.auth.client;
 
+import java.util.HashMap;
+import java.util.Map;
 import org.guzzing.studayserver.domain.member.model.vo.MemberProvider;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.function.client.WebClient;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @Component
 public class ClientStrategy {
 

src/main/java/org/guzzing/studayserver/domain/auth/config/Constants.java

@@ -5,9 +5,10 @@ public class Constants {
 
     /**
      * 권한제외 대상
+     *
      * @see SecurityConfig
      */
-    public static final String[] permitAllArray = new String[] {
+    public static final String[] permitAllArray = new String[]{
             "/",
             "/auth/**",
 

src/main/java/org/guzzing/studayserver/domain/auth/config/SecurityConfig.java

@@ -1,18 +1,18 @@
 package org.guzzing.studayserver.domain.auth.config;
 
+import java.util.stream.Stream;
 import org.guzzing.studayserver.domain.auth.jwt.AuthTokenProvider;
 import org.guzzing.studayserver.domain.auth.jwt.JwtAuthenticationFilter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.annotation.web.configurers.HttpBasicConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
-import org.springframework.security.config.annotation.web.configurers.HttpBasicConfigurer;
-import java.util.stream.Stream;
 
 @Configuration
 @EnableWebSecurity

src/main/java/org/guzzing/studayserver/domain/auth/config/WebClientConfig.java

@@ -2,6 +2,7 @@
 
 import io.netty.channel.ChannelOption;
 import io.netty.handler.timeout.ReadTimeoutHandler;
+import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,8 +15,6 @@
 import reactor.netty.http.client.HttpClient;
 import reactor.netty.tcp.TcpClient;
 
-import java.util.concurrent.TimeUnit;
-
 @Configuration
 @Slf4j
 public class WebClientConfig {
@@ -24,12 +23,12 @@ public class WebClientConfig {
     public WebClient webClient() {
 
         ExchangeStrategies exchangeStrategies = ExchangeStrategies.builder()
-                .codecs(configurer -> configurer.defaultCodecs().maxInMemorySize(1024*1024*50))
+                .codecs(configurer -> configurer.defaultCodecs().maxInMemorySize(1024 * 1024 * 50))
                 .build();
         exchangeStrategies
                 .messageWriters().stream()
                 .filter(LoggingCodecSupport.class::isInstance)
-                .forEach(writer -> ((LoggingCodecSupport)writer).setEnableLoggingRequestDetails(true));
+                .forEach(writer -> ((LoggingCodecSupport) writer).setEnableLoggingRequestDetails(true));
 
         return WebClient.builder()
                 .clientConnector(
@@ -38,24 +37,28 @@ public WebClient webClient() {
                                         TcpClient
                                                 .create()
                                                 .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 3000)
-                                                .doOnConnected(conn -> conn.addHandler(new ReadTimeoutHandler(3000, TimeUnit.MILLISECONDS)))
+                                                .doOnConnected(conn -> conn.addHandler(
+                                                        new ReadTimeoutHandler(3000, TimeUnit.MILLISECONDS)))
                                 )
                         ))
                 .exchangeStrategies(exchangeStrategies)
                 .filter(ExchangeFilterFunction.ofRequestProcessor(
                         clientRequest -> {
                             log.debug("Request: {} {}", clientRequest.method(), clientRequest.url());
-                            clientRequest.headers().forEach((name, values) -> values.forEach(value -> log.debug("{} : {}", name, value)));
+                            clientRequest.headers().forEach(
+                                    (name, values) -> values.forEach(value -> log.debug("{} : {}", name, value)));
                             return Mono.just(clientRequest);
                         }
                 ))
                 .filter(ExchangeFilterFunction.ofResponseProcessor(
                         clientResponse -> {
-                            clientResponse.headers().asHttpHeaders().forEach((name, values) -> values.forEach(value -> log.debug("{} : {}", name, value)));
+                            clientResponse.headers().asHttpHeaders().forEach(
+                                    (name, values) -> values.forEach(value -> log.debug("{} : {}", name, value)));
                             return Mono.just(clientResponse);
                         }
                 ))
-                .defaultHeader("user-agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.87 Safari/537.3")
+                .defaultHeader("user-agent",
+                        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.87 Safari/537.3")
                 .build();
     }
 

src/main/java/org/guzzing/studayserver/domain/auth/controller/AuthController.java

@@ -48,7 +48,7 @@ public ResponseEntity<AuthResponse> googleAuthRequest(HttpServletRequest request
     }
 
     @GetMapping("/refresh")
-    public ResponseEntity<AuthResponse> refreshToken( HttpServletRequest request) {
+    public ResponseEntity<AuthResponse> refreshToken(HttpServletRequest request) {
 
         String appToken = JwtHeaderUtil.getAccessToken(request);
         AuthToken authToken = authTokenProvider.convertAuthToken(appToken);

src/main/java/org/guzzing/studayserver/domain/auth/dto/KakaoUserResponse.java

@@ -25,6 +25,7 @@ public KakaoUserResponse(Long id, Properties properties, KakaoAccount kakaoAccou
     @NoArgsConstructor
     @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
     public static class Properties {
+
         private NickName nickname;
 
         public Properties(NickName nickname) {
@@ -36,6 +37,7 @@ public Properties(NickName nickname) {
     @Getter
     @NoArgsConstructor
     public static class KakaoAccount {
+
         private String email;
 
         public KakaoAccount(String email) {

src/main/java/org/guzzing/studayserver/domain/auth/exception/TokenValidFailedException.java

@@ -1,7 +1,7 @@
 package org.guzzing.studayserver.domain.auth.exception;
 
-import org.guzzing.studayserver.global.error.response.ErrorCode;
 import lombok.Getter;
+import org.guzzing.studayserver.global.error.response.ErrorCode;
 
 @Getter
 public class TokenValidFailedException extends IllegalStateException {

src/main/java/org/guzzing/studayserver/domain/auth/jwt/AuthToken.java

@@ -1,13 +1,18 @@
 package org.guzzing.studayserver.domain.auth.jwt;
 
-import io.jsonwebtoken.*;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
-
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.JwtParser;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.MalformedJwtException;
+import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.UnsupportedJwtException;
 import java.security.Key;
 import java.util.Date;
 import java.util.Optional;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class AuthToken {
@@ -61,7 +66,7 @@ public String createRefreshToken(Date expiry) {
     public boolean isValidTokenClaims() {
         Optional<Object> claims = Optional.empty();
         try {
-            claims= Optional.ofNullable(getTokenClaims());
+            claims = Optional.ofNullable(getTokenClaims());
         } catch (SecurityException e) {
             log.info("Invalid JWT signature.");
         } catch (MalformedJwtException e) {

src/main/java/org/guzzing/studayserver/domain/auth/jwt/AuthTokenProvider.java

@@ -2,6 +2,11 @@
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.security.Keys;
+import java.security.Key;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -10,12 +15,6 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 
-import java.security.Key;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Slf4j
 @Component
 public class AuthTokenProvider {

src/main/java/org/guzzing/studayserver/domain/auth/jwt/CustomUser.java

@@ -1,14 +1,13 @@
 package org.guzzing.studayserver.domain.auth.jwt;
 
-import lombok.Builder;
-import lombok.Getter;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
 import java.io.Serial;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import lombok.Builder;
+import lombok.Getter;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
 
 @Getter
 public class CustomUser implements UserDetails {
@@ -29,8 +28,12 @@ public CustomUser(Long memberId, String socialId, List<? extends GrantedAuthorit
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == this) return true;
-        if (obj == null || obj.getClass() != this.getClass()) return false;
+        if (obj == this) {
+            return true;
+        }
+        if (obj == null || obj.getClass() != this.getClass()) {
+            return false;
+        }
         var that = (CustomUser) obj;
         return Objects.equals(this.memberId, that.memberId) &&
                 Objects.equals(this.socialId, that.socialId) &&