chore: be cd 스크립트 수정

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

@@ -129,7 +129,7 @@ jobs:
       - name: Tag successful deployment as latest
         if: success()
         run: |
-          docker tag ${{ secrets.DOCKERHUB_USERNAME }}/$DOCKERHUB_REPOSITORY:${{ github.sha }-prod ${{ secrets.DOCKERHUB_USERNAME }}/$DOCKERHUB_REPOSITORY:latest
+          docker tag ${{ secrets.DOCKERHUB_USERNAME }}/$DOCKERHUB_REPOSITORY:${{ github.sha }}-prod ${{ secrets.DOCKERHUB_USERNAME }}/$DOCKERHUB_REPOSITORY:latest
           docker push ${{ secrets.DOCKERHUB_USERNAME }}/$DOCKERHUB_REPOSITORY:latest
 
       - name: Check Docker Process

android/app/build.gradle.kts

@@ -76,7 +76,6 @@ kapt {
 
 dependencies {
     // androidx
-    implementation(libs.androidx.webkit)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.activity)
     implementation(libs.androidx.hilt.work)

android/app/src/main/AndroidManifest.xml

@@ -96,6 +96,7 @@
         <activity
             android:name=".presentation.room.MeetingRoomActivity"
             android:exported="false"
+            android:parentActivityName=".presentation.meetings.MeetingsActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"

android/app/src/main/java/com/mulberry/ody/data/local/db/OdyDatabase.kt

@@ -10,7 +10,6 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import com.mulberry.ody.data.local.entity.eta.MateEtaInfoEntity
 import com.mulberry.ody.data.local.entity.eta.MateEtaListTypeConverter
 import com.mulberry.ody.data.local.entity.reserve.EtaReservationEntity
-import com.squareup.moshi.Moshi
 
 @Database(
     entities = [MateEtaInfoEntity::class, EtaReservationEntity::class],
@@ -40,13 +39,10 @@ abstract class OdyDatabase : RoomDatabase() {
                 }
             }
 
-        fun create(
-            context: Context,
-            moshi: Moshi,
-        ): OdyDatabase {
+        fun create(context: Context): OdyDatabase {
             return Room.databaseBuilder(context, OdyDatabase::class.java, DATABASE_NAME)
                 .addMigrations(MIGRATION_3_TO_4)
-                .addTypeConverter(MateEtaListTypeConverter(moshi))
+                .addTypeConverter(MateEtaListTypeConverter())
                 .build()
         }
     }

android/app/src/main/java/com/mulberry/ody/data/local/entity/eta/MateEtaListTypeConverter.kt

@@ -2,26 +2,80 @@ package com.mulberry.ody.data.local.entity.eta
 
 import androidx.room.ProvidedTypeConverter
 import androidx.room.TypeConverter
+import com.mulberry.ody.domain.model.EtaStatus
 import com.mulberry.ody.domain.model.MateEta
-import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.Types
 
 @ProvidedTypeConverter
-class MateEtaListTypeConverter(
-    private val moshi: Moshi,
-) {
+class MateEtaListTypeConverter {
     @TypeConverter
     fun fromString(value: String): List<MateEta>? {
-        val listType = Types.newParameterizedType(List::class.java, MateEta::class.java)
-        val adapter: JsonAdapter<List<MateEta>> = moshi.adapter(listType)
-        return adapter.fromJson(value)
+        return value.split(";").map { fromJson(it) }
     }
 
     @TypeConverter
     fun fromMateEta(type: List<MateEta>): String {
-        val listType = Types.newParameterizedType(List::class.java, MateEta::class.java)
-        val adapter: JsonAdapter<List<MateEta>> = moshi.adapter(listType)
-        return adapter.toJson(type)
+        return type.joinToString(";") { toJson(it) }
+    }
+
+    private fun toJson(mateEta: MateEta): String {
+        val etaStatusString =
+            when (mateEta.etaStatus) {
+                is EtaStatus.Arrived -> """{type:"Arrived"}"""
+                is EtaStatus.ArrivalSoon -> """{"type":"ArrivalSoon"/"durationMinutes":${mateEta.etaStatus.durationMinutes}}"""
+                is EtaStatus.LateWarning -> """{"type":"LateWarning"/"durationMinutes":${mateEta.etaStatus.durationMinutes}}"""
+                is EtaStatus.Late -> """{"type":"Late"/"durationMinutes":${mateEta.etaStatus.durationMinutes}}"""
+                is EtaStatus.Missing -> """{"type":"Missing"}"""
+            }
+
+        return """{"mateId":${mateEta.mateId},"nickname":"${mateEta.nickname}","etaStatus":$etaStatusString}"""
+    }
+
+    private fun fromJson(json: String): MateEta {
+        val cleanedJson = json.trim().removePrefix("{").removeSuffix("}")
+        val jsonObject =
+            cleanedJson.split(",").map { it.trim() }
+                .associate {
+                    val (key, value) =
+                        it.split(":", limit = 2)
+                            .map { it.trim().removeSurrounding("\"") }
+                    key to value
+                }
+
+        val mateId = jsonObject["mateId"]!!.toLong()
+        val nickname = jsonObject["nickname"]!!
+        val etaStatusJson = jsonObject["etaStatus"]!!.trim()
+        val etaStatusMap =
+            etaStatusJson.removePrefix("{").removeSuffix("}").split("/")
+                .map { it.trim() }
+                .associate {
+                    val (key, value) = it.split(":", limit = 2).map { it.trim() }
+                    key.removeSurrounding("\"") to value.trim().removeSurrounding("\"")
+                }
+
+        val etaStatusType =
+            etaStatusMap["type"] ?: throw IllegalArgumentException("Missing etaStatus type")
+        val etaStatus =
+            when (etaStatusType) {
+                "Arrived" -> EtaStatus.Arrived
+                "ArrivalSoon" -> {
+                    val durationMinutes = etaStatusMap["durationMinutes"]?.toInt()
+                    EtaStatus.ArrivalSoon(durationMinutes ?: throw IllegalArgumentException("Missing durationMinutes"))
+                }
+
+                "LateWarning" -> {
+                    val durationMinutes = etaStatusMap["durationMinutes"]?.toInt()
+                    EtaStatus.LateWarning(durationMinutes ?: throw IllegalArgumentException("Missing durationMinutes"))
+                }
+
+                "Late" -> {
+                    val durationMinutes = etaStatusMap["durationMinutes"]?.toInt()
+                    EtaStatus.Late(durationMinutes ?: throw IllegalArgumentException("Missing durationMinutes"))
+                }
+
+                "Missing" -> EtaStatus.Missing
+                else -> throw IllegalArgumentException("Unknown etaStatus type: $etaStatusType")
+            }
+
+        return MateEta(mateId, nickname, etaStatus)
     }
 }

android/app/src/main/java/com/mulberry/ody/data/remote/core/entity/meeting/mapper/MatesEtaResponseMapper.kt

@@ -2,7 +2,7 @@ package com.mulberry.ody.data.remote.core.entity.meeting.mapper
 
 import com.mulberry.ody.data.remote.core.entity.meeting.response.MateEtaResponse
 import com.mulberry.ody.data.remote.core.entity.meeting.response.MatesEtaResponse
-import com.mulberry.ody.domain.model.EtaType
+import com.mulberry.ody.domain.model.EtaStatus
 import com.mulberry.ody.domain.model.MateEta
 import com.mulberry.ody.domain.model.MateEtaInfo
 
@@ -18,18 +18,17 @@ private fun MateEtaResponse.toMateEta(): MateEta {
     return MateEta(
         mateId = mateId,
         nickname = nickname,
-        etaType = status.toEtaType(),
-        durationMinute = durationMinutes.toInt(),
+        etaStatus = status.toEtaStatus(durationMinutes),
     )
 }
 
-private fun String.toEtaType(): EtaType {
+private fun String.toEtaStatus(durationMinutes: Long): EtaStatus {
     return when (this) {
-        "LATE_WARNING" -> EtaType.LATE_WARNING
-        "ARRIVAL_SOON" -> EtaType.ARRIVAL_SOON
-        "ARRIVED" -> EtaType.ARRIVED
-        "LATE" -> EtaType.LATE
-        "MISSING" -> EtaType.MISSING
+        "ARRIVED" -> EtaStatus.Arrived
+        "ARRIVAL_SOON" -> EtaStatus.ArrivalSoon(durationMinutes = durationMinutes.toInt())
+        "LATE_WARNING" -> EtaStatus.LateWarning(durationMinutes = durationMinutes.toInt())
+        "LATE" -> EtaStatus.Late(durationMinutes = durationMinutes.toInt())
+        "MISSING" -> EtaStatus.Missing
         else -> throw IllegalArgumentException("존재하지 않는 Eta Type 입니다.")
     }
 }

android/app/src/main/java/com/mulberry/ody/di/DBModule.kt

@@ -5,8 +5,6 @@ import com.mulberry.ody.data.local.db.EtaReservationDao
 import com.mulberry.ody.data.local.db.MateEtaInfoDao
 import com.mulberry.ody.data.local.db.OdyDatabase
 import com.mulberry.ody.data.local.db.OdyDatastore
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -17,10 +15,6 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 object DBModule {
-    @Provides
-    @Singleton
-    fun provideMoshi(): Moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
-
     @Provides
     @Singleton
     fun provideDataStore(
@@ -33,9 +27,8 @@ object DBModule {
     @Singleton
     fun provideOdyDatabase(
         @ApplicationContext context: Context,
-        moshi: Moshi,
     ): OdyDatabase {
-        return OdyDatabase.create(context, moshi)
+        return OdyDatabase.create(context)
     }
 
     @Provides

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

@@ -0,0 +1,13 @@
+package com.mulberry.ody.domain.model
+
+sealed interface EtaStatus {
+    data object Arrived : EtaStatus
+
+    data class ArrivalSoon(val durationMinutes: Int) : EtaStatus
+
+    data class LateWarning(val durationMinutes: Int) : EtaStatus
+
+    data class Late(val durationMinutes: Int) : EtaStatus
+
+    data object Missing : EtaStatus
+}

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

@@ -3,6 +3,5 @@ package com.mulberry.ody.domain.model
 data class MateEta(
     val mateId: Long,
     val nickname: String,
-    val etaType: EtaType,
-    val durationMinute: Int,
+    val etaStatus: EtaStatus,
 )

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

@@ -1,8 +1,5 @@
 package com.mulberry.ody.domain.model
 
-import com.squareup.moshi.JsonClass
-
-@JsonClass(generateAdapter = true)
 data class MateEtaInfo(
     val userId: Long,
     val mateEtas: List<MateEta>,

android/app/src/main/java/com/mulberry/ody/presentation/notification/FCMNotification.kt

@@ -6,8 +6,10 @@ import android.app.PendingIntent
 import android.content.Context
 import android.media.RingtoneManager
 import androidx.core.app.NotificationCompat
+import androidx.core.app.TaskStackBuilder
 import com.mulberry.ody.R
 import com.mulberry.ody.domain.model.NotificationType
+import com.mulberry.ody.presentation.meetings.MeetingsActivity
 import com.mulberry.ody.presentation.room.MeetingRoomActivity
 import com.mulberry.ody.presentation.room.MeetingRoomActivity.Companion.NAVIGATE_TO_ETA_DASHBOARD
 import com.mulberry.ody.presentation.room.MeetingRoomActivity.Companion.NAVIGATE_TO_NOTIFICATION_LOG
@@ -74,11 +76,15 @@ class FCMNotification
                     NotificationType.DEFAULT -> ""
                 }
 
-            val intent = MeetingRoomActivity.getIntent(context, meetingId.toLong(), navigationTarget)
-            return PendingIntent.getActivity(
-                context,
+            val stackBuilder = TaskStackBuilder.create(context)
+            val parentIntent = MeetingsActivity.getIntent(context)
+            stackBuilder.addNextIntent(parentIntent)
+
+            val meetingRoomIntent = MeetingRoomActivity.getIntent(context, meetingId.toLong(), navigationTarget)
+            stackBuilder.addNextIntent(meetingRoomIntent)
+
+            return stackBuilder.getPendingIntent(
                 NOTIFICATION_REQUEST_CODE,
-                intent,
                 PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
             )
         }

android/app/src/main/java/com/mulberry/ody/presentation/room/etadashboard/EtaDashboardBindingAdapter.kt

@@ -9,29 +9,18 @@ import androidx.databinding.BindingAdapter
 import com.mulberry.ody.R
 import com.mulberry.ody.presentation.room.etadashboard.listener.MissingToolTipListener
 import com.mulberry.ody.presentation.room.etadashboard.listener.NudgeListener
-import com.mulberry.ody.presentation.room.etadashboard.model.EtaDurationMinuteTypeUiModel
-import com.mulberry.ody.presentation.room.etadashboard.model.EtaTypeUiModel
+import com.mulberry.ody.presentation.room.etadashboard.model.EtaStatusUiModel
 import com.mulberry.ody.presentation.room.etadashboard.model.MateEtaUiModel
 
 @BindingAdapter("etaType")
-fun TextView.setBadgeByEtaType(etaTypeUiModel: EtaTypeUiModel) {
-    text = context.getString(etaTypeUiModel.messageId)
-    backgroundTintList = ContextCompat.getColorStateList(context, etaTypeUiModel.colorId)
+fun TextView.setBadgeByEtaType(etaStatusUiModel: EtaStatusUiModel) {
+    text = context.getString(etaStatusUiModel.badgeMessageId)
+    backgroundTintList = ContextCompat.getColorStateList(context, etaStatusUiModel.badgeColorId)
 }
 
 @BindingAdapter("etaStatus")
-fun TextView.setEtaStatusText(mateEtaUiModel: MateEtaUiModel) {
-    text =
-        when (mateEtaUiModel.getEtaDurationMinuteTypeUiModel()) {
-            EtaDurationMinuteTypeUiModel.ARRIVED -> context.getString(R.string.status_arrived)
-            EtaDurationMinuteTypeUiModel.MISSING -> context.getString(R.string.status_missing)
-            EtaDurationMinuteTypeUiModel.ARRIVAL_SOON -> context.getString(R.string.status_arrival_soon)
-            EtaDurationMinuteTypeUiModel.ARRIVAL_REMAIN_TIME ->
-                context.getString(
-                    R.string.status_arrival_remain_time,
-                    mateEtaUiModel.durationMinute,
-                )
-        }
+fun TextView.setEtaStatusText(etaStatusUiModel: EtaStatusUiModel) {
+    text = etaStatusUiModel.etaStatusMessage(context)
 }
 
 @BindingAdapter("isUserSelf", "missingToolTipListener")
@@ -46,19 +35,16 @@ fun TextView.setOnClickMissingTooltip(
 }
 
 @BindingAdapter("etaBadgeAnimation")
-fun TextView.setEtaBadgeAnimation(etaTypeUiModel: EtaTypeUiModel) {
-    if (
-        etaTypeUiModel == EtaTypeUiModel.LATE ||
-        etaTypeUiModel == EtaTypeUiModel.LATE_WARNING
-    ) {
+fun TextView.setEtaBadgeAnimation(etaStatusUiModel: EtaStatusUiModel) {
+    if (etaStatusUiModel.canNudge()) {
         val animation = AnimationUtils.loadAnimation(context, R.anim.bounce_duration_500)
         this.startAnimation(animation)
     }
 }
 
 @BindingAdapter("etaBadgeAnimation")
-fun TextView.setEtaBadgeAnimation(isPossibleNudge: Boolean) {
-    if (isPossibleNudge) {
+fun TextView.setEtaBadgeAnimation(canNudge: Boolean) {
+    if (canNudge) {
         val animation = AnimationUtils.loadAnimation(context, R.anim.bounce_duration_500)
         this.startAnimation(animation)
     }
@@ -70,10 +56,7 @@ fun TextView.setOnClickNudge(
     nudgeListener: NudgeListener,
 ) {
     setOnClickListener {
-        if (
-            mateEtaUiModel.isUserSelf.not() &&
-            (mateEtaUiModel.etaTypeUiModel == EtaTypeUiModel.LATE || mateEtaUiModel.etaTypeUiModel == EtaTypeUiModel.LATE_WARNING)
-        ) {
+        if (mateEtaUiModel.isUserSelf.not() && mateEtaUiModel.etaStatusUiModel.canNudge()) {
             nudgeListener.nudgeMate(
                 nudgeId = mateEtaUiModel.userId,
                 mateId = mateEtaUiModel.mateId,