build: Android CI&CD 수정

.github/workflows/android-cd.yml

@@ -71,16 +71,18 @@ jobs:
         run: ./gradlew bundleRelease
 
       - name: Upload Release APK in artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: app-release.apk
           path: android/Staccato_AN/app/build/outputs/apk/release/app-release.apk
+          overwrite: 'true'
 
       - name: Upload Release AAB in artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: app-release.aab
           path: android/Staccato_AN/app/build/outputs/bundle/release/app-release.aab
+          overwrite: 'true'
 
       - name: Deploy AAB On Google Play Console
         uses: r0adkll/upload-google-play@v1

.github/workflows/android-ci-cd-dev.yml

@@ -73,10 +73,11 @@ jobs:
         run: ./gradlew assembleRelease
 
       - name: Upload Release APK
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: app-release.apk
           path: android/Staccato_AN/app/build/outputs/apk/release/app-release.apk
+          overwrite: 'true'
 
       - name: Upload Artifact to Firebase App Distribution
         uses: wzieba/Firebase-Distribution-Github-Action@v1

.github/workflows/backend-ci-cd-dev.yml

@@ -1,9 +1,7 @@
 name: Backend CI/CD dev
 
 on:
-  push:
-    paths: [ 'backend/**', '.github/**' ]
-    branches: [ "develop-be", "develop" ]
+  workflow_dispatch:
 
 jobs:
   ci:

.github/workflows/backend-ci-cd-multi-dev.yml

@@ -0,0 +1,82 @@
+name: Backend CI/CD multi dev
+
+on:
+  push:
+    paths: [ 'backend/**', '.github/**' ]
+    branches: [ "develop" ]
+
+jobs:
+  ci:
+    runs-on: [ self-hosted, dev ]
+
+    defaults:
+      run:
+        shell: bash
+        working-directory: ./backend
+
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Cache Gradle packages
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            gradle-${{ runner.os }}-
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Setup with Gradle
+        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+
+      - name: Build with Gradle
+        run: ./gradlew clean build
+
+      - name: Login to Docker Hub
+        uses: docker/[email protected]
+        with:
+          username: ${{ secrets.DOCKERHUB_DEPLOY_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_DEPLOY_TOKEN }}
+
+      - name: Docker Image Build
+        run: |
+          sudo docker build --platform linux/arm64 -t staccato/staccato:dev -f Dockerfile.dev .
+
+      - name: Docker Hub Push
+        run: |
+          sudo docker login --username ${{ secrets.DOCKERHUB_DEPLOY_USERNAME }} --password ${{ secrets.DOCKERHUB_DEPLOY_TOKEN }}
+          sudo docker push staccato/staccato:dev
+
+  cd:
+    needs: ci
+    runs-on: [ self-hosted, dev ]
+
+    steps:
+      - name: Run deploy script
+        id: run_deploy
+        run: bash /home/ubuntu/staccato/deploy.sh
+        # 스크립트가 exit 1이면 여기서 스텝 실패
+
+      - name: Check result # 여기서 롤백전략
+        if: steps.run_deploy.conclusion == 'failure'
+        run: bash /home/ubuntu/staccato/rollback.sh
+
+  port_switch:
+    needs: cd
+    runs-on: [ self-hosted, dev ]
+    if: ${{ success() }} # cd job의 matrix 모두 성공해야 success -> 현재는 matrix 지정은 하지 않은 상태
+    steps:
+      - name: Switch Nginx Ports
+        run: bash /home/ubuntu/staccato/switch.sh

.github/workflows/backend-ci-cd-prod.yml

@@ -63,10 +63,6 @@ jobs:
     needs: ci
     runs-on: [ self-hosted, prod ]
 
-    strategy:
-      matrix:
-        runner: [ prod-a, prod-b ]
-
     steps:
       - name: execute deploy.sh
         run: bash /home/ubuntu/staccato/deploy.sh

android/Staccato_AN/app/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import java.io.FileInputStream
 import java.util.Properties
 
@@ -20,6 +21,7 @@ plugins {
     alias(libs.plugins.firebaseCrashlytics)
     alias(libs.plugins.mapsplatformSecretsGradlePlugin)
     alias(libs.plugins.hiltAndroid)
+    alias(libs.plugins.androidJunit5)
 }
 
 android {
@@ -30,10 +32,12 @@ android {
         applicationId = "com.on.staccato"
         minSdk = 26
         targetSdk = 34
-        versionCode = 7
-        versionName = "1.2.1"
+        versionCode = 8
+        versionName = "1.3.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments["runnerBuilder"] =
+            "de.mannodermaus.junit5.AndroidJUnit5Builder"
 
         buildConfigField("String", "TOKEN", "${localProperties["token"]}")
     }
@@ -98,9 +102,17 @@ dependencies {
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
     testImplementation(libs.junit)
+    testImplementation(libs.androidx.arch.core)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
 
+    // JUnit5
+    testImplementation(libs.junit.jupiter)
+    testRuntimeOnly(libs.junit.vintage.engine)
+
+    // AssertJ
+    testImplementation(libs.assertj.core)
+
     // Glide
     implementation(libs.glide)
 
@@ -117,6 +129,7 @@ dependencies {
 
     // OkHttp
     implementation(libs.okhttp.logging.interceptor)
+    testImplementation(libs.okhttp.mockwebserver)
 
     // Lifecycle
     implementation(libs.lifecycle.viewmodel)
@@ -139,9 +152,15 @@ dependencies {
     // Fragment
     implementation(libs.androidx.fragment.ktx)
 
+    // Coroutines Test
+    testImplementation(libs.kotlinx.coroutines.test)
+
     // Mockk
-    testImplementation(libs.mockk.android)
+    testImplementation(libs.junitparams)
+    testImplementation(libs.mockk)
     testImplementation(libs.mockk.agent)
+    androidTestImplementation(libs.mockk.agent)
+    androidTestImplementation(libs.mockk.android)
 
     // Navigation
     implementation(libs.androidx.navigation.fragment.ktx)
@@ -181,3 +200,10 @@ secrets {
     ignoreList.add("keyToIgnore")
     ignoreList.add("sdk.*")
 }
+
+tasks.withType<Test> {
+    testLogging {
+        events("started", "passed", "skipped", "failed", "standardError", "standardOut")
+        exceptionFormat = TestExceptionFormat.FULL
+    }
+}

android/Staccato_AN/app/src/main/AndroidManifest.xml

@@ -75,7 +75,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name=".presentation.memoryupdate.MemoryUpdateActivity"
+            android:name=".presentation.categoryupdate.CategoryUpdateActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 
@@ -85,7 +85,7 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name=".presentation.memorycreation.MemoryCreationActivity"
+            android:name=".presentation.categorycreation.CategoryCreationActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
 

android/Staccato_AN/app/src/main/java/com/on/staccato/StaccatoApplication.kt

@@ -3,19 +3,22 @@ package com.on.staccato
 import android.app.Application
 import com.google.android.libraries.places.api.net.PlacesClient
 import com.on.staccato.data.PlacesClientProvider
+import com.on.staccato.data.StaccatoClient
 import com.on.staccato.data.UserInfoPreferencesManager
 import dagger.hilt.android.HiltAndroidApp
+import retrofit2.Retrofit
 
 @HiltAndroidApp
 class StaccatoApplication : Application() {
     override fun onCreate() {
         super.onCreate()
-        // AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+        retrofit = StaccatoClient.initialize()
         userInfoPrefsManager = UserInfoPreferencesManager(applicationContext)
         placesClient = PlacesClientProvider.getClient(this)
     }
 
     companion object {
+        lateinit var retrofit: Retrofit
         lateinit var userInfoPrefsManager: UserInfoPreferencesManager
         lateinit var placesClient: PlacesClient
     }

android/Staccato_AN/app/src/main/java/com/on/staccato/data/ApiResult.kt

@@ -0,0 +1,31 @@
+package com.on.staccato.data
+
+import com.on.staccato.data.dto.Status
+
+sealed interface ApiResult<T>
+
+class Success<T>(val data: T) : ApiResult<T>
+
+class ServerError<T>(val status: Status, val message: String) : ApiResult<T>
+
+sealed class Exception<T> : ApiResult<T> {
+    class NetworkError<T> : Exception<T>()
+
+    class UnknownError<T> : Exception<T>()
+}
+
+inline fun <T, R> ApiResult<T>.handle(convert: (T) -> R): ApiResult<R> =
+    when (this) {
+        is Exception.NetworkError -> Exception.NetworkError()
+        is Exception.UnknownError -> Exception.UnknownError()
+        is ServerError -> ServerError(status, message)
+        is Success -> Success(convert(data))
+    }
+
+fun ApiResult<Unit>.handle(): ApiResult<Unit> =
+    when (this) {
+        is Exception.NetworkError -> Exception.NetworkError()
+        is Exception.UnknownError -> Exception.UnknownError()
+        is ServerError -> ServerError(status, message)
+        is Success -> Success(data)
+    }