release: 백엔드 버전 2.3.3 배포

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

@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: develop
+          ref: feature/927
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -83,6 +83,11 @@ jobs:
 
       - name: Clean Up Legacy Image
         run: |
+          export DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}
+          export DOCKERHUB_REPOSITORY=$DOCKERHUB_REPOSITORY
+          export DEV_MYSQL_PASSWORD=${{ secrets.DEV_MYSQL_PASSWORD }}
+          export JASYPT_ENCRYPTOR_PASSWORD=${{ secrets.JASYPT_PASSWORD }}
+          export TAG=${{ github.sha }}-dev
           docker compose down || true
           docker rmi $(docker images -q) -f || true
 

android/app/build.gradle.kts

@@ -23,17 +23,22 @@ android {
         applicationId = "com.mulberry.ody"
         minSdk = 26
         targetSdk = 34
-        versionCode = 32
-        versionName = "1.2.3"
+        versionCode = 14
+        versionName = "1.1.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "BASE_DEV_URL", properties["BASE_DEV_URL"].toString())
         buildConfigField("String", "BASE_PROD_URL", properties["BASE_PROD_URL"].toString())
         buildConfigField("String", "KAKAO_API_KEY", properties["KAKAO_API_KEY"].toString())
         buildConfigField("String", "KAKAO_NATIVE_KEY", properties["KAKAO_NATIVE_KEY"].toString())
-        buildConfigField("String", "PRIVACY_POLICY_URI", properties["PRIVACY_POLICY_URI"].toString())
+        buildConfigField(
+            "String",
+            "PRIVACY_POLICY_URI",
+            properties["PRIVACY_POLICY_URI"].toString(),
+        )
         buildConfigField("String", "TERM_URI", properties["TERM_URI"].toString())
-        manifestPlaceholders["KAKAO_NATIVE_KEY"] = properties["KAKAO_NATIVE_KEY"].toString().trim('"')
+        manifestPlaceholders["KAKAO_NATIVE_KEY"] =
+            properties["KAKAO_NATIVE_KEY"].toString().trim('"')
     }
     buildTypes {
         debug {
@@ -130,8 +135,8 @@ dependencies {
     // timber
     implementation(libs.timber)
 
-    // dotsibdicator
-    implementation(libs.dotsibdicator)
+    // dotsindicator
+    implementation(libs.dotsindicator)
 
     // play service
     implementation(libs.play.services.location)
@@ -152,4 +157,7 @@ dependencies {
     // hilt
     implementation(libs.hilt.android)
     kapt(libs.hilt.android.compiler)
+
+    // paging
+    implementation(libs.androidx.paging)
 }

android/app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
     <uses-configuration android:name="android:permission.POST_NOTIFICATIONS" />
 
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
@@ -128,7 +129,14 @@
 
         <receiver android:name=".data.local.service.EtaDashboardOpenBroadcastReceiver" />
         <receiver android:name=".data.local.service.EtaDashboardCloseBroadcastReceiver" />
-
+        <receiver
+            android:name=".data.local.service.ReinstallBroadcastReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>

android/app/src/main/java/com/mulberry/ody/data/local/service/EtaDashboardCloseBroadcastReceiver.kt

@@ -6,11 +6,13 @@ import android.content.Intent
 import com.mulberry.ody.data.local.service.EtaDashboardService.Companion.MEETING_ID_DEFAULT_VALUE
 import com.mulberry.ody.data.local.service.EtaDashboardService.Companion.MEETING_ID_KEY
 import com.mulberry.ody.domain.repository.ody.MatesEtaRepository
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
+@AndroidEntryPoint
 class EtaDashboardCloseBroadcastReceiver : BroadcastReceiver() {
     @Inject
     lateinit var matesEtaRepository: MatesEtaRepository

android/app/src/main/java/com/mulberry/ody/data/local/service/ReinstallBroadcastReceiver.kt

@@ -0,0 +1,27 @@
+package com.mulberry.ody.data.local.service
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.mulberry.ody.domain.repository.ody.MatesEtaRepository
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ReinstallBroadcastReceiver : BroadcastReceiver() {
+    @Inject
+    lateinit var matesEtaRepository: MatesEtaRepository
+    private val coroutineScope: CoroutineScope = CoroutineScope(Dispatchers.IO)
+
+    override fun onReceive(
+        context: Context,
+        intent: Intent,
+    ) {
+        coroutineScope.launch {
+            matesEtaRepository.reserveAllEtaReservation()
+        }
+    }
+}

android/app/src/main/java/com/mulberry/ody/data/remote/core/entity/ErrorResponse.kt

@@ -0,0 +1,18 @@
+package com.mulberry.ody.data.remote.core.entity
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class ErrorResponse(
+    @Json(name = "type")
+    val type: String,
+    @Json(name = "title")
+    val title: String,
+    @Json(name = "status")
+    val status: Int,
+    @Json(name = "detail")
+    val detail: String,
+    @Json(name = "instance")
+    val instance: String,
+)

android/app/src/main/java/com/mulberry/ody/data/remote/thirdparty/address/AddressPagingSource.kt

@@ -0,0 +1,47 @@
+package com.mulberry.ody.data.remote.thirdparty.address
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import com.mulberry.ody.domain.apiresult.getOrThrow
+import com.mulberry.ody.domain.model.Address
+import com.mulberry.ody.domain.repository.location.AddressRepository
+
+class AddressPagingSource(
+    private val keyword: String,
+    private val addressRepository: AddressRepository,
+) : PagingSource<Int, Address>() {
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, Address> {
+        val page = params.key ?: PAGE_START
+        return runCatching {
+            val addresses =
+                addressRepository.fetchAddresses(
+                    keyword = keyword,
+                    page = page,
+                    pageSize = PAGE_SIZE,
+                ).getOrThrow()
+
+            val prevKey = if (page == PAGE_START) null else page - PAGE_OFFSET
+            val nextKey = if (addresses.isEnd) null else page + PAGE_OFFSET
+
+            LoadResult.Page(
+                data = addresses.addresses,
+                prevKey = prevKey,
+                nextKey = nextKey,
+            )
+        }.getOrElse { throwable ->
+            LoadResult.Error(throwable)
+        }
+    }
+
+    override fun getRefreshKey(state: PagingState<Int, Address>): Int? {
+        val anchorPosition = state.anchorPosition ?: return null
+        val anchorPage = state.closestPageToPosition(anchorPosition) ?: return null
+        return anchorPage.prevKey?.plus(PAGE_OFFSET) ?: anchorPage.nextKey?.minus(PAGE_OFFSET)
+    }
+
+    companion object {
+        private const val PAGE_START = 1
+        private const val PAGE_OFFSET = 1
+        const val PAGE_SIZE = 10
+    }
+}

android/app/src/main/java/com/mulberry/ody/data/remote/thirdparty/address/KakaoAddressRepository.kt

@@ -3,7 +3,7 @@ package com.mulberry.ody.data.remote.thirdparty.address
 import com.mulberry.ody.data.remote.thirdparty.address.response.toAddresses
 import com.mulberry.ody.domain.apiresult.ApiResult
 import com.mulberry.ody.domain.apiresult.map
-import com.mulberry.ody.domain.model.Address
+import com.mulberry.ody.domain.model.Addresses
 import com.mulberry.ody.domain.repository.location.AddressRepository
 import javax.inject.Inject
 
@@ -12,9 +12,10 @@ class KakaoAddressRepository
     constructor(private val service: KakaoAddressService) : AddressRepository {
         override suspend fun fetchAddresses(
             keyword: String,
+            page: Int,
             pageSize: Int,
-        ): ApiResult<List<Address>> {
-            return service.fetchAddresses(keyword, pageSize).map { it.toAddresses() }
+        ): ApiResult<Addresses> {
+            return service.fetchAddresses(keyword, page, pageSize).map { it.toAddresses() }
         }
 
         override suspend fun fetchAddressesByCoordinate(

android/app/src/main/java/com/mulberry/ody/data/remote/thirdparty/address/KakaoAddressService.kt

@@ -10,7 +10,8 @@ interface KakaoAddressService {
     @GET("/v2/local/search/keyword.json")
     suspend fun fetchAddresses(
         @Query("query") keyword: String,
-        @Query("size") size: Int,
+        @Query("page") page: Int,
+        @Query("size") pageSize: Int,
     ): ApiResult<AddressResponse>
 
     @GET("/v2/local/geo/coord2address.json")

android/app/src/main/java/com/mulberry/ody/data/remote/thirdparty/address/response/AddressResponseMapper.kt

@@ -1,9 +1,11 @@
 package com.mulberry.ody.data.remote.thirdparty.address.response
 
 import com.mulberry.ody.domain.model.Address
+import com.mulberry.ody.domain.model.Addresses
 
-fun AddressResponse.toAddresses(): List<Address> {
-    return documents.map { it.toAddress() }
+fun AddressResponse.toAddresses(): Addresses {
+    val addresses = documents.map { it.toAddress() }
+    return Addresses(addresses, meta.isEnd)
 }
 
 private fun Document.toAddress(): Address {

android/app/src/main/java/com/mulberry/ody/data/retrofit/ApiResultCall.kt

@@ -1,6 +1,9 @@
 package com.mulberry.ody.data.retrofit
 
+import com.mulberry.ody.data.remote.core.entity.ErrorResponse
 import com.mulberry.ody.domain.apiresult.ApiResult
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import okhttp3.Request
 import okio.Timeout
 import retrofit2.Call
@@ -22,16 +25,22 @@ class ApiResultCall<T>(private val call: Call<T>) : Call<ApiResult<T>> {
                     call: Call<T>,
                     response: Response<T>,
                 ) {
-                    val body: T = response.body() ?: Unit as T
                     if (response.isSuccessful) {
+                        val body: T = response.body() ?: Unit as T
+
                         callback.onResponse(
                             this@ApiResultCall,
                             Response.success(ApiResult.Success(body)),
                         )
                     } else {
+                        val errorBody = response.errorBody()?.string()
+                        val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
+                        val adapter = moshi.adapter(ErrorResponse::class.java)
+                        val errorResponse = errorBody?.let { adapter.fromJson(it) }
+
                         callback.onResponse(
                             this@ApiResultCall,
-                            Response.success(ApiResult.Failure(response.code(), response.message())),
+                            Response.success(ApiResult.Failure(errorResponse?.status, errorResponse?.detail)),
                         )
                     }
                 }

android/app/src/main/java/com/mulberry/ody/domain/apiresult/ApiResult.kt

@@ -5,7 +5,7 @@ import java.io.IOException
 sealed interface ApiResult<out T> {
     data class Success<T>(val data: T) : ApiResult<T>
 
-    data class Failure(val code: Int, val errorMessage: String?) : ApiResult<Nothing>
+    data class Failure(val code: Int?, val errorMessage: String?) : ApiResult<Nothing>
 
     data class NetworkError(val exception: IOException) : ApiResult<Nothing>
 

android/app/src/main/java/com/mulberry/ody/domain/apiresult/ApiResultExtensions.kt

@@ -1,13 +1,15 @@
 package com.mulberry.ody.domain.apiresult
 
+import java.lang.IllegalArgumentException
+
 fun <T> ApiResult<T>.onSuccess(block: (T) -> Unit): ApiResult<T> {
     if (this is ApiResult.Success) {
         block(this.data)
     }
     return this
 }
 
-fun <T> ApiResult<T>.onFailure(block: (code: Int, errorMessage: String?) -> Unit): ApiResult<T> {
+fun <T> ApiResult<T>.onFailure(block: (code: Int?, errorMessage: String?) -> Unit): ApiResult<T> {
     if (this is ApiResult.Failure) {
         block(this.code, this.errorMessage)
     }
@@ -35,7 +37,7 @@ suspend fun <T> ApiResult<T>.suspendOnSuccess(block: suspend (T) -> Unit): ApiRe
     return this
 }
 
-suspend fun <T> ApiResult<T>.suspendOnFailure(block: suspend (code: Int, errorMessage: String?) -> Unit): ApiResult<T> {
+suspend fun <T> ApiResult<T>.suspendOnFailure(block: suspend (code: Int?, errorMessage: String?) -> Unit): ApiResult<T> {
     if (this is ApiResult.Failure) {
         block(this.code, this.errorMessage)
     }
@@ -69,6 +71,15 @@ fun <T> ApiResult<T>.getOrNull(): T? {
     return if (this is ApiResult.Success) data else null
 }
 
+fun <T> ApiResult<T>.getOrThrow(): T {
+    when (this) {
+        is ApiResult.Failure -> throw IllegalArgumentException(errorMessage)
+        is ApiResult.NetworkError -> throw exception
+        is ApiResult.Unexpected -> throw t
+        is ApiResult.Success -> return data
+    }
+}
+
 fun <T> Result<T>.toApiResult(): ApiResult<T> {
     return fold(
         onSuccess = { data -> ApiResult.Success(data) },

android/app/src/main/java/com/mulberry/ody/domain/model/Addresses.kt

@@ -0,0 +1,6 @@
+package com.mulberry.ody.domain.model
+
+class Addresses(
+    val addresses: List<Address>,
+    val isEnd: Boolean,
+)

android/app/src/main/java/com/mulberry/ody/domain/repository/location/AddressRepository.kt

@@ -1,13 +1,14 @@
 package com.mulberry.ody.domain.repository.location
 
 import com.mulberry.ody.domain.apiresult.ApiResult
-import com.mulberry.ody.domain.model.Address
+import com.mulberry.ody.domain.model.Addresses
 
 interface AddressRepository {
     suspend fun fetchAddresses(
         keyword: String,
+        page: Int,
         pageSize: Int,
-    ): ApiResult<List<Address>>
+    ): ApiResult<Addresses>
 
     suspend fun fetchAddressesByCoordinate(
         x: String,

android/app/src/main/java/com/mulberry/ody/presentation/address/AddressSearchFragment.kt

@@ -59,6 +59,9 @@ class AddressSearchFragment :
             }
         binding.rvAddress.addItemDecoration(dividerItemDecoration)
         binding.rvAddress.adapter = adapter
+        adapter.addLoadStateListener {
+            viewModel.updateAddressItemCount(adapter.itemCount)
+        }
     }
 
     private fun initializeBinding() {
@@ -81,16 +84,20 @@ class AddressSearchFragment :
         collectWhenStarted(viewModel.networkErrorEvent) {
             showRetrySnackBar { viewModel.retryLastAction() }
         }
-        collectWhenStarted(viewModel.addressUiModels) {
-            adapter.submitList(it)
-        }
         collectWhenStarted(viewModel.addressSelectEvent) {
             (parentFragment as? AddressSearchListener)?.onReceive(it)
             (activity as? AddressSearchListener)?.onReceive(it)
             onBack()
         }
-        collectWhenStarted(viewModel.addressSearchKeyword) {
-            if (it.isEmpty()) viewModel.clearAddresses()
+        collectWhenStarted(viewModel.hasAddressSearchKeyword) { hasKeyword ->
+            if (hasKeyword) {
+                return@collectWhenStarted
+            }
+            viewModel.clearAddresses()
+        }
+
+        collectWhenStarted(viewModel.address) {
+            adapter.submitData(viewLifecycleOwner.lifecycle, it)
         }
     }