Merge pull request #512 from BCSDLab/releases/v.4.1.6

Update v.4.1.6
BCSDLab · Dec 19, 2024 · da31859 · da31859
2 parents 5a9f8f9 + fd4b1e1
commit da31859
Show file tree

Hide file tree

Showing 35 changed files with 179 additions and 195 deletions.
diff --git a/.github/workflows/weekly_cd.yml b/.github/workflows/weekly_cd.yml
@@ -12,11 +12,11 @@ jobs:
        with:
         ref: 'develop'
 
-     - name: set up JDK 11
+     - name: set up JDK 17
        uses: actions/setup-java@v4
        with:
           distribution: 'zulu'
-          java-version: '11'
+          java-version: '17'
 
      - name: Make gradlew executable
        run: chmod +x ./gradlew

diff --git a/build-logic/convention/src/main/java/AndroidApplicationComposeConventionPlugin.kt b/build-logic/convention/src/main/java/AndroidApplicationComposeConventionPlugin.kt
@@ -10,8 +10,8 @@ internal class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
             with(pluginManager) {
                 apply("com.android.application")
                 apply("org.jetbrains.kotlin.android")
-                apply("kotlin-kapt")
                 apply("kotlin-parcelize")
+                apply("com.google.devtools.ksp")
             }
             extensions.configure<ApplicationExtension> {
                 configureAndroidCompose(this)

diff --git a/build-logic/convention/src/main/java/AndroidApplicationHiltConventionPlugin.kt b/build-logic/convention/src/main/java/AndroidApplicationHiltConventionPlugin.kt
@@ -1,5 +1,5 @@
 import `in`.koreatech.convention.implementation
-import `in`.koreatech.convention.kapt
+import `in`.koreatech.convention.ksp
 import `in`.koreatech.convention.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -13,7 +13,7 @@ internal class AndroidApplicationHiltConventionPlugin : Plugin<Project> {
             }
             dependencies {
                 implementation(libs.findBundle("hilt").get())
-                kapt(libs.findLibrary("hilt-compiler").get())
+                ksp(libs.findLibrary("hilt-compiler").get())
             }
         }
     }

diff --git a/build-logic/convention/src/main/java/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/java/AndroidLibraryConventionPlugin.kt
@@ -12,8 +12,8 @@ internal class AndroidLibraryConventionPlugin : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.library")
-                apply("org.jetbrains.kotlin.kapt")
                 apply("org.jetbrains.kotlin.android")
+                apply("com.google.devtools.ksp")
             }
             extensions.configure<LibraryExtension> {
                 configureAndroidLibrary(this)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,8 +7,8 @@ buildscript {
     }
 
     extra.apply {
-        set("versionName", "4.1.5")
-        set("versionCode", 40105)
+        set("versionName", "4.1.6")
+        set("versionCode", 40106)
         // 코인 버전 관리
 
         set("versionBusinessName", "1.0.1")
@@ -34,6 +34,7 @@ plugins {
     alias(libs.plugins.kotlinx.serialization) apply false
     alias(libs.plugins.google.service) apply false
     alias(libs.plugins.androidLibrary) apply false
+    alias(libs.plugins.ksp) apply false
 }
 
 tasks.register<Delete>("clean") {

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -61,12 +61,8 @@ dependencies {
     debugImplementation(libs.leakcanary.android)
 
     /* Dependency - glide */
-    api(libs.glide)
-    kapt(libs.glide.compiler)
-
-    /* Dependency - butterknife */
-    api(libs.butterknife)
-    kapt(libs.butterknife.compiler)
+    implementation(libs.glide)
+    ksp(libs.glide.ksp)
 
     /* Dependency - sticky scroll view */
     api(libs.stickyScrollView)

diff --git a/core/onboarding/build.gradle.kts b/core/onboarding/build.gradle.kts
@@ -6,9 +6,7 @@ plugins {
 android {
     namespace = "in.koreatech.koin.core.onboarding"
 }
-kapt {
-    correctErrorTypes = true
-}
+
 dependencies {
     implementation(project(":domain"))
 

diff --git a/core/src/main/java/in/koreatech/koin/core/analytics/EventLogger.kt b/core/src/main/java/in/koreatech/koin/core/analytics/EventLogger.kt
@@ -59,6 +59,16 @@ object EventLogger {
         logEvent(action, EventCategory.NOTIFICATION, label, value, *extras)
     }
 
+    /**
+     * AB테스트 이벤트 로깅
+     * @param category: 이벤트 종류
+     * @param label: 이벤트 소분류
+     * @param value: 이벤트 값
+     */
+    fun logABTestEvent(category: String, label: String, value: String) {
+        logCustomEvent(EventAction.ABTEST.value, category, label, value)
+    }
+
     /**
      * @param action: 커스텀 이벤트 발생(EventAction 이외에 action)
      * @param category: 커스텀 이벤트 종류(EventCategory 이외에 category)
@@ -118,6 +128,7 @@ enum class EventAction(val value: String) {
     BUSINESS("BUSINESS"),
     CAMPUS("CAMPUS"),
     USER("USER"),
+    ABTEST("AB_TEST"),
 }
 
 enum class EventCategory(val value: String) {

diff --git a/core/src/main/java/in/koreatech/koin/core/constant/AnalyticsConstant.kt b/core/src/main/java/in/koreatech/koin/core/constant/AnalyticsConstant.kt
@@ -99,11 +99,12 @@ object AnalyticsConstant {
 
         const val CAMPUS_DINING_1 = "CAMPUS_dining_1"
         const val CAMPUS_NOTICE_1 = "CAMPUS_notice_1"
+        const val APP_MAIN_NOTICE_DETAIL = "app_main_notice_detail"
         const val POPULAR_NOTICE_BANNER = "popular_notice_banner"
         const val TO_MANAGE_KEYWORD = "to_manage_keyword"
 
-        const val BUSINESS_CALL_NUMBER = " BUSINESS_call_1"
-        const val BUSINESS_CALL_FLOATING = "BUSINESS_call_1"
+        const val BUSINESS_BENEFIT_1 = "BUSINESS_benefit_1"
+        const val BUSINESS_CALL_1 = "BUSINESS_call_1"
     }
 
     const val PREVIOUS_PAGE = "previous_page"

diff --git a/core/src/main/java/in/koreatech/koin/core/dialog/ImageZoomableDialog.kt b/core/src/main/java/in/koreatech/koin/core/dialog/ImageZoomableDialog.kt
@@ -86,15 +86,15 @@ class ImageZoomableDialog(private val context: Context, private val image: Strin
                 override fun onLoadFailed(
                     e: GlideException?,
                     model: Any?,
-                    target: Target<Drawable>?,
+                    target: Target<Drawable>,
                     isFirstResource: Boolean
                 ): Boolean = false
 
                 override fun onResourceReady(
-                    resource: Drawable?,
-                    model: Any?,
-                    target: Target<Drawable>?,
-                    dataSource: DataSource?,
+                    resource: Drawable,
+                    model: Any,
+                    target: Target<Drawable>,
+                    dataSource: DataSource,
                     isFirstResource: Boolean
                 ): Boolean {
                     binding.photoView.post {

diff --git a/data/src/main/java/in/koreatech/koin/data/api/auth/UserAuthApi.kt b/data/src/main/java/in/koreatech/koin/data/api/auth/UserAuthApi.kt
@@ -10,6 +10,7 @@ import `in`.koreatech.koin.data.request.user.UserRequest
 import `in`.koreatech.koin.data.response.notification.NotificationPermissionInfoResponse
 import `in`.koreatech.koin.data.response.store.StoreReviewResponse
 import `in`.koreatech.koin.data.response.user.ABTestResponse
+import `in`.koreatech.koin.data.response.user.ABTestTokenResponse
 import `in`.koreatech.koin.data.response.user.UserInfoEditResponse
 import `in`.koreatech.koin.data.response.user.UserResponse
 import retrofit2.Response
@@ -90,6 +91,9 @@ interface UserAuthApi {
     @GET(URLConstant.OWNER.OWNER)
     suspend fun getOwnerTokenIsValid()
 
+    @POST("abtest/assign/token")
+    suspend fun updateABTestToken(): ABTestTokenResponse
+
     @POST("abtest/assign")
     suspend fun postABTestAssign(@Body abTestRequest: ABTestRequest): ABTestResponse
 

diff --git a/data/src/main/java/in/koreatech/koin/data/repository/UserRepositoryImpl.kt b/data/src/main/java/in/koreatech/koin/data/repository/UserRepositoryImpl.kt
@@ -120,6 +120,12 @@ class UserRepositoryImpl @Inject constructor(
         userRemoteDataSource.verifyPassword(PasswordRequest(hashedPassword))
     }
 
+    override suspend fun updateABTestToken() {
+        userRemoteDataSource.updateABTestToken().accessHistoryId.also {
+            tokenLocalDataSource.saveAccessHistoryId(it)
+        }
+    }
+
     override suspend fun postABTestAssign(title: String): ABTest {
         userRemoteDataSource.postABTestAssign(ABTestRequest(title)).let {
             return ABTest(it.variableName, it.accessHistoryId)

diff --git a/data/src/main/java/in/koreatech/koin/data/response/user/ABTestTokenResponse.kt b/data/src/main/java/in/koreatech/koin/data/response/user/ABTestTokenResponse.kt
@@ -0,0 +1,7 @@
+package `in`.koreatech.koin.data.response.user
+
+import com.google.gson.annotations.SerializedName
+
+data class ABTestTokenResponse(
+    @SerializedName("accessHistoryId") val accessHistoryId: String
+)
diff --git a/data/src/main/java/in/koreatech/koin/data/source/remote/UserRemoteDataSource.kt b/data/src/main/java/in/koreatech/koin/data/source/remote/UserRemoteDataSource.kt
@@ -76,6 +76,11 @@ class UserRemoteDataSource(
     suspend fun verifyPassword(passwordRequest: PasswordRequest) {
         userAuthApi.checkPassword(passwordRequest)
     }
+
+    suspend fun updateABTestToken(): ABTestTokenResponse {
+        return userAuthApi.updateABTestToken()
+    }
+
     suspend fun postABTestAssign(abTestRequest: ABTestRequest): ABTestResponse {
         return userAuthApi.postABTestAssign(abTestRequest)
     }

diff --git a/domain/src/main/java/in/koreatech/koin/domain/repository/UserRepository.kt b/domain/src/main/java/in/koreatech/koin/domain/repository/UserRepository.kt
@@ -27,5 +27,6 @@ interface UserRepository {
     suspend fun deleteDeviceToken()
     suspend fun verifyPassword(hashedPassword: String)
     suspend fun updateUserPassword(user: User, hashedPassword: String)
+    suspend fun updateABTestToken()
     suspend fun postABTestAssign(title: String) : ABTest
 }
diff --git a/domain/src/main/java/in/koreatech/koin/domain/usecase/user/ABTestUseCase.kt b/domain/src/main/java/in/koreatech/koin/domain/usecase/user/ABTestUseCase.kt
@@ -1,24 +1,25 @@
 package `in`.koreatech.koin.domain.usecase.user
 
-import `in`.koreatech.koin.domain.error.user.UserErrorHandler
-import `in`.koreatech.koin.domain.model.error.ErrorHandler
 import `in`.koreatech.koin.domain.repository.TokenRepository
 import `in`.koreatech.koin.domain.repository.UserRepository
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import javax.inject.Inject
 
 class ABTestUseCase @Inject constructor(
     private val userRepository: UserRepository,
-    private val tokenRepository: TokenRepository,
-    private val userErrorHandler: UserErrorHandler
+    private val tokenRepository: TokenRepository
 ) {
-    suspend operator fun invoke(title: String): Pair<String?, ErrorHandler?> {
-        return try {
-            val accessHistory = userRepository.postABTestAssign(title)
-            val accessHistoryId = accessHistory.accessHistoryId
-            tokenRepository.saveAccessHistoryId(accessHistoryId)
-            accessHistory.variableName to null
-        } catch (t: Throwable) {
-            null to userErrorHandler.handleVerifyUserPasswordError(t)
+    private val mutex = Mutex()
+
+    suspend operator fun invoke(title: String): Result<String> {
+        return runCatching {
+            mutex.withLock {
+                if (tokenRepository.getAccessHistoryId() == null) {
+                    userRepository.updateABTestToken()
+                }
+            }
+            userRepository.postABTestAssign(title).variableName
         }
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -46,8 +46,7 @@ securityCryptoVersion = "1.1.0-alpha03"
 stickyscrollviewVersion = "1.0.2"
 strictVersionMatcherPlugin = "1.2.4"
 composeCompilerVersion = "1.5.10"
-glideVersion = "4.9.0"
-butterknifeVersion = "10.1.0"
+glideVersion = "4.14.2"
 googleServiceVersion = "4.3.14"
 composeNavigationVersion = "2.7.7"
 orbitVersion = "7.0.1"
@@ -70,6 +69,7 @@ timber = "5.0.1"
 kotlinxCoroutinesTestVersion = "1.9.0"
 turbineVersion = "1.2.0"
 kotlinxCollectionsImmutableVersion = "0.3.8"
+kspVersion = "1.9.22-1.0.16"
 
 
 [libraries]
@@ -151,9 +151,7 @@ rxjava-android = { module = "io.reactivex.rxjava2:rxandroid", version.ref = "rxa
 stickyScrollView = { module = "com.github.amarjain07:StickyScrollView", version.ref = "stickyscrollviewVersion" }
 strict-version-matcher-plugin = { module = "com.google.android.gms:strict-version-matcher-plugin", version.ref = "strictVersionMatcherPlugin" }
 glide = { module = "com.github.bumptech.glide:glide", version.ref = "glideVersion" }
-glide-compiler = { module = "com.github.bumptech.glide:compiler", version.ref = "glideVersion" }
-butterknife = { module = "com.jakewharton:butterknife", version.ref = "butterknifeVersion" }
-butterknife-compiler = { module = "com.jakewharton:butterknife-compiler", version.ref = "butterknifeVersion" }
+glide-ksp = { module = "com.github.bumptech.glide:ksp", version.ref = "glideVersion" }
 viewpager2 = { module = "androidx.viewpager2:viewpager2", version = "1.0.0" }
 
 orbit-core = { module = "org.orbit-mvi:orbit-core", version.ref = "orbitVersion" }
@@ -205,6 +203,7 @@ kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", vers
 hilt = { id = "com.google.dagger.hilt.android", version.ref = "hiltVersion" }
 androidLibrary = { id = "com.android.library", version.ref = "androidGradleVersion" }
 google-service = { id = "com.google.gms.google-services", version.ref = "googleServiceVersion" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "kspVersion" }
 
 koin-application = { id = "in.koreatech.plugin.application", version = "unspecified" }
 koin-compose = { id = "in.koreatech.plugin.compose", version = "unspecified" }

diff --git a/koin/build.gradle.kts b/koin/build.gradle.kts
@@ -105,11 +105,7 @@ dependencies {
     /* Dependency - glide & coil */
     implementation(libs.glide)
     implementation(libs.coil)
-    kapt(libs.glide.compiler)
-
-    /* Dependency - butterknife api */
-    implementation(libs.butterknife)
-    kapt(libs.butterknife.compiler)
+    ksp(libs.glide.ksp)
 
     /* Dependency - naver api */
     implementation(libs.map.sdk)
@@ -119,8 +115,6 @@ dependencies {
     implementation(libs.inApp.update.ktx)
     implementation(libs.feature.delivery.ktx)
 
-    // https://github.com/irshuLx/Android-WYSIWYG-Editor
-    implementation(libs.laser.native.editor)
     implementation(libs.colorpicker)
     implementation(libs.photoview)
 

diff --git a/koin/src/main/AndroidManifest.xml b/koin/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.NoActionBar"
+        android:theme="@style/KAPTheme.NoActionBar"
         android:usesCleartextTraffic="true"
         tools:replace="icon,label">
 

diff --git a/koin/src/main/java/in/koreatech/koin/GlideModule.kt b/koin/src/main/java/in/koreatech/koin/GlideModule.kt
@@ -0,0 +1,7 @@
+package `in`.koreatech.koin
+
+import com.bumptech.glide.annotation.GlideModule
+import com.bumptech.glide.module.AppGlideModule
+
+@GlideModule
+class GlideModule: AppGlideModule()
diff --git a/koin/src/main/java/in/koreatech/koin/ui/article/HtmlView.kt b/koin/src/main/java/in/koreatech/koin/ui/article/HtmlView.kt
@@ -130,17 +130,17 @@ class HtmlView @JvmOverloads constructor(
             override fun onLoadFailed(
                 e: GlideException?,
                 model: Any?,
-                target: com.bumptech.glide.request.target.Target<Drawable>?,
+                target: com.bumptech.glide.request.target.Target<Drawable>,
                 isFirstResource: Boolean
             ): Boolean {
                 return false
             }
 
             override fun onResourceReady(
-                resource: Drawable?,
-                model: Any?,
-                target: com.bumptech.glide.request.target.Target<Drawable>?,
-                dataSource: DataSource?,
+                resource: Drawable,
+                model: Any,
+                target: com.bumptech.glide.request.target.Target<Drawable>,
+                dataSource: DataSource,
                 isFirstResource: Boolean
             ): Boolean {
                 val dialog = ImageZoomableDialog(context, model as String)

diff --git a/koin/src/main/java/in/koreatech/koin/ui/dining/adapter/DiningAdapter.kt b/koin/src/main/java/in/koreatech/koin/ui/dining/adapter/DiningAdapter.kt
@@ -72,17 +72,17 @@ class DiningAdapter(
                             override fun onLoadFailed(
                                 e: GlideException?,
                                 model: Any?,
-                                target: Target<Drawable>?,
+                                target: Target<Drawable>,
                                 isFirstResource: Boolean
                             ): Boolean {
                                 return false
                             }
 
                             override fun onResourceReady(
-                                resource: Drawable?,
-                                model: Any?,
-                                target: Target<Drawable>?,
-                                dataSource: DataSource?,
+                                resource: Drawable,
+                                model: Any,
+                                target: Target<Drawable>,
+                                dataSource: DataSource,
                                 isFirstResource: Boolean
                             ): Boolean {
                                 binding.lottieImageLoading.pauseAnimation()

diff --git a/koin/src/main/java/in/koreatech/koin/ui/dining/adapter/DiningOriginalAdapter.kt b/koin/src/main/java/in/koreatech/koin/ui/dining/adapter/DiningOriginalAdapter.kt
@@ -73,17 +73,17 @@ class DiningOriginalAdapter(
                             override fun onLoadFailed(
                                 e: GlideException?,
                                 model: Any?,
-                                target: Target<Drawable>?,
+                                target: Target<Drawable>,
                                 isFirstResource: Boolean
                             ): Boolean {
                                 return false
                             }
 
                             override fun onResourceReady(
-                                resource: Drawable?,
-                                model: Any?,
-                                target: Target<Drawable>?,
-                                dataSource: DataSource?,
+                                resource: Drawable,
+                                model: Any,
+                                target: Target<Drawable>,
+                                dataSource: DataSource,
                                 isFirstResource: Boolean
                             ): Boolean {
                                 binding.lottieImageLoading.pauseAnimation()