[FEATURE] 친구 프로필 api 연동

Near/app/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.hilt.application)
     alias(libs.plugins.kotlin.kapt)
     alias(libs.plugins.kotlin.serialization)
+    alias(libs.plugins.kotlin.parcelize)
 }
 
 android {

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

@@ -1,21 +1,64 @@
 package com.alarmy.near.data.mapper
 
+import com.alarmy.near.model.Anniversary
 import com.alarmy.near.model.ContactFrequency
-import com.alarmy.near.model.FriendSummary
+import com.alarmy.near.model.Friend
+import com.alarmy.near.model.Relation
+import com.alarmy.near.model.ReminderInterval
+import com.alarmy.near.network.request.AnniversaryRequest
+import com.alarmy.near.network.request.ContactFrequencyRequest
+import com.alarmy.near.network.request.FriendRequest
+import com.alarmy.near.network.response.AnniversaryEntity
+import com.alarmy.near.network.response.ContactFrequencyEntity
 import com.alarmy.near.network.response.FriendEntity
 
-fun FriendEntity.toModel(): FriendSummary =
-    FriendSummary(
-        id = friendId,
+fun FriendEntity.toModel(): Friend =
+    Friend(
+        friendId = friendId,
+        imageUrl = imageUrl,
+        relation = Relation.valueOf(relation),
         name = name,
-        profileImageUrl = imageUrl,
-        lastContactedAt = lastContactAt,
-        isContacted = true,
-        contactFrequency =
-            when (checkRate) {
-                in 0..29 -> ContactFrequency.LOW
-                in 30..69 -> ContactFrequency.MIDDLE
-                in 70..100 -> ContactFrequency.HIGH
-                else -> ContactFrequency.LOW
-        },
-            )
+        contactFrequency = contactFrequency.toModel(),
+        birthday = birthday,
+        anniversaryList = anniversaryList.map { it.toModel() },
+        memo = memo,
+        phone = phone,
+        lastContactAt = lastContactAt,
+    )
+
+fun ContactFrequencyEntity.toModel(): ContactFrequency =
+    ContactFrequency(
+        reminderInterval = ReminderInterval.valueOf(contactWeek),
+        dayOfWeek = dayOfWeek,
+    )
+
+fun AnniversaryEntity.toModel(): Anniversary =
+    Anniversary(
+        id = id,
+        title = title,
+        date = date,
+    )
+
+fun Friend.toRequest(): FriendRequest =
+    FriendRequest(
+        name = name,
+        relation = relation.toString(),
+        contactFrequency = contactFrequency.toRequest(),
+        birthday = birthday,
+        anniversaryList = anniversaryList.map { it.toRequest() },
+        memo = memo,
+        phone = phone,
+    )
+
+fun ContactFrequency.toRequest(): ContactFrequencyRequest =
+    ContactFrequencyRequest(
+        contactWeek = reminderInterval.toString(),
+        dayOfWeek = dayOfWeek,
+    )
+
+fun Anniversary.toRequest(): AnniversaryRequest =
+    AnniversaryRequest(
+        id = id,
+        title = title,
+        date = date,
+    )

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

@@ -0,0 +1,20 @@
+package com.alarmy.near.data.mapper
+
+import com.alarmy.near.model.FriendRecord
+import com.alarmy.near.network.response.FriendRecordEntity
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+fun FriendRecordEntity.toModel(): FriendRecord =
+    FriendRecord(
+        isChecked = isChecked,
+        createdAt = createdAt.toShortDate(),
+    )
+
+private fun String.toShortDate(): String {
+    val inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+    val outputFormatter = DateTimeFormatter.ofPattern("yy.MM.dd")
+
+    val dateTime = LocalDateTime.parse(this, inputFormatter)
+    return dateTime.format(outputFormatter)
+}

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

@@ -0,0 +1,21 @@
+package com.alarmy.near.data.mapper
+
+import com.alarmy.near.model.friendsummary.ContactFrequencyLevel
+import com.alarmy.near.model.friendsummary.FriendSummary
+import com.alarmy.near.network.response.FriendSummaryEntity
+
+fun FriendSummaryEntity.toModel(): FriendSummary =
+    FriendSummary(
+        id = friendId,
+        name = name,
+        profileImageUrl = imageUrl,
+        lastContactedAt = lastContactAt,
+        isContacted = true,
+        contactFrequencyLevel =
+            when (checkRate) {
+                in 0..29 -> ContactFrequencyLevel.LOW
+                in 30..69 -> ContactFrequencyLevel.MIDDLE
+                in 70..100 -> ContactFrequencyLevel.HIGH
+                else -> ContactFrequencyLevel.LOW
+            },
+    )

Near/app/src/main/java/com/alarmy/near/data/repository/DefaultFriendRepository.kt

@@ -1,7 +1,10 @@
 package com.alarmy.near.data.repository
 
 import com.alarmy.near.data.mapper.toModel
-import com.alarmy.near.model.FriendSummary
+import com.alarmy.near.data.mapper.toRequest
+import com.alarmy.near.model.Friend
+import com.alarmy.near.model.FriendRecord
+import com.alarmy.near.model.friendsummary.FriendSummary
 import com.alarmy.near.model.monthly.MonthlyFriend
 import com.alarmy.near.network.service.FriendService
 import kotlinx.coroutines.flow.Flow
@@ -30,4 +33,34 @@ class DefaultFriendRepository
                     },
                 )
             }
+
+        override fun fetchFriendById(friendId: String): Flow<Friend> =
+            flow {
+                emit(friendService.fetchFriendById(friendId).toModel())
+            }
+
+        override fun updateFriend(
+            friendId: String,
+            friend: Friend,
+        ): Flow<Friend> =
+            flow {
+                emit(friendService.updateFriend(friendId, friend.toRequest()).toModel())
+            }
+
+        override fun deleteFriend(friendId: String): Flow<Unit> =
+            flow {
+                friendService.deleteFriend(friendId)
+                emit(Unit)
+            }
+
+        override fun fetchFriendRecord(friendId: String): Flow<List<FriendRecord>> =
+            flow {
+                emit(friendService.fetchFriendRecord(friendId).map { it.toModel() })
+            }
+
+        override fun recordContact(friendId: String): Flow<String> =
+            flow {
+                val response = friendService.recordContact(friendId)
+                emit(response.message) // CommonMessageEntity.message 라고 가정
+            }
     }

Near/app/src/main/java/com/alarmy/near/data/repository/FriendRepository.kt

@@ -1,11 +1,26 @@
 package com.alarmy.near.data.repository
 
-import com.alarmy.near.model.FriendSummary
+import com.alarmy.near.model.Friend
+import com.alarmy.near.model.FriendRecord
+import com.alarmy.near.model.friendsummary.FriendSummary
 import com.alarmy.near.model.monthly.MonthlyFriend
 import kotlinx.coroutines.flow.Flow
 
 interface FriendRepository {
     fun fetchFriends(): Flow<List<FriendSummary>>
 
     fun fetchMonthlyFriends(): Flow<List<MonthlyFriend>>
+
+    fun fetchFriendById(friendId: String): Flow<Friend>
+
+    fun updateFriend(
+        friendId: String,
+        friend: Friend,
+    ): Flow<Friend>
+
+    fun deleteFriend(friendId: String): Flow<Unit>
+
+    fun fetchFriendRecord(friendId: String): Flow<List<FriendRecord>>
+
+    fun recordContact(friendId: String): Flow<String>
 }

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

@@ -0,0 +1,48 @@
+package com.alarmy.near.model
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.util.Locale
+
+@Parcelize
+@Serializable
+data class Friend(
+    val friendId: String,
+    val imageUrl: String?,
+    val relation: Relation,
+    val name: String,
+    val contactFrequency: ContactFrequency,
+    val birthday: String?,
+    val anniversaryList: List<Anniversary>,
+    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
+    }
+}
+
+@Serializable
+@Parcelize
+data class ContactFrequency(
+    val reminderInterval: ReminderInterval,
+    val dayOfWeek: String,
+) : Parcelable
+
+@Serializable
+@Parcelize
+data class Anniversary(
+    val id: Int? = null,
+    val title: String,
+    val date: String? = null,
+) : Parcelable

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

@@ -0,0 +1,6 @@
+package com.alarmy.near.model
+
+data class FriendRecord(
+    val isChecked: Boolean,
+    val createdAt: String, // ex) 25.11.12
+)

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

@@ -1,7 +1,12 @@
 package com.alarmy.near.model
 
-enum class Relation {
-    FRIEND,
-    FAMILY,
-    ACQUAINTANCE,
+import androidx.annotation.StringRes
+import com.alarmy.near.R
+
+enum class Relation(
+    @param:StringRes val resId: Int,
+) {
+    FRIEND(R.string.relation_friend),
+    FAMILY(R.string.relation_family),
+    ACQUAINTANCE(R.string.relation_acquaintance),
 }

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

@@ -6,9 +6,9 @@ import com.alarmy.near.R
 enum class ReminderInterval(
     @param:StringRes val labelRes: Int,
 ) {
-    DAILY(R.string.reminder_interval_daily), // 매일
-    WEEKLY(R.string.reminder_interval_weekly), // 매주
-    BIWEEKLY(R.string.reminder_interval_biweekly), // 2주
-    MONTHLY(R.string.reminder_interval_monthly), // 매달
-    SEMIANNUAL(R.string.reminder_interval_semiannual), // 6개월
+    EVERY_DAY(R.string.reminder_interval_daily),
+    EVERY_WEEK(R.string.reminder_interval_weekly),
+    EVERY_TWO_WEEK(R.string.reminder_interval_biweekly),
+    EVERY_MONTH(R.string.reminder_interval_monthly),
+    EVERY_SIX_MONTH(R.string.reminder_interval_semiannual),
 }

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

@@ -0,0 +1,7 @@
+package com.alarmy.near.model.friendsummary
+
+enum class ContactFrequencyLevel {
+    LOW,
+    MIDDLE,
+    HIGH,
+}

Near/app/src/main/java/com/alarmy/near/model/FriendSummary.kt → Near/app/src/main/java/com/alarmy/near/model/friendsummary/FriendSummary.kt

@@ -1,4 +1,4 @@
-package com.alarmy.near.model
+package com.alarmy.near.model.friendsummary
 
 import androidx.compose.runtime.Immutable
 
@@ -9,5 +9,5 @@ data class FriendSummary(
     val profileImageUrl: String?,
     val lastContactedAt: String?,
     val isContacted: Boolean,
-    val contactFrequency: ContactFrequency,
+    val contactFrequencyLevel: ContactFrequencyLevel,
 )

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

@@ -3,6 +3,7 @@ package com.alarmy.near.model.monthly
 import androidx.annotation.DrawableRes
 import com.alarmy.near.R
 
+// TODO Drawable Res UI-Layer 이동
 enum class MonthlyFriendType(
     @param:DrawableRes val imageSrc: Int,
 ) {

Near/app/src/main/java/com/alarmy/near/network/request/FriendRequest.kt

@@ -0,0 +1,27 @@
+package com.alarmy.near.network.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FriendRequest(
+    val name: String,
+    val relation: String,
+    val contactFrequency: ContactFrequencyRequest,
+    val birthday: String?,
+    val anniversaryList: List<AnniversaryRequest>,
+    val memo: String?,
+    val phone: String?,
+)
+
+@Serializable
+data class ContactFrequencyRequest(
+    val contactWeek: String,
+    val dayOfWeek: String,
+)
+
+@Serializable
+data class AnniversaryRequest(
+    val id: Int? = null,
+    val title: String,
+    val date: String? = null,
+)

Near/app/src/main/java/com/alarmy/near/network/response/CommonMessageEntity.kt

@@ -0,0 +1,8 @@
+package com.alarmy.near.network.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CommonMessageEntity(
+    val message: String,
+)