Merge pull request #60 from near-Contact-Reminder/qa/#58-qa_except_contact

[QA] 연락처 외 수정사항 반영

Author: rhkrwngud445

Near/app/build.gradle.kts

@@ -18,7 +18,7 @@ android {
         applicationId = "com.alarmy.near"
         minSdk = 27
         targetSdk = 35
-        versionCode = 3
+        versionCode = 4
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

Near/app/src/main/java/com/alarmy/near/data/mapper/FriendMapper.kt

@@ -13,6 +13,9 @@ import com.alarmy.near.network.response.AnniversaryEntity
 import com.alarmy.near.network.response.ContactFrequencyEntity
 import com.alarmy.near.network.response.FriendEntity
 import com.alarmy.near.utils.logger.NearLog
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.util.Locale
 
 fun FriendEntity.toModel(): Friend =
     Friend(
@@ -26,8 +29,25 @@ fun FriendEntity.toModel(): Friend =
         memo = memo,
         phone = phone,
         lastContactAt = lastContactAt,
+        isContactToday = lastContactAt?.isToday() ?: false,
+        lastContactFormat = lastContactAt?.contactFormat(),
     )
 
+fun String.contactFormat(): String {
+    val inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+    val outputFormatter = DateTimeFormatter.ofPattern("M월 d일")
+
+    val date = LocalDate.parse(this, inputFormatter)
+    return date.format(outputFormatter)
+}
+
+private fun String.isToday(): Boolean {
+    val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd", Locale.KOREA)
+    val targetDate = LocalDate.parse(this, formatter)
+    val today = LocalDate.now()
+    return targetDate == today
+}
+
 fun ContactFrequencyEntity.toModel(): ContactFrequency =
     ContactFrequency(
         reminderInterval = contactWeek.toReminderInterval(),
@@ -46,7 +66,7 @@ fun Friend.toRequest(): FriendRequest =
         name = name,
         relation = relation.toString(),
         contactFrequency = contactFrequency.toRequest(),
-        birthday = birthday,
+        birthday = birthday?.replace(".", "-"),
         anniversaryList = anniversaryList.map { it.toRequest() },
         memo = memo,
         phone = phone,

Near/app/src/main/java/com/alarmy/near/model/Friend.kt

@@ -22,17 +22,9 @@ data class Friend(
     val memo: String?,
     val phone: String?,
     val lastContactAt: String?, // "2025-07-16"
-) : Parcelable {
-    val isContactedToday: Boolean
-        get() = lastContactAt?.isToday() ?: false
-
-    private fun String.isToday(): Boolean {
-        val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd", Locale.KOREA)
-        val targetDate = LocalDate.parse(this, formatter)
-        val today = LocalDate.now()
-        return targetDate == today
-    }
-}
+    val lastContactFormat: String? = null, // 친구 상세에 쓰이는 포맷 TODO 추후 UI 모델 분리
+    val isContactToday: Boolean? = null, // 친구 상세에 쓰이는 포맷 TODO 추후 UI 모델 분리
+) : Parcelable
 
 @Serializable
 @Parcelize

Near/app/src/main/java/com/alarmy/near/presentation/feature/friendprofile/FriendProfileScreen.kt

@@ -21,7 +21,6 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import java.util.Locale
@@ -118,6 +117,10 @@ class FriendProfileViewModel
                                 friend =
                                     it.friend.copy(
                                         lastContactAt = getTodayDashFormat(),
+                                        lastContactFormat = it.friend.lastContactAt?.contactFormat(),
+                                        isContactToday =
+                                            it.friend.lastContactAt?.isToday()
+                                                ?: false,
                                     ),
                             )
                         }
@@ -146,4 +149,19 @@ class FriendProfileViewModel
                 _friendFlow.update { (it as FriendState.Success).copy(friend = friend) }
             }
         }
+
+        fun String.contactFormat(): String {
+            val inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
+            val outputFormatter = DateTimeFormatter.ofPattern("M월 d일")
+
+            val date = LocalDate.parse(this, inputFormatter)
+            return date.format(outputFormatter)
+        }
+
+        private fun String.isToday(): Boolean {
+            val formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd", Locale.KOREA)
+            val targetDate = LocalDate.parse(this, formatter)
+            val today = LocalDate.now()
+            return targetDate == today
     }
+}

Near/app/src/main/java/com/alarmy/near/presentation/feature/friendprofile/FriendProfileViewModel.kt

@@ -576,7 +576,7 @@ fun FriendProfileEditorScreen(
                         style = NearTheme.typography.B2_14_MEDIUM,
                         color = NearTheme.colors.GRAY01_888888,
                     )
-                    Spacer(modifier = Modifier.width(23.dp))
+                    Spacer(modifier = Modifier.width(62.dp))
                     NearLimitedTextField(
                         modifier =
                             Modifier

Near/app/src/main/java/com/alarmy/near/presentation/feature/friendprofileedittor/FriendProfileEditorScreen.kt

@@ -202,6 +202,6 @@ class FriendProfileEditorViewModel
 
         companion object {
             private const val MAX_NAME_LENGTH = 20
-            private const val MAX_MEMO_LENGTH = 200
+            private const val MAX_MEMO_LENGTH = 100
         }
     }

Near/app/src/main/java/com/alarmy/near/presentation/feature/friendprofileedittor/FriendProfileEditorViewModel.kt

@@ -52,7 +52,7 @@ fun FriendProfileEditorUIState.toModel(
         relation = relation,
         contactFrequency =
         contactFrequency,
-        birthday = birthday.value?.replace(".", "-"),
+        birthday = birthday.value?.replace("-", "."),
         anniversaryList =
             anniversaries.map {
                 Anniversary(