release: 안드로이드 1.2.0 배포

android/app/build.gradle.kts

@@ -23,8 +23,8 @@ android {
         applicationId = "com.mulberry.ody"
         minSdk = 26
         targetSdk = 34
-        versionCode = 14
-        versionName = "1.1.1"
+        versionCode = 15
+        versionName = "1.2.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "BASE_DEV_URL", properties["BASE_DEV_URL"].toString())

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

@@ -9,7 +9,12 @@ import androidx.room.migration.Migration
 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.eta.OldMateEtaListTypeConverter
 import com.mulberry.ody.data.local.entity.reserve.EtaReservationEntity
+import com.mulberry.ody.domain.model.EtaStatus
+import com.mulberry.ody.domain.model.EtaType2
+import com.mulberry.ody.domain.model.MateEta
+import com.mulberry.ody.domain.model.MateEta2
 
 @Database(
     entities = [MateEtaInfoEntity::class, EtaReservationEntity::class],
@@ -31,11 +36,57 @@ abstract class OdyDatabase : RoomDatabase() {
                         CREATE TABLE IF NOT EXISTS `eta_reservation` (
                             `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
                             `meetingId` INTEGER NOT NULL,
-                            `reserveMillis` INTEGER NOT NULL,
-                            `isOpen` INTEGER NOT NULL
+                             `reserveMillis` INTEGER NOT NULL,
+                             `isOpen` INTEGER NOT NULL
                         )
                         """.trimIndent(),
                     )
+                    db.execSQL(
+                        """
+                        CREATE TABLE IF NOT EXISTS `eta_info_temp` (
+                            `meetingId` INTEGER PRIMARY KEY NOT NULL, 
+                            `mateId` INTEGER NOT NULL, 
+                            `mateEtas` TEXT NOT NULL
+                        )
+                        """.trimIndent(),
+                    )
+
+                    val cursor = db.query("SELECT * FROM eta_info")
+                    if (cursor.moveToFirst()) {
+                        do {
+                            val meetingId = cursor.getLong(cursor.getColumnIndexOrThrow("meetingId"))
+                            val mateId = cursor.getLong(cursor.getColumnIndexOrThrow("mateId"))
+                            val mateEtasJson = cursor.getString(cursor.getColumnIndexOrThrow("mateEtas"))
+
+                            val oldMateEtas: List<MateEta2> = OldMateEtaListTypeConverter().fromString(mateEtasJson) ?: emptyList()
+                            val newMateEtas =
+                                oldMateEtas.map { oldMateEta ->
+                                    MateEta(
+                                        mateId = oldMateEta.mateId,
+                                        nickname = oldMateEta.nickname,
+                                        etaStatus =
+                                            when (oldMateEta.etaType) {
+                                                EtaType2.ARRIVED -> EtaStatus.Arrived
+                                                EtaType2.ARRIVAL_SOON -> EtaStatus.ArrivalSoon(oldMateEta.durationMinute)
+                                                EtaType2.LATE_WARNING -> EtaStatus.LateWarning(oldMateEta.durationMinute)
+                                                EtaType2.LATE -> EtaStatus.Late(oldMateEta.durationMinute)
+                                                EtaType2.MISSING -> EtaStatus.Missing
+                                            },
+                                    )
+                                }
+
+                            val newMateEtasJson = MateEtaListTypeConverter().fromMateEta(newMateEtas)
+
+                            db.execSQL(
+                                "INSERT INTO eta_info_temp (meetingId, mateId, mateEtas) VALUES (?, ?, ?)",
+                                arrayOf(meetingId, mateId, newMateEtasJson),
+                            )
+                        } while (cursor.moveToNext())
+                    }
+
+                    cursor.close()
+                    db.execSQL("DROP TABLE eta_info")
+                    db.execSQL("ALTER TABLE eta_info_temp RENAME TO eta_info")
                 }
             }
 

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

@@ -8,7 +8,7 @@ import com.mulberry.ody.domain.model.MateEta
 @ProvidedTypeConverter
 class MateEtaListTypeConverter {
     @TypeConverter
-    fun fromString(value: String): List<MateEta>? {
+    fun fromString(value: String): List<MateEta> {
         return value.split(";").map { fromJson(it) }
     }
 
@@ -17,7 +17,7 @@ class MateEtaListTypeConverter {
         return type.joinToString(";") { toJson(it) }
     }
 
-    private fun toJson(mateEta: MateEta): String {
+    fun toJson(mateEta: MateEta): String {
         val etaStatusString =
             when (mateEta.etaStatus) {
                 is EtaStatus.Arrived -> """{type:"Arrived"}"""
@@ -38,7 +38,7 @@ class MateEtaListTypeConverter {
                     val (key, value) =
                         it.split(":", limit = 2)
                             .map { it.trim().removeSurrounding("\"") }
-                    key to value
+                    (key to value)
                 }
 
         val mateId = jsonObject["mateId"]!!.toLong()

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

@@ -0,0 +1,28 @@
+package com.mulberry.ody.data.local.entity.eta
+
+import androidx.room.ProvidedTypeConverter
+import androidx.room.TypeConverter
+import com.mulberry.ody.domain.model.MateEta2
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+
+@ProvidedTypeConverter
+class OldMateEtaListTypeConverter(
+    private val moshi: Moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build(),
+) {
+    @TypeConverter
+    fun fromString(value: String): List<MateEta2>? {
+        val listType = Types.newParameterizedType(List::class.java, MateEta2::class.java)
+        val adapter: JsonAdapter<List<MateEta2>> = moshi.adapter(listType)
+        return adapter.fromJson(value)
+    }
+
+    @TypeConverter
+    fun fromMateEta(type: List<MateEta2>): String {
+        val listType = Types.newParameterizedType(List::class.java, MateEta2::class.java)
+        val adapter: JsonAdapter<List<MateEta2>> = moshi.adapter(listType)
+        return adapter.toJson(type)
+    }
+}

android/app/src/main/java/com/mulberry/ody/data/local/repository/DefaultMatesEtaRepository.kt

@@ -64,8 +64,9 @@ class DefaultMatesEtaRepository
             matesEtaInfoDao.deleteAll()
         }
 
-        override suspend fun deleteEtaReservation(reservationId: Long) {
-            etaReservationDao.delete(reservationId)
+        override suspend fun deleteEtaReservation(meetingId: Long) {
+            etaDashboardAlarm.cancelByMeetingId(meetingId)
+            etaReservationDao.delete(meetingId)
         }
 
         override suspend fun clearEtaReservation(isReservationPending: Boolean) {
@@ -82,7 +83,7 @@ class DefaultMatesEtaRepository
             entities.forEach { entity ->
                 etaDashboardAlarm.reserve(
                     entity.meetingId,
-                    max(entity.reserveMillis, System.currentTimeMillis()),
+                    max(entity.reserveMillis, System.currentTimeMillis() + ETA_RESERVE_MILLIS_DELAY),
                     entity.isOpen,
                     entity.id,
                 )
@@ -92,6 +93,7 @@ class DefaultMatesEtaRepository
         private fun MateEtaInfoEntity.toMateEtaInfo(): MateEtaInfo = MateEtaInfo(mateId, mateEtas)
 
         companion object {
+            private const val ETA_RESERVE_MILLIS_DELAY = 3 * 1000
             private const val ETA_OPEN_MINUTE = 30L
             private const val ETA_CLOSE_MINUTE = 2L
         }

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

@@ -14,16 +14,17 @@ class EtaDashboardAlarm
         private val context: Context,
         private val alarmManager: AlarmManager,
     ) {
-        private val pendingIntents: MutableList<PendingIntent> = mutableListOf()
+        private val pendingIntents: MutableMap<AlarmId, PendingIntent> = mutableMapOf()
 
         fun reserve(
             meetingId: Long,
             reserveMillis: Long,
             isOpen: Boolean,
             reservationId: Long,
         ) {
+            val alarmId = AlarmId(meetingId, reservationId)
             val pendingIntent = createPendingIntent(meetingId, isOpen, reservationId)
-            reserveAlarm(reserveMillis, pendingIntent)
+            reserveAlarm(alarmId, pendingIntent, reserveMillis)
         }
 
         private fun createPendingIntent(
@@ -47,21 +48,30 @@ class EtaDashboardAlarm
 
         @SuppressLint("ScheduleExactAlarm")
         private fun reserveAlarm(
-            triggerAtMillis: Long,
+            alarmId: AlarmId,
             pendingIntent: PendingIntent,
+            triggerAtMillis: Long,
         ) {
-            pendingIntents.add(pendingIntent)
+            pendingIntents[alarmId] = pendingIntent
             alarmManager.setExactAndAllowWhileIdle(
                 AlarmManager.RTC_WAKEUP,
                 triggerAtMillis,
                 pendingIntent,
             )
         }
 
-        fun cancelAll() {
-            pendingIntents.forEach {
-                alarmManager.cancel(it)
+        fun cancelByMeetingId(meetingId: Long) {
+            val removePendingIntent = pendingIntents.filter { it.key.meetingId == meetingId }
+            removePendingIntent.forEach {
+                pendingIntents.remove(it.key)
+                alarmManager.cancel(it.value)
             }
+        }
+
+        fun cancelAll() {
+            pendingIntents.values.forEach { alarmManager.cancel(it) }
             pendingIntents.clear()
         }
     }
+
+private data class AlarmId(val meetingId: Long, val reservationId: Long)

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

@@ -1,21 +1,40 @@
 package com.mulberry.ody.data.remote.core.entity.notification.mapper
 
 import com.mulberry.ody.data.remote.core.entity.notification.response.NotificationLogsResponse
-import com.mulberry.ody.domain.model.LogType
 import com.mulberry.ody.domain.model.NotificationLog
+import com.mulberry.ody.domain.model.NotificationLogType
+import com.mulberry.ody.domain.model.NotificationLogType.DEFAULT
+import com.mulberry.ody.domain.model.NotificationLogType.DEPARTURE
+import com.mulberry.ody.domain.model.NotificationLogType.DEPARTURE_REMINDER
+import com.mulberry.ody.domain.model.NotificationLogType.ENTRY
+import com.mulberry.ody.domain.model.NotificationLogType.MEMBER_DELETION
+import com.mulberry.ody.domain.model.NotificationLogType.MEMBER_EXIT
+import com.mulberry.ody.domain.model.NotificationLogType.NUDGE
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
 fun NotificationLogsResponse.toNotificationList(): List<NotificationLog> =
     this.logList.map {
         NotificationLog(
-            type = LogType.from(it.type),
+            type = it.type.toNotificationLogType(),
             nickname = it.nickname,
             createdAt = it.createdAt.parseToLocalDateTime(),
             imageUrl = it.imageUrl,
         )
     }
 
+private fun String.toNotificationLogType(): NotificationLogType {
+    return when (this) {
+        "ENTRY" -> ENTRY
+        "DEPARTURE_REMINDER" -> DEPARTURE_REMINDER
+        "DEPARTURE" -> DEPARTURE
+        "MEMBER_DELETION" -> MEMBER_DELETION
+        "MEMBER_EXIT" -> MEMBER_EXIT
+        "NUDGE" -> NUDGE
+        else -> DEFAULT
+    }
+}
+
 private fun String.parseToLocalDateTime(): LocalDateTime {
     val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss")
     return LocalDateTime.parse(this, formatter)

android/app/src/main/java/com/mulberry/ody/data/remote/core/repository/DefaultMeetingRepository.kt

@@ -54,11 +54,16 @@ class DefaultMeetingRepository
             meetingId: Long,
             mateEtaInfo: MateEtaInfo,
         ): ApiResult<Unit> {
-            val mateEtaInfoEntity = MateEtaInfoEntity(meetingId, mateEtaInfo.userId, mateEtaInfo.mateEtas)
+            val mateEtaInfoEntity =
+                MateEtaInfoEntity(meetingId, mateEtaInfo.userId, mateEtaInfo.mateEtas)
             mateEtaInfoDao.upsert(mateEtaInfoEntity)
             return ApiResult.Success(Unit)
         }
 
         override suspend fun fetchMeetingCatalogs(): ApiResult<List<MeetingCatalog>> =
             service.fetchMeetingCatalogs().map { it.toMeetingCatalogs() }
+
+        override suspend fun exitMeeting(meetingId: Long): ApiResult<Unit> {
+            return service.exitMeeting(meetingId)
+        }
     }

android/app/src/main/java/com/mulberry/ody/data/remote/core/service/MeetingService.kt

@@ -9,6 +9,7 @@ import com.mulberry.ody.data.remote.core.entity.meeting.response.MeetingCreation
 import com.mulberry.ody.data.remote.core.entity.meeting.response.MeetingResponse
 import com.mulberry.ody.domain.apiresult.ApiResult
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.PATCH
 import retrofit2.http.POST
@@ -43,4 +44,9 @@ interface MeetingService {
     suspend fun postNudge(
         @Body nudgeRequest: NudgeRequest,
     ): ApiResult<Unit>
+
+    @DELETE("/meetings/{meetingId}/mate")
+    suspend fun exitMeeting(
+        @Path(value = "meetingId") meetingId: Long,
+    ): ApiResult<Unit>
 }

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

@@ -0,0 +1,9 @@
+package com.mulberry.ody.domain.model
+
+enum class EtaType2 {
+    LATE_WARNING,
+    ARRIVAL_SOON,
+    ARRIVED,
+    LATE,
+    MISSING,
+}

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

@@ -0,0 +1,8 @@
+package com.mulberry.ody.domain.model
+
+data class MateEta2(
+    val mateId: Long,
+    val nickname: String,
+    val etaType: EtaType2,
+    val durationMinute: Int,
+)

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

@@ -3,7 +3,7 @@ package com.mulberry.ody.domain.model
 import java.time.LocalDateTime
 
 data class NotificationLog(
-    val type: LogType,
+    val type: NotificationLogType,
     val nickname: String,
     val createdAt: LocalDateTime,
     val imageUrl: String,

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

@@ -0,0 +1,11 @@
+package com.mulberry.ody.domain.model
+
+enum class NotificationLogType {
+    ENTRY,
+    DEPARTURE_REMINDER,
+    DEPARTURE,
+    NUDGE,
+    MEMBER_DELETION,
+    MEMBER_EXIT,
+    DEFAULT,
+}

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

@@ -14,7 +14,7 @@ interface MatesEtaRepository {
 
     suspend fun clearEtaFetchingJob()
 
-    suspend fun deleteEtaReservation(reservationId: Long)
+    suspend fun deleteEtaReservation(meetingId: Long)
 
     suspend fun clearEtaReservation(isReservationPending: Boolean)
 

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

@@ -29,4 +29,6 @@ interface MeetingRepository {
     suspend fun fetchMeeting(meetingId: Long): ApiResult<Meeting>
 
     suspend fun postNudge(nudge: Nudge): ApiResult<Unit>
+
+    suspend fun exitMeeting(meetingId: Long): ApiResult<Unit>
 }

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

@@ -71,6 +71,11 @@ class MeetingRoomActivity :
                 showSnackBar(R.string.error_guide)
             }
         }
+        lifecycleScope.launch {
+            viewModel.expiredNudgeTimeLimit.collect {
+                showSnackBar(R.string.nudge_time_limit_expired)
+            }
+        }
         lifecycleScope.launch {
             viewModel.isLoading.collect { isLoading ->
                 if (isLoading) {