Feature/#134 일정 API 연결 및 기능 연동

core/data-api/src/main/java/com/yapp/dataapi/SessionRepository.kt → core/data-api/src/main/java/com/yapp/dataapi/ScheduleRepository.kt

@@ -1,8 +1,11 @@
 package com.yapp.dataapi
 
+import com.yapp.model.ScheduleList
 import com.yapp.model.Sessions
 import kotlinx.coroutines.flow.Flow
 
-interface SessionRepository {
+interface ScheduleRepository {
     fun getSessions(): Flow<List<Sessions>>
+
+    fun getSchedules(year: Int, month: Int): Flow<ScheduleList>
 }

core/data/src/main/java/com/yapp/core/data/data/di/RepositoryModule.kt

@@ -5,14 +5,14 @@ import com.yapp.core.data.data.repository.AttendanceRepositoryImpl
 import com.yapp.core.data.data.repository.AuthRepositoryImpl
 import com.yapp.core.data.data.repository.OperationsRepositoryImpl
 import com.yapp.core.data.data.repository.PostsRepositoryImpl
-import com.yapp.core.data.data.repository.SessionsRepositoryImpl
+import com.yapp.core.data.data.repository.ScheduleRepositoryImpl
 import com.yapp.core.data.data.repository.UserRepositoryImpl
 import com.yapp.dataapi.AlarmRepository
 import com.yapp.dataapi.AttendanceRepository
 import com.yapp.dataapi.AuthRepository
 import com.yapp.dataapi.OperationsRepository
 import com.yapp.dataapi.PostsRepository
-import com.yapp.dataapi.SessionRepository
+import com.yapp.dataapi.ScheduleRepository
 import com.yapp.dataapi.UserRepository
 import dagger.Binds
 import dagger.Module
@@ -55,6 +55,6 @@ internal abstract class RepositoryModule {
 
     @Binds
     abstract fun bindsSessionRepositoryImpl(
-        repositoryImpl: SessionsRepositoryImpl
-    ): SessionRepository
+        repositoryImpl: ScheduleRepositoryImpl
+    ): ScheduleRepository
 }

core/data/src/main/java/com/yapp/core/data/data/repository/SessionsRepositoryImpl.kt → core/data/src/main/java/com/yapp/core/data/data/repository/ScheduleRepositoryImpl.kt

@@ -1,16 +1,16 @@
 package com.yapp.core.data.data.repository
 
-import com.yapp.core.data.remote.api.SessionApi
-import com.yapp.dataapi.SessionRepository
+import com.yapp.core.data.remote.api.ScheduleApi
+import com.yapp.dataapi.ScheduleRepository
 import com.yapp.model.Sessions
 import kotlinx.coroutines.flow.flow
 import javax.inject.Inject
 
-internal class SessionsRepositoryImpl @Inject constructor(
-    private val sessionApi: SessionApi
-): SessionRepository{
+internal class ScheduleRepositoryImpl @Inject constructor(
+    private val scheduleApi: ScheduleApi
+): ScheduleRepository{
     override fun getSessions() = flow {
-        emit(sessionApi.getSessions().map { result ->
+        emit(scheduleApi.getSessions().map { result ->
             Sessions(
                 id = result.id,
                 name = result.name,
@@ -23,4 +23,8 @@ internal class SessionsRepositoryImpl @Inject constructor(
             )
         })
     }
+
+    override fun getSchedules(year: Int, month: Int) = flow {
+        emit(scheduleApi.getSchedules(year, month).toScheduleListModel())
+    }
 }

core/data/src/main/java/com/yapp/core/data/remote/api/ScheduleApi.kt

@@ -0,0 +1,17 @@
+package com.yapp.core.data.remote.api
+
+import com.yapp.core.data.remote.model.response.DateGroupedScheduleResponse
+import com.yapp.core.data.remote.model.response.SessionResponse
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface ScheduleApi {
+    @GET("v1/sessions")
+    suspend fun getSessions(): List<SessionResponse>
+
+    @GET("v1/schedules")
+    suspend fun getSchedules(
+        @Query("year") year: Int,
+        @Query("month") month: Int,
+    ): DateGroupedScheduleResponse
+}

core/data/src/main/java/com/yapp/core/data/remote/di/ApiModule.kt

@@ -5,14 +5,13 @@ import com.yapp.core.data.remote.api.AttendanceApi
 import com.yapp.core.data.remote.api.AuthApi
 import com.yapp.core.data.remote.api.OperationsApi
 import com.yapp.core.data.remote.api.PostsApi
-import com.yapp.core.data.remote.api.SessionApi
+import com.yapp.core.data.remote.api.ScheduleApi
 import com.yapp.core.data.remote.api.UserApi
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import retrofit2.Retrofit
-import retrofit2.create
 import javax.inject.Singleton
 
 @Module
@@ -57,7 +56,7 @@ internal object ApiModule {
 
     @Singleton
     @Provides
-    fun providesSessionsApi(@AuthRetrofit retrofit: Retrofit): SessionApi {
-        return retrofit.create(SessionApi::class.java)
+    fun providesSessionsApi(@AuthRetrofit retrofit: Retrofit): ScheduleApi {
+        return retrofit.create(ScheduleApi::class.java)
     }
 }

core/data/src/main/java/com/yapp/core/data/remote/model/response/DateGroupedScheduleResponse.kt

@@ -0,0 +1,110 @@
+package com.yapp.core.data.remote.model.response
+
+import com.yapp.model.AttendanceStatus
+import com.yapp.model.DateGroupedSchedule
+import com.yapp.model.ScheduleInfo
+import com.yapp.model.ScheduleList
+import com.yapp.model.ScheduleProgressPhase
+import com.yapp.model.ScheduleType
+import com.yapp.model.SessionType
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class DateGroupedScheduleResponse(
+    @SerialName("dates")
+    val dates: List<ScheduleListResponse>
+) {
+    fun toScheduleListModel() = ScheduleList(
+        dates
+            .filter { it.schedules.isNotEmpty() }
+            .map { it.toScheduleListModel() }
+    )
+}
+
+@Serializable
+data class ScheduleListResponse(
+    @SerialName("date")
+    val date: String,
+
+    @SerialName("isToday")
+    val isToday: Boolean,
+
+    @SerialName("dayOfTheWeek")
+    val dayOfTheWeek: String,
+
+    @SerialName("schedules")
+    val schedules: List<ScheduleResponse>,
+) {
+    fun toScheduleListModel() = DateGroupedSchedule(
+        date = date,
+        isToday = isToday,
+        dayOfTheWeek = dayOfTheWeek,
+        schedules = schedules.map { it.toScheduleModel() }
+    )
+}
+
+@Serializable
+data class ScheduleResponse(
+    @SerialName("id")
+    val id: String,
+
+    @SerialName("name")
+    val name: String,
+
+    @SerialName("place")
+    val place: String?,
+
+    @SerialName("date")
+    val date: String,
+
+    @SerialName("endDate")
+    val endDate: String?,
+
+    @SerialName("time")
+    val time: String?,
+
+    @SerialName("endTime")
+    val endTime: String?,
+
+    @SerialName("scheduleType")
+    val scheduleType: String,
+
+    @SerialName("sessionType")
+    val sessionType: String?,
+
+    @SerialName("scheduleProgressPhase")
+    val scheduleProgressPhase: String,
+
+    @SerialName("attendanceStatus")
+    val attendanceStatus: String?,
+) {
+    fun toScheduleModel() = ScheduleInfo(
+        id = id,
+        name = name,
+        place = place,
+        date = date,
+        endDate = endDate,
+        time = time,
+        endTime = endTime,
+        scheduleType = scheduleType.toScheduleType(),
+        sessionType = sessionType.toSessionType(),
+        scheduleProgressPhase = scheduleProgressPhase.toScheduleProgressPhase(),
+        attendanceStatus = attendanceStatus.toAttendanceStatus(),
+    )
+
+    companion object {
+        fun String.toScheduleType() =
+            ScheduleType.entries.firstOrNull { it.name == this } ?: ScheduleType.ETC
+
+        fun String?.toSessionType() =
+            SessionType.entries.firstOrNull { it.name == this }
+
+        fun String?.toScheduleProgressPhase() =
+            ScheduleProgressPhase.entries.firstOrNull { it.name == this }
+                ?: ScheduleProgressPhase.PENDING
+
+        fun String?.toAttendanceStatus() =
+            AttendanceStatus.entries.firstOrNull { it.name == this } ?: AttendanceStatus.SCHEDULED
+    }
+}

core/model/src/main/java/com/yapp/model/ScheduleInfo.kt

@@ -0,0 +1,42 @@
+package com.yapp.model
+
+data class ScheduleList(
+    val dates: List<DateGroupedSchedule>
+)
+
+data class DateGroupedSchedule(
+    val date: String,
+    val isToday: Boolean,
+    val dayOfTheWeek: String,
+    val schedules: List<ScheduleInfo>
+)
+
+data class ScheduleInfo(
+    val id: String,
+    val name: String,
+    val place: String?,
+    val date: String,
+    val endDate: String?,
+    val time: String?,
+    val endTime: String?,
+    val scheduleType: ScheduleType,
+    val sessionType: SessionType?,
+    val scheduleProgressPhase: ScheduleProgressPhase,
+    val attendanceStatus: AttendanceStatus,
+)
+
+enum class ScheduleType {
+    SESSION, TASK, ETC;
+}
+
+enum class SessionType {
+    OFFLINE, ONLINE, TEAM;
+}
+
+enum class ScheduleProgressPhase {
+    DONE, TODAY, ONGOING, PENDING;
+}
+
+enum class AttendanceStatus {
+    SCHEDULED, ATTENDED, LATE, ABSENT, EARLY_LEAVE, EXCUSED;
+}

core/ui/src/main/java/com/yapp/core/ui/component/AttendanceStatusChip.kt

@@ -14,15 +14,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.yapp.core.designsystem.theme.YappTheme
 import com.yapp.core.ui.R
-
-enum class AttendanceStatus {
-    SCHEDULED,
-    ATTENDED,
-    LATE,
-    ABSENT,
-    EARLY_LEAVE,
-    EXCUSED,
-}
+import com.yapp.model.AttendanceStatus
 
 @Composable
 fun AttendanceStatusChip(

core/ui/src/main/java/com/yapp/core/ui/util/DateTime.kt

@@ -0,0 +1,51 @@
+package com.yapp.core.ui.util
+
+import android.content.Context
+import com.yapp.core.ui.R
+import java.time.LocalDate
+import java.time.LocalTime
+import java.time.format.DateTimeFormatter
+import java.util.Locale
+
+fun formatToDay(context: Context, date: String): String {
+    return try {
+        val parsedDate = LocalDate.parse(date)
+        context.getString(R.string.time_format_day, parsedDate.dayOfMonth)
+    } catch (e: Exception) {
+        date
+    }
+}
+
+fun formatTimeRange(context: Context, startTime: String?, endTime: String?): String? {
+    if (startTime.isNullOrBlank() || endTime.isNullOrBlank()) return null
+
+    return "${formatToKoreanTime(context, startTime)} - ${formatToKoreanTime(context, endTime)}"
+}
+
+fun formatToKoreanTime(context: Context, time: String): String {
+    return try {
+        val parsedTime = LocalTime.parse(time)
+
+        val pattern = context.getString(R.string.time_format_base)
+        val formatter = DateTimeFormatter.ofPattern(pattern, Locale.KOREAN)
+        val base = parsedTime.format(formatter)
+
+        when (parsedTime.minute) {
+            0 -> base
+            30 -> context.getString(R.string.time_format_half_hour_with_base, base)
+            else -> context.getString(R.string.time_format_hour_minute_with_base, base, parsedTime.minute)
+        }
+    } catch (e: Exception) {
+        time
+    }
+}
+
+fun isPastDate(dateString: String, pattern: String = "yyyy-MM-dd"): Boolean {
+    return try {
+        val formatter = DateTimeFormatter.ofPattern(pattern)
+        val inputDate = LocalDate.parse(dateString, formatter)
+        inputDate.isBefore(LocalDate.now())
+    } catch (e: Exception) {
+        false
+    }
+}

core/ui/src/main/res/values/strings.xml

@@ -6,4 +6,10 @@
     <string name="attendance_status_absent">결석</string>
     <string name="attendance_status_early_leave">조퇴</string>
     <string name="attendance_status_excused">공결</string>
+
+    <string name="time_format_day">%1$d일</string>
+
+    <string name="time_format_base">a h시</string>
+    <string name="time_format_half_hour_with_base">%1$s 반</string>
+    <string name="time_format_hour_minute_with_base">%1$s %2$d분</string>
 </resources>

feature/schedule/src/main/java/com/yapp/feature/schedule/ScheduleContract.kt

@@ -0,0 +1,28 @@
+package com.yapp.feature.schedule
+
+import com.yapp.model.ScheduleList
+import java.time.LocalDate
+
+data class ScheduleState(
+    val isLoading: Boolean = true,
+    val selectedTab: ScheduleTab = ScheduleTab.ALL,
+    val selectedYear: Int = LocalDate.now().year,
+    val selectedMonth: Int = LocalDate.now().monthValue,
+    val schedules: ScheduleList = ScheduleList(dates = emptyList())
+)
+
+sealed interface ScheduleIntent {
+    data object EnterScheduleScreen: ScheduleIntent
+    data class SelectTab(val tab: ScheduleTab): ScheduleIntent
+    data object ClickPreviousMonth: ScheduleIntent
+    data object ClickNextMonth: ScheduleIntent
+}
+
+sealed interface ScheduleSideEffect {
+    data class ShowToast(val message: String): ScheduleSideEffect
+}
+
+enum class ScheduleTab(val index: Int, val labelResId: Int) {
+    ALL(0, R.string.schedule_tab_all),
+    SESSION(1, R.string.schedule_tab_session);
+}