deploy: Develop -> Master

.github/workflows/CD.yml

@@ -4,15 +4,19 @@ on:
   push:
     branches:
       - master
+      - develop
 
 permissions:
   contents: read
   actions: read
   id-token: write
 
 jobs:
-  deploy:
+  deploy_master:
     runs-on: ubuntu-latest
+    name: Deploy to Amazon ECS (master)
+
+    if: github.ref == 'refs/heads/master'
 
     steps:
       - name: Checkout code
@@ -43,7 +47,7 @@ jobs:
         env:
           PROFILE: dev
           IMAGE_REPO_URL: ${{ steps.login-ecr.outputs.registry }}/vacgom
-          IMAGE_TAG: ${{ github.sha }}
+          IMAGE_TAG: ${{ github.sha }}_master
         run: ./gradlew jib --parallel
       - name: Download Task Definition
         run: |
@@ -57,11 +61,87 @@ jobs:
         with:
           task-definition: task-definition.json
           container-name: backend
-          image: ${{ steps.login-ecr.outputs.registry }}/vacgom:${{ github.sha }}
+          image: ${{ steps.login-ecr.outputs.registry }}/vacgom:${{ github.sha }}_master
       - name: Deploy Amazon ECS task definition
         uses: aws-actions/amazon-ecs-deploy-task-definition@v1
         with:
           task-definition: ${{ steps.task-def.outputs.task-definition }}
           service: vacgom-best-service
           cluster: vacgom-cluster
           wait-for-service-stability: true
+      - name: Send Slack notification
+        uses: 8398a7/action-slack@v3
+        with:
+          status: ${{ job.status }}
+          author_name: 백곰
+          fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        if: always()
+
+  deploy_develop:
+    runs-on: ubuntu-latest
+    name: Deploy to Amazon ECS (develop)
+
+    if: github.ref == 'refs/heads/develop'
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.GIT_TOKEN }}
+          submodules: true
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+      - name: Update Git submodules
+        run: git submodule update --remote --recursive
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::125183404358:role/VacgomGithubActionAssumeRole
+          aws-region: ap-northeast-2
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+      - name: Invoke Gradle
+        uses: gradle/gradle-build-action@v2
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build, tag, and push image to Amazon ECR
+        env:
+          PROFILE: dev
+          IMAGE_REPO_URL: ${{ steps.login-ecr.outputs.registry }}/vacgom
+          IMAGE_TAG: ${{ github.sha }}_dev
+        run: ./gradlew jib --parallel
+      - name: Download Task Definition
+        run: |
+          aws ecs describe-task-definition \
+          --task-definition vacgom-taskdef-dev \
+          --query taskDefinition \
+          > task-definition.json
+      - name: Update Task Definition
+        id: task-def
+        uses: aws-actions/amazon-ecs-render-task-definition@v1
+        with:
+          task-definition: task-definition.json
+          container-name: backend
+          image: ${{ steps.login-ecr.outputs.registry }}/vacgom:${{ github.sha }}_dev
+      - name: Deploy Amazon ECS task definition
+        uses: aws-actions/amazon-ecs-deploy-task-definition@v1
+        with:
+          task-definition: ${{ steps.task-def.outputs.task-definition }}
+          service: vacgom-service-dev
+          cluster: vacgom-cluster
+          wait-for-service-stability: true
+      - name: Send Slack notification
+        uses: 8398a7/action-slack@v3
+        with:
+          status: ${{ job.status }}
+          author_name: 백곰
+          fields: repo,message,commit,author,action,eventName,ref,workflow,job,took
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        if: always()

build.gradle.kts

@@ -5,77 +5,82 @@ val imageTag = System.getenv("IMAGE_TAG") ?: "latest"
 val repoURL: String? = System.getenv("IMAGE_REPO_URL")
 
 plugins {
-	id("org.springframework.boot") version "3.2.3"
-	id("io.spring.dependency-management") version "1.1.4"
-	id("com.google.cloud.tools.jib") version "3.4.1"
-	kotlin("jvm") version "1.9.22"
-	kotlin("plugin.spring") version "1.9.22"
-	kotlin("plugin.jpa") version "1.9.22"
-	kotlin("plugin.allopen") version "1.9.22"
+    id("org.springframework.boot") version "3.2.3"
+    id("io.spring.dependency-management") version "1.1.4"
+    id("com.google.cloud.tools.jib") version "3.4.1"
+    kotlin("jvm") version "1.9.22"
+    kotlin("plugin.spring") version "1.9.22"
+    kotlin("plugin.jpa") version "1.9.22"
+    kotlin("plugin.allopen") version "1.9.22"
 }
 
 group = "com.vacgom"
 version = "0.0.1-SNAPSHOT"
 
 java {
-	sourceCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_17
 }
 
 repositories {
-	mavenCentral()
+    mavenCentral()
 }
 
 dependencies {
-	implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-	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-jpa")
+    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("com.fasterxml.jackson.module:jackson-module-kotlin")
-	implementation("org.flywaydb:flyway-core")
-	implementation("org.flywaydb:flyway-mysql")
-	implementation("org.jetbrains.kotlin:kotlin-reflect")
-	developmentOnly("org.springframework.boot:spring-boot-devtools")
-	runtimeOnly("com.mysql:mysql-connector-j")
-	testImplementation("org.springframework.boot:spring-boot-starter-test")
-	testImplementation("org.springframework.security:spring-security-test")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+    implementation("org.flywaydb:flyway-core")
+    implementation("org.flywaydb:flyway-mysql")
+    implementation("org.jetbrains.kotlin:kotlin-reflect")
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
+    runtimeOnly("com.mysql:mysql-connector-j")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework.security:spring-security-test")
+
+    implementation("io.jsonwebtoken:jjwt-api:0.11.5")
+    implementation("io.jsonwebtoken:jjwt-gson:0.11.5")
+    runtimeOnly("io.jsonwebtoken:jjwt-impl:0.11.5")
+    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 }
 
 tasks.withType<KotlinCompile> {
-	kotlinOptions {
-		freeCompilerArgs += "-Xjsr305=strict"
-		jvmTarget = "17"
-	}
+    kotlinOptions {
+        freeCompilerArgs += "-Xjsr305=strict"
+        jvmTarget = "17"
+    }
 }
 
 tasks.withType<Test> {
-	useJUnitPlatform()
+    useJUnitPlatform()
 }
 
 tasks.processResources {
-	dependsOn("initConfig")
+    dependsOn("initConfig")
 }
 
 tasks.register<Copy>("initConfig") {
-	from("./CONFIG")
-	include("*.yml")
-	into("./src/main/resources")
+    from("./CONFIG")
+    include("*.yml")
+    into("./src/main/resources")
 }
 
 jib {
-	from {
-		image = "amazoncorretto:17-alpine3.18"
-	}
-	to {
-		image = repoURL
-		tags = setOf(imageTag)
-	}
-	container {
-		jvmFlags = listOf(
-			"-Dspring.profiles.active=${activeProfile}",
-			"-Dserver.port=8080",
-			"-XX:+UseContainerSupport",
-		)
-		ports = listOf("8080")
-	}
+    from {
+        image = "amazoncorretto:17-alpine3.18"
+    }
+    to {
+        image = repoURL
+        tags = setOf(imageTag)
+    }
+    container {
+        jvmFlags = listOf(
+                "-Dspring.profiles.active=${activeProfile}",
+                "-Dserver.port=8080",
+                "-XX:+UseContainerSupport",
+        )
+        ports = listOf("8080")
+    }
 }

src/main/kotlin/com/vacgom/backend/application/auth/AuthFactory.kt

@@ -0,0 +1,30 @@
+package com.vacgom.backend.application.auth
+
+import com.vacgom.backend.domain.auth.oauth.OauthConnector
+import com.vacgom.backend.domain.auth.oauth.OauthUriGenerator
+import com.vacgom.backend.domain.auth.oauth.constants.ProviderType
+import com.vacgom.backend.global.exception.error.BusinessException
+import com.vacgom.backend.global.security.exception.AuthError
+import org.springframework.stereotype.Component
+
+@Component
+class AuthFactory(
+        private val connectors: List<OauthConnector>,
+        private val uriProviders: List<OauthUriGenerator>
+) {
+    fun getAuthConnector(provider: String): OauthConnector {
+        val providerType = ProviderType.from(provider)
+
+        return connectors.firstOrNull {
+            it.isSupported(providerType)
+        } ?: throw BusinessException(AuthError.UNSUPPORTED_PROVIDER)
+    }
+
+    fun getAuthUriGenerator(provider: String): OauthUriGenerator {
+        val providerType = ProviderType.from(provider)
+
+        return uriProviders.firstOrNull {
+            it.isSupported(providerType)
+        } ?: throw BusinessException(AuthError.UNSUPPORTED_PROVIDER)
+    }
+}

src/main/kotlin/com/vacgom/backend/application/auth/AuthService.kt

@@ -0,0 +1,55 @@
+package com.vacgom.backend.application.auth
+
+import com.vacgom.backend.application.auth.dto.response.AuthResponse
+import com.vacgom.backend.application.auth.dto.response.MemberResponse
+import com.vacgom.backend.application.auth.dto.response.TokenResponse
+import com.vacgom.backend.domain.auth.constants.Role.ROLE_TEMP_USER
+import com.vacgom.backend.domain.auth.oauth.constants.ProviderType
+import com.vacgom.backend.domain.member.Member
+import com.vacgom.backend.global.security.jwt.JwtFactory
+import com.vacgom.backend.infrastructure.member.persistence.MemberRepository
+import jakarta.transaction.Transactional
+import org.springframework.http.HttpHeaders
+import org.springframework.stereotype.Component
+import java.net.URI
+
+@Component
+@Transactional
+class AuthService(
+        private val authFactory: AuthFactory,
+        private val jwtFactory: JwtFactory,
+        private val memberRepository: MemberRepository
+) {
+    fun createRedirectHeaders(redirectUri: URI): HttpHeaders {
+        val headers = HttpHeaders()
+        headers.location = redirectUri
+        return headers
+    }
+
+    fun getAuthorizationUri(provider: String): URI {
+        return authFactory.getAuthUriGenerator(provider).generate()
+    }
+
+    fun login(
+            providerType: String,
+            code: String
+    ): AuthResponse {
+        val authConnector = authFactory.getAuthConnector(providerType)
+        val oauthToken = authConnector.fetchOauthToken(code)
+        val memberInfo = authConnector.fetchMemberInfo(oauthToken.accessToken)
+        val member = findOrCreateMember(memberInfo.id, ProviderType.from(providerType))
+
+        val memberResponse = MemberResponse(member.id!!, member.role)
+        val tokenResponse = TokenResponse(jwtFactory.createAccessToken(member))
+
+        return AuthResponse(memberResponse, tokenResponse)
+    }
+
+    private fun findOrCreateMember(
+            kakaoProviderId: Long,
+            providerType: ProviderType
+    ): Member {
+        return memberRepository.findByProviderIdAndProviderType(kakaoProviderId, providerType)
+                ?: memberRepository.save(Member(kakaoProviderId, providerType, ROLE_TEMP_USER))
+    }
+}