[Feature/#79] 캘린더 팝업 약속 조회 API 연결

core/src/main/java/com/sopt/core/util/time/CalculateTimeFromLocalDate.kt

@@ -0,0 +1,16 @@
+package com.sopt.core.util.time
+
+import java.time.LocalDate
+import java.time.format.TextStyle
+import java.util.Locale
+
+class CalculateTimeFromLocalDate {
+    // ex) 1월 1일 (월)
+    fun formatLocalDateWithDay(localDate: LocalDate): String {
+        val month = localDate.monthValue
+        val day = localDate.dayOfMonth
+        val dayOfWeek = localDate.dayOfWeek.getDisplayName(TextStyle.SHORT, Locale.KOREAN)
+
+        return "${month}월 ${day}일 ($dayOfWeek)"
+    }
+}

core/src/main/java/com/sopt/core/util/CalculateTime.kt → core/src/main/java/com/sopt/core/util/time/CalculateTimeFromString.kt

@@ -1,11 +1,11 @@
-package com.sopt.core.util
+package com.sopt.core.util.time
 
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.time.format.TextStyle
 import java.util.Locale
 
-class CalculateTime {
+class CalculateTimeFromString {
     // ex) 09/07
     fun extractFullDateWithSlash(dateTime: String): String {
         return parseDateTime(dateTime).toLocalDate().format(DateTimeFormatter.ofPattern("MM/dd"))

core/src/main/java/com/sopt/core/util/timetable/TimeTable.kt

@@ -5,7 +5,7 @@ import androidx.compose.ui.graphics.Color
 import com.sopt.core.designsystem.theme.NoostakTheme
 import com.sopt.core.type.AvailabilityLevel
 import com.sopt.core.type.CellType
-import com.sopt.core.util.CalculateTime
+import com.sopt.core.util.time.CalculateTimeFromString
 import com.sopt.domain.entity.AppointmentMembersInfoEntity
 import com.sopt.domain.entity.TimeEntity
 
@@ -138,8 +138,8 @@ class TimeTable {
     }
 
     private fun formatDateTimeToCustomFormat(dateTime: String): String {
-        val dayOfWeek = CalculateTime().extractDayOfWeek(dateTime)
-        val date = CalculateTime().extractDateWithSlash(dateTime)
+        val dayOfWeek = CalculateTimeFromString().extractDayOfWeek(dateTime)
+        val date = CalculateTimeFromString().extractDateWithSlash(dateTime)
         return "$dayOfWeek\n$date"
     }
 

data/src/main/java/com/sopt/data/mapper/ResponseGetConfirmedDtoMapper.kt

@@ -6,6 +6,7 @@ import com.sopt.domain.entity.IdentityEntity
 
 fun ResponseGetOptionDetailDto.toAppointmentDetailEntity() = AppointmentDetailEntity(
     myIdentity = myInfo?.toIdentityEntity() ?: IdentityEntity("unavailable", -1, "나"),
+    appointmentName = appointmentName,
     date = appointmentTime.date,
     startTime = appointmentTime.startTime,
     endTime = appointmentTime.endTime,

data/src/main/java/com/sopt/data/mapper/ResponseGetGroupConfirmedDetailDtoMapper.kt

@@ -10,6 +10,7 @@ fun ResponseGetGroupConfirmedDetailDto.toConfirmedDetailEntity() = ConfirmedDeta
         position = myInfo.position,
         name = myInfo.name
     ),
+    appointmentName = appointmentName,
     date = appointmentTime.date,
     startTime = appointmentTime.startTime,
     endTime = appointmentTime.endTime,

domain/src/main/java/com/sopt/domain/entity/AppointmentDetailEntity.kt

@@ -2,12 +2,13 @@ package com.sopt.domain.entity
 
 data class AppointmentDetailEntity(
     val myIdentity: IdentityEntity,
-    val date: String,
-    val startTime: String,
-    val endTime: String,
-    val category: String,
-    val availableMembersCount: Int,
+    val appointmentName: String = "",
+    val date: String = "",
+    val startTime: String = "",
+    val endTime: String = "",
+    val category: String = "",
+    val availableMembersCount: Int = 0,
     val availableMembers: List<String>,
-    val unavailableMembersCount: Int,
+    val unavailableMembersCount: Int = 0,
     val unavailableMembers: List<String>
 )

domain/src/main/java/com/sopt/domain/entity/ConfirmedDetailEntity.kt

@@ -2,6 +2,7 @@ package com.sopt.domain.entity
 
 data class ConfirmedDetailEntity(
     val myIdentity: IdentityEntity,
+    val appointmentName: String = "",
     val date: String,
     val startTime: String,
     val endTime: String,

domain/src/main/java/com/sopt/domain/entity/ScheduleEntity.kt

@@ -1,7 +1,9 @@
 package com.sopt.domain.entity
 
+import java.time.LocalDate
+
 data class ScheduleEntity(
     val groupId: Long = -1,
-    val date: String, // M월 D일 (E) - ex) 1월 13일 (월)
+    val date: LocalDate,
     val scheduleList: List<CalendarAppointmentEntity>
 )

presentation/src/main/java/com/sopt/presentation/appointment/appointmentConfirm/AppointmentConfirmRoute.kt

@@ -39,8 +39,8 @@ import com.sopt.core.designsystem.theme.NoostakAndroidTheme
 import com.sopt.core.designsystem.theme.NoostakTheme
 import com.sopt.core.extension.showIf
 import com.sopt.core.state.UiState
-import com.sopt.core.util.CalculateTime
 import com.sopt.core.util.RearrangeList
+import com.sopt.core.util.time.CalculateTimeFromString
 import com.sopt.domain.entity.AppointmentDetailEntity
 import com.sopt.domain.entity.IdentityEntity
 import com.sopt.presentation.R
@@ -104,7 +104,7 @@ fun AppointmentConfirmRoute(
             )
         }
 
-        else -> {}
+        else -> Unit
     }
 
     if (showErrorDialog.first) {
@@ -131,7 +131,7 @@ fun AppointmentConfirmScreen(
     onConfirmButtonClick: (Long) -> Unit,
     data: AppointmentDetailEntity
 ) {
-    val calculateTime = CalculateTime()
+    val calculateTime = CalculateTimeFromString()
     val date = calculateTime.extractDateWithKorean(data.date)
     val dayOfWeek = calculateTime.extractDayOfWeekWithBraces(data.date)
     val startHour = calculateTime.extractHourWithZero(data.startTime)

presentation/src/main/java/com/sopt/presentation/appointment/screen/RecommendationScreen.kt

@@ -41,8 +41,8 @@ import com.sopt.core.designsystem.theme.NoostakAndroidTheme
 import com.sopt.core.designsystem.theme.NoostakTheme
 import com.sopt.core.extension.noRippleClickable
 import com.sopt.core.extension.showIf
-import com.sopt.core.util.CalculateTime
 import com.sopt.core.util.RearrangeList
+import com.sopt.core.util.time.CalculateTimeFromString
 import com.sopt.domain.entity.IdentityEntity
 import com.sopt.domain.entity.OptionEntity
 import com.sopt.domain.entity.RecommendationPriorityEntity
@@ -114,7 +114,7 @@ fun RecommendationItem(
         }
     }
     val (isLiked, likes) = likeState
-    val calculateTime = CalculateTime()
+    val calculateTime = CalculateTimeFromString()
     val date = calculateTime.extractDateWithKorean(data.date)
     val dayOfWeek = calculateTime.extractDayOfWeekWithBraces(data.date)
     val startHour = calculateTime.extractHourWithZero(data.startTime)

presentation/src/main/java/com/sopt/presentation/calendar/CalendarRoute.kt

@@ -1,5 +1,6 @@
 package com.sopt.presentation.calendar
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -17,7 +18,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableLongStateOf
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -32,15 +36,20 @@ import androidx.navigation.compose.rememberNavController
 import com.sopt.core.designsystem.component.bottomsheet.NoostakBottomSheet
 import com.sopt.core.designsystem.component.calendar.WeekDaysHeader
 import com.sopt.core.designsystem.component.calendar.YearMonthHeader
+import com.sopt.core.designsystem.component.dialog.NoostakDialog
 import com.sopt.core.designsystem.component.topappbar.NoostakLogoAppBar
+import com.sopt.core.designsystem.screen.NoostakLoadingScreen
 import com.sopt.core.designsystem.theme.NoostakAndroidTheme
 import com.sopt.core.designsystem.theme.NoostakTheme
 import com.sopt.core.extension.getYearMonthByPage
 import com.sopt.core.extension.initialPage
 import com.sopt.core.extension.pageCount
 import com.sopt.core.state.UiState
+import com.sopt.core.type.DialogType
+import com.sopt.domain.entity.CalendarAppointmentEntity
 import com.sopt.domain.entity.CalendarSchedule
 import com.sopt.domain.entity.GroupEntity
+import com.sopt.domain.entity.ScheduleEntity
 import com.sopt.presentation.R
 import com.sopt.presentation.calendar.component.CalendarFloatingActionDialog
 import com.sopt.presentation.calendar.component.CalendarGroup
@@ -49,6 +58,7 @@ import com.sopt.presentation.calendar.component.bottomsheet.ScheduleListScreen
 import java.time.LocalDate
 import java.time.YearMonth
 
+@SuppressLint("StateFlowValueCalledInComposition")
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun CalendarRoute(
@@ -58,10 +68,14 @@ fun CalendarRoute(
     navigateToGroupEnter: () -> Unit,
     navigateToAppointmentCreate: (Long) -> Unit
 ) {
+    val navController = rememberNavController()
+
     val getGroupsState by calendarViewModel.getGroupsState.collectAsStateWithLifecycle()
+    val getConfirmedDetailState by calendarViewModel.getConfirmedDetailState.collectAsStateWithLifecycle()
+
     val showAddDialog by calendarViewModel.showAddDialog.collectAsStateWithLifecycle()
     val showBottomSheet by calendarViewModel.showBottomSheet.collectAsStateWithLifecycle()
-    val navController = rememberNavController()
+    val showDataErrorDialog by calendarViewModel.showDataErrorDialog.collectAsStateWithLifecycle()
 
     val scheduleMap by calendarViewModel.scheduleMap.collectAsStateWithLifecycle()
 
@@ -72,6 +86,9 @@ fun CalendarRoute(
 
     val currentYearMonth by remember { derivedStateOf { getYearMonthByPage(pagerState.currentPage) } }
 
+    var clickDate by remember { mutableStateOf<LocalDate?>(null) }
+    var clickAppointmentId by remember { mutableLongStateOf(-1) }
+
     LaunchedEffect(pagerState) {
         snapshotFlow { pagerState.currentPage }
             .collect { page ->
@@ -85,15 +102,31 @@ fun CalendarRoute(
                 is CalendarSideEffect.NavigateToGroupCreate -> navigateToGroupCreate()
                 is CalendarSideEffect.NavigateToGroupEnter -> navigateToGroupEnter()
                 is CalendarSideEffect.NavigateToAppointmentCreate -> navigateToAppointmentCreate(
-                    calendarViewModel.getSelectedScheduleEntity().groupId
+                    calendarViewModel.selectedGroupId.value ?: -1
                 )
 
                 is CalendarSideEffect.ShowAddDialog -> calendarViewModel.showAddDialog(true)
                 is CalendarSideEffect.ShowBottomSheet -> calendarViewModel.showBottomSheet(true)
+                is CalendarSideEffect.ShowDataErrorDialog -> calendarViewModel.showDataErrorDialog(
+                    true
+                )
             }
         }
     }
 
+    if (showDataErrorDialog) {
+        NoostakDialog(
+            dialogType = DialogType.DATA_FAILURE,
+            onClick = {
+                calendarViewModel.getConfirmedDetail(clickAppointmentId)
+            },
+            onDismissRequest = {
+                calendarViewModel.showDataErrorDialog(false)
+                navController.popBackStack()
+            }
+        )
+    }
+
     if (showAddDialog) {
         CalendarFloatingActionDialog(
             onClick = { calendarViewModel.showAddDialog(false) },
@@ -117,30 +150,47 @@ fun CalendarRoute(
             },
             content = {
                 NavHost(navController, startDestination = SCHEDULE_LIST) {
-                    composable(SCHEDULE_LIST) { backStackEntry ->
-                        ScheduleListScreen(
-                            data = calendarViewModel.getSelectedScheduleEntity(),
-                            onItemClick = { schedule ->
-                                backStackEntry.savedStateHandle[SCHEDULE] =
-                                    schedule.id // 바꿔야 함
-                                navController.navigate(SCHEDULE_DETAIL)
-                            },
-                            onCreateAppointmentBtnClick = {
-                                calendarViewModel.navigateToAppointmentCreate()
-                                calendarViewModel.showBottomSheet(false)
-                            }
-                        )
+                    composable(SCHEDULE_LIST) {
+                        clickDate?.let { date ->
+                            ScheduleListScreen(
+                                data = ScheduleEntity(
+                                    groupId = calendarViewModel.selectedGroupId.value ?: -1,
+                                    date = date,
+                                    scheduleList = calendarViewModel.selectedDayAppointments.value.map {
+                                        CalendarAppointmentEntity(
+                                            id = it.id,
+                                            name = it.name,
+                                            category = it.category,
+                                            startTime = it.startTime,
+                                            endTime = it.endTime,
+                                            duration = it.duration,
+                                            date = it.date
+                                        )
+                                    }
+                                ),
+                                onItemClick = { id ->
+                                    clickAppointmentId = id
+                                    calendarViewModel.getConfirmedDetail(clickAppointmentId)
+                                    navController.navigate(SCHEDULE_DETAIL)
+                                },
+                                onCreateAppointmentBtnClick = {
+                                    calendarViewModel.navigateToAppointmentCreate()
+                                    calendarViewModel.showBottomSheet(false)
+                                }
+                            )
+                        }
                     }
                     composable(SCHEDULE_DETAIL) {
-                        val schedule =
-                            navController.previousBackStackEntry?.savedStateHandle?.get<Long>(
-                                SCHEDULE
-                            )
-                        schedule?.let { id ->
-                            ScheduleDetailScreen(
-                                data = calendarViewModel.mockScheduleDetail,
-                                onBackBtnClick = { navController.popBackStack() }
-                            )
+                        when (getConfirmedDetailState) {
+                            is UiState.Loading -> NoostakLoadingScreen()
+                            is UiState.Success -> {
+                                ScheduleDetailScreen(
+                                    data = (getConfirmedDetailState as UiState.Success).data,
+                                    onBackBtnClick = { navController.popBackStack() }
+                                )
+                            }
+
+                            else -> Unit
                         }
                     }
                 }
@@ -157,6 +207,7 @@ fun CalendarRoute(
         showAddDialog = showAddDialog,
         onAddBtnClick = { calendarViewModel.showAddDialog(true) },
         onItemClick = { clickedDate ->
+            clickDate = clickedDate
             calendarViewModel.onDayClicked(clickedDate)
         },
         onGroupClick = { groupId ->
@@ -236,7 +287,6 @@ private fun CalendarContent(
     }
 }
 
-const val SCHEDULE = "schedule"
 const val SCHEDULE_LIST = "schedule_list"
 const val SCHEDULE_DETAIL = "schedule_detail"
 

presentation/src/main/java/com/sopt/presentation/calendar/CalendarSideEffect.kt

@@ -6,4 +6,5 @@ sealed interface CalendarSideEffect {
     data object NavigateToAppointmentCreate : CalendarSideEffect
     data class ShowAddDialog(val show: Boolean) : CalendarSideEffect
     data object ShowBottomSheet : CalendarSideEffect
+    data object ShowDataErrorDialog : CalendarSideEffect
 }