🔀 :: (#304) API 로직 수정

common/extension/src/main/java/com/idiotfrogs/extension/LocalDateTimeExtension.kt

@@ -1,6 +1,7 @@
 package com.idiotfrogs.extension
 
 import kotlinx.datetime.DayOfWeek
+import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.number
@@ -14,6 +15,9 @@ fun LocalDateTime?.toYearMonthDay(): String =
 fun LocalDateTime?.toYearMonthDayWeek(): String =
     "${this?.year}. ${this?.month?.number.toString().padStart(2, '0')}. ${this?.day.toString().padStart(2, '0')}. ${this?.dayOfWeek?.toKoreanShort()}"
 
+fun LocalDate?.toYearMonthDayWeek(): String =
+    "${this?.year}. ${this?.month?.number.toString().padStart(2, '0')}. ${this?.day.toString().padStart(2, '0')}. ${this?.dayOfWeek?.toKoreanShort()}"
+
 @OptIn(ExperimentalTime::class)
 fun LocalDateTime?.toDday(): String {
     val today = Clock.System.todayIn(TimeZone.of("Asia/Seoul"))
@@ -45,4 +49,18 @@ private fun DayOfWeek.toKoreanShort(): String = when (this) {
     DayOfWeek.FRIDAY -> "(금)"
     DayOfWeek.SATURDAY -> "(토)"
     DayOfWeek.SUNDAY -> "(일)"
-}
+}
+
+@OptIn(ExperimentalTime::class)
+fun LocalDate?.toOpenRemainingText(): String {
+    if (this == null) return "묻기 전"
+
+    val today = Clock.System.todayIn(TimeZone.of("Asia/Seoul"))
+    val diff = toEpochDays() - today.toEpochDays()
+
+    return when {
+        diff > 0L -> "오픈까지 ${diff}일 남음"
+        diff == 0L -> "오픈 당일"
+        else -> "오픈"
+    }
+}

core/model/src/main/java/com/idiotfrogs/model/timecapsule/BuryTimeCapsuleRequest.kt

@@ -1,9 +1,9 @@
 package com.idiotfrogs.model.timecapsule
 
-import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.LocalDate
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class BuryTimeCapsuleRequest(
-    val openedAt: LocalDateTime,
+    val openedAt: LocalDate,
 )

core/model/src/main/java/com/idiotfrogs/model/timecapsule/MyTimeCapsuleResponse.kt

@@ -1,12 +1,14 @@
 package com.idiotfrogs.model.timecapsule
 
+import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalDateTime
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class MyTimeCapsuleResponse(
     val timeCapsuleId: Long,
     val title: String,
+    val openedAt: LocalDate? = null,
     val createdAt: LocalDateTime,
     val mainImageUrl: String,
     val timeCapsuleStatus: TimeCapsuleStatus,

core/model/src/main/java/com/idiotfrogs/model/timecapsule/TimeCapsuleCreateResponse.kt

@@ -1,14 +1,14 @@
 package com.idiotfrogs.model.timecapsule
 
-import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.LocalDate
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class TimeCapsuleCreateResponse(
     val id: Long,
     val title: String,
     val description: String?,
-    val openedAt: LocalDateTime?,
+    val openedAt: LocalDate?,
     val timeCapsuleStatus: String,
     val mainImageUrl: String
 )

core/model/src/main/java/com/idiotfrogs/model/timecapsule/TimeCapsuleResponse.kt

@@ -1,15 +1,16 @@
 package com.idiotfrogs.model.timecapsule
 
+import kotlinx.datetime.LocalDate
 import kotlinx.datetime.LocalDateTime
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class TimeCapsuleResponse(
     val title: String,
     val description: String?,
-    val buriedAt: LocalDateTime?,
+    val buriedAt: LocalDate?,
     val createdAt: LocalDateTime,
-    val openedAt: LocalDateTime?,
+    val openedAt: LocalDate?,
     val mainImageUrl: String,
     val timeCapsuleStatus: TimeCapsuleStatus,
     val userRole: TimeCapsuleRole,

core/network/src/main/java/com/idiotfrogs/network/service/TimeCapsuleService.kt

@@ -4,7 +4,6 @@ import com.idiotfrogs.model.timecapsule.BuryTimeCapsuleRequest
 import com.idiotfrogs.model.timecapsule.CapsuleContentsData
 import com.idiotfrogs.model.timecapsule.MyCapsuleContentsData
 import com.idiotfrogs.model.timecapsule.MyTimeCapsuleResponse
-import com.idiotfrogs.model.timecapsule.ProcessCollaboratorRequest
 import com.idiotfrogs.model.timecapsule.PendingCollaboratorsRequest
 import com.idiotfrogs.model.timecapsule.TimeCapsuleCollaboratorsResponse
 import com.idiotfrogs.model.timecapsule.TimeCapsuleContentResponse
@@ -58,12 +57,6 @@ interface TimeCapsuleService {
     @POST("time-capsules/join-request")
     suspend fun requestCollaborator(@Body body: PendingCollaboratorsRequest)
 
-    @POST("time-capsules/request/{requestId}/process")
-    suspend fun processRequest(
-        @Path("requestId") requestId: Long,
-        @Body body: ProcessCollaboratorRequest
-    )
-
     @PUT("time-capsules/{capsuleId}/bury")
     suspend fun buryTimeCapsule(
         @Path("capsuleId") capsuleId: Long,

data/src/main/java/com/idiotfrogs/data/datasource/timecapsule/TimeCapsuleDataSource.kt

@@ -5,7 +5,6 @@ import com.idiotfrogs.model.timecapsule.CapsuleContentsData
 import com.idiotfrogs.model.timecapsule.MyCapsuleContentsData
 import com.idiotfrogs.model.timecapsule.MyTimeCapsuleResponse
 import com.idiotfrogs.model.timecapsule.PendingCollaboratorsRequest
-import com.idiotfrogs.model.timecapsule.ProcessCollaboratorRequest
 import com.idiotfrogs.model.timecapsule.TimeCapsuleCollaboratorsResponse
 import com.idiotfrogs.model.timecapsule.TimeCapsuleContentResponse
 import com.idiotfrogs.model.timecapsule.TimeCapsuleCreateRequest
@@ -39,8 +38,6 @@ interface TimeCapsuleDataSource {
 
     suspend fun requestCollaborator(body: PendingCollaboratorsRequest)
 
-    suspend fun processRequest(requestId: Long, body: ProcessCollaboratorRequest)
-
     suspend fun buryTimeCapsule(
         capsuleId: Long,
         body: BuryTimeCapsuleRequest

data/src/main/java/com/idiotfrogs/data/datasource/timecapsule/TimeCapsuleDataSourceImpl.kt

@@ -5,7 +5,6 @@ import com.idiotfrogs.model.timecapsule.CapsuleContentsData
 import com.idiotfrogs.model.timecapsule.MyCapsuleContentsData
 import com.idiotfrogs.model.timecapsule.MyTimeCapsuleResponse
 import com.idiotfrogs.model.timecapsule.PendingCollaboratorsRequest
-import com.idiotfrogs.model.timecapsule.ProcessCollaboratorRequest
 import com.idiotfrogs.model.timecapsule.TimeCapsuleCollaboratorsResponse
 import com.idiotfrogs.model.timecapsule.TimeCapsuleContentResponse
 import com.idiotfrogs.model.timecapsule.TimeCapsuleCreateRequest
@@ -62,10 +61,6 @@ class TimeCapsuleDataSourceImpl @Inject constructor(
         return timeCapsuleService.requestCollaborator(body)
     }
 
-    override suspend fun processRequest(requestId: Long, body: ProcessCollaboratorRequest) {
-        return timeCapsuleService.processRequest(requestId , body)
-    }
-
     override suspend fun buryTimeCapsule(
         capsuleId: Long,
         body: BuryTimeCapsuleRequest

data/src/main/java/com/idiotfrogs/data/repository/timecapsule/TimeCapsuleRepository.kt

@@ -5,7 +5,6 @@ import com.idiotfrogs.model.timecapsule.CapsuleContentsData
 import com.idiotfrogs.model.timecapsule.MyTimeCapsuleResponse
 import com.idiotfrogs.model.timecapsule.MyCapsuleContentsData
 import com.idiotfrogs.model.timecapsule.PendingCollaboratorsRequest
-import com.idiotfrogs.model.timecapsule.ProcessCollaboratorRequest
 import com.idiotfrogs.model.timecapsule.TimeCapsuleCollaboratorsResponse
 import com.idiotfrogs.model.timecapsule.TimeCapsuleContentResponse
 import com.idiotfrogs.model.timecapsule.TimeCapsuleCreateRequest
@@ -38,8 +37,6 @@ interface TimeCapsuleRepository {
 
     suspend fun requestCollaborator(body: PendingCollaboratorsRequest)
 
-    suspend fun processRequest(requestId: Long, body: ProcessCollaboratorRequest)
-
     suspend fun buryTimeCapsule(
         capsuleId: Long,
         body: BuryTimeCapsuleRequest

data/src/main/java/com/idiotfrogs/data/repository/timecapsule/TimeCapsuleRepositoryImpl.kt

@@ -6,7 +6,6 @@ import com.idiotfrogs.model.timecapsule.CapsuleContentsData
 import com.idiotfrogs.model.timecapsule.MyTimeCapsuleResponse
 import com.idiotfrogs.model.timecapsule.MyCapsuleContentsData
 import com.idiotfrogs.model.timecapsule.PendingCollaboratorsRequest
-import com.idiotfrogs.model.timecapsule.ProcessCollaboratorRequest
 import com.idiotfrogs.model.timecapsule.TimeCapsuleCollaboratorsResponse
 import com.idiotfrogs.model.timecapsule.TimeCapsuleContentResponse
 import com.idiotfrogs.model.timecapsule.TimeCapsuleCreateRequest
@@ -76,10 +75,6 @@ class TimeCapsuleRepositoryImpl @Inject constructor(
         return timeCapsuleDataSource.requestCollaborator(body)
     }
 
-    override suspend fun processRequest(requestId: Long, body: ProcessCollaboratorRequest) {
-        return timeCapsuleDataSource.processRequest(requestId, body)
-    }
-
     override suspend fun buryTimeCapsule(
         capsuleId: Long,
         body: BuryTimeCapsuleRequest

data/src/main/java/com/idiotfrogs/data/repository/user/UserRepository.kt

@@ -2,7 +2,6 @@ package com.idiotfrogs.data.repository.user
 
 import com.idiotfrogs.model.user.ProfileResponse
 import com.idiotfrogs.model.user.UserResponse
-import com.idiotfrogs.model.user.UserUpdateRequest
 import java.io.File
 
 interface UserRepository {

feature/detail/src/main/java/com/idiotfrogs/detail/DetailScreen.kt

@@ -167,7 +167,7 @@ fun DetailScreen(
             confirmText = "묻기",
             cancelText = "취소",
             onConfirm = {
-                onAction(DetailAction.BuryConfirmClicked(selectedOpenAt))
+                onAction(DetailAction.BuryConfirmClicked(selectedOpenAt.date))
                 showBuryDialog = false
             },
             onCancel = { showBuryDialog = false },

feature/detail/src/main/java/com/idiotfrogs/detail/DetailViewModel.kt

@@ -17,7 +17,7 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.async
-import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.LocalDate
 import org.orbitmvi.orbit.Container
 import org.orbitmvi.orbit.viewmodel.container
 
@@ -75,7 +75,7 @@ class DetailViewModel @AssistedInject constructor(
         }
     }
 
-    private fun buryTimeCapsule(openedAt: LocalDateTime) {
+    private fun buryTimeCapsule(openedAt: LocalDate) {
         safeLaunch {
             intent { reduce { state.copy(isLoading = true) } }
 
@@ -148,7 +148,7 @@ sealed interface DetailAction {
     data class ManagementClicked(val id: Long, val title: String) : DetailAction
     data class PreviewClicked(val id: Long) : DetailAction
     data object BackClicked : DetailAction
-    data class BuryConfirmClicked(val openedAt: LocalDateTime) : DetailAction
+    data class BuryConfirmClicked(val openedAt: LocalDate) : DetailAction
 }
 
 sealed interface DetailSideEffect {