[FEAT/#45] 캘린더 API 연결

app/src/main/java/com/cherrish/android/core/network/BaseResponse.kt

@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class BaseResponse<T>(
     @SerialName("code")
-    val code: Int,
+    val code: String,
     @SerialName("message")
     val message: String,
     @SerialName("data")

app/src/main/java/com/cherrish/android/core/util/CalendarCalculator.kt

@@ -0,0 +1,24 @@
+package com.cherrish.android.core.util
+
+import java.time.DayOfWeek
+import java.time.LocalDateTime
+
+fun DayOfWeek.daysUntil(other: DayOfWeek) = (other.value - value + 7) % 7
+
+fun formatProcedureDay(scheduledAt: String): String {
+    val dateTime = LocalDateTime.parse(scheduledAt)
+    val month = dateTime.month.value
+    val day = dateTime.dayOfMonth
+    val dayOfWeek = dateTime.dayOfWeek.toKoreanName()
+    return "${month}월 ${day}일 $dayOfWeek"
+}
+
+fun DayOfWeek.toKoreanName(): String = when (this) {
+    DayOfWeek.MONDAY -> "월요일"
+    DayOfWeek.TUESDAY -> "화요일"
+    DayOfWeek.WEDNESDAY -> "수요일"
+    DayOfWeek.THURSDAY -> "목요일"
+    DayOfWeek.FRIDAY -> "금요일"
+    DayOfWeek.SATURDAY -> "토요일"
+    DayOfWeek.SUNDAY -> "일요일"
+}

app/src/main/java/com/cherrish/android/data/di/DataSourceModule.kt

@@ -1,7 +1,7 @@
 package com.cherrish.android.data.di
 
-import com.cherrish.android.data.remote.datasource.DummyDataSource
-import com.cherrish.android.data.remote.datasourceimpl.DummyDataSourceImpl
+import com.cherrish.android.data.remote.datasource.CalendarDataSource
+import com.cherrish.android.data.remote.datasourceimpl.CalendarDataSourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -13,7 +13,7 @@ import javax.inject.Singleton
 abstract class DataSourceModule {
     @Binds
     @Singleton
-    abstract fun bindDummyDataSource(
-        dummyDataSourceImpl: DummyDataSourceImpl
-    ): DummyDataSource
+    abstract fun bindCalendarDataSource(
+        calendarDataSourceImpl: CalendarDataSourceImpl
+    ): CalendarDataSource
 }

app/src/main/java/com/cherrish/android/data/di/RepositoryModule.kt

@@ -1,7 +1,7 @@
 package com.cherrish.android.data.di
 
-import com.cherrish.android.data.repository.DummyRepository
-import com.cherrish.android.data.repositoryimpl.DummyRepositoryImpl
+import com.cherrish.android.data.repository.CalendarRepository
+import com.cherrish.android.data.repositoryimpl.CalendarRepositoryImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -13,7 +13,7 @@ import javax.inject.Singleton
 abstract class RepositoryModule {
     @Binds
     @Singleton
-    abstract fun bindDummyRepository(
-        dummyRepositoryImpl: DummyRepositoryImpl
-    ): DummyRepository
+    abstract fun bindCalendarRepository(
+        calendarRepositoryImpl: CalendarRepositoryImpl
+    ): CalendarRepository
 }

app/src/main/java/com/cherrish/android/data/di/ServiceModule.kt

@@ -1,6 +1,6 @@
 package com.cherrish.android.data.di
 
-import com.cherrish.android.data.remote.service.DummyService
+import com.cherrish.android.data.remote.service.CalendarService
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -13,7 +13,7 @@ import retrofit2.Retrofit
 object ServiceModule {
     @Provides
     @Singleton
-    fun provideDummyService(
+    fun provideCalendarService(
         retrofit: Retrofit
-    ): DummyService = retrofit.create(DummyService::class.java)
+    ): CalendarService = retrofit.create(CalendarService::class.java)
 }

app/src/main/java/com/cherrish/android/data/model/CalendarDailyResponseModel.kt

@@ -0,0 +1,32 @@
+package com.cherrish.android.data.model
+
+import com.cherrish.android.data.remote.dto.response.CalendarDailyResponseDto
+import com.cherrish.android.data.remote.dto.response.EventDto
+
+data class CalendarDailyResponseModel(
+    val eventCount: Int,
+    val events: List<EventModel>
+)
+
+data class EventModel(
+    val type: String,
+    val userProcedureId: Long,
+    val procedureId: Long,
+    val name: String,
+    val scheduledAt: String,
+    val downtimeDays: Int
+)
+
+fun CalendarDailyResponseDto.toModel() = CalendarDailyResponseModel(
+    eventCount = this.eventCount,
+    events = this.events.map { it.toModel() }
+)
+
+fun EventDto.toModel() = EventModel(
+    type = this.type,
+    userProcedureId = this.userProcedureId,
+    procedureId = this.procedureId,
+    name = this.name,
+    scheduledAt = this.scheduledAt,
+    downtimeDays = this.downtimeDays
+)

app/src/main/java/com/cherrish/android/data/model/CalendarDownTimeResponseModel.kt

@@ -0,0 +1,21 @@
+package com.cherrish.android.data.model
+
+import com.cherrish.android.data.remote.dto.response.CalendarDownTimeResponseDto
+
+data class CalendarDownTimeResponseModel(
+    val userProcedureId: Long,
+    val scheduledAt: String,
+    val downtimeDays: Int,
+    val sensitiveDays: List<String>,
+    val cautionDays: List<String>,
+    val recoveryDays: List<String>
+)
+
+fun CalendarDownTimeResponseDto.toModel() = CalendarDownTimeResponseModel(
+    userProcedureId = this.userProcedureId,
+    scheduledAt = this.scheduledAt,
+    downtimeDays = this.downtimeDays,
+    sensitiveDays = this.sensitiveDays,
+    cautionDays = this.cautionDays,
+    recoveryDays = this.recoveryDays
+)

app/src/main/java/com/cherrish/android/data/model/CalendarMonthlyRequestModel.kt

@@ -0,0 +1,13 @@
+package com.cherrish.android.data.model
+
+import com.cherrish.android.data.remote.dto.request.CalendarMonthlyRequestDto
+
+data class CalendarMonthlyRequestModel(
+    val year: Int,
+    val month: Int
+)
+
+fun CalendarMonthlyRequestModel.toDto() = CalendarMonthlyRequestDto(
+    year = this.year,
+    month = this.month
+)

app/src/main/java/com/cherrish/android/data/model/CalendarMonthlyResponseModel.kt

@@ -0,0 +1,11 @@
+package com.cherrish.android.data.model
+
+import com.cherrish.android.data.remote.dto.response.CalendarMonthlyResponseDto
+
+data class CalendarMonthlyResponseModel(
+    val dailyProcedureCounts: Map<Int, Long>
+)
+
+fun CalendarMonthlyResponseDto.toModel() = CalendarMonthlyResponseModel(
+    dailyProcedureCounts = this.dailyProcedureCounts
+)

app/src/main/java/com/cherrish/android/data/remote/datasource/CalendarDataSource.kt

@@ -0,0 +1,12 @@
+package com.cherrish.android.data.remote.datasource
+
+import com.cherrish.android.core.network.BaseResponse
+import com.cherrish.android.data.remote.dto.response.CalendarDailyResponseDto
+import com.cherrish.android.data.remote.dto.response.CalendarDownTimeResponseDto
+import com.cherrish.android.data.remote.dto.response.CalendarMonthlyResponseDto
+
+interface CalendarDataSource {
+    suspend fun getCalendarMonthly(year: Int, month: Int): BaseResponse<CalendarMonthlyResponseDto>
+    suspend fun getCalendarDaily(date: String): BaseResponse<CalendarDailyResponseDto>
+    suspend fun getCalendarEventDowntime(id: Long): BaseResponse<CalendarDownTimeResponseDto>
+}

app/src/main/java/com/cherrish/android/data/remote/datasourceimpl/CalendarDataSourceImpl.kt

@@ -0,0 +1,29 @@
+package com.cherrish.android.data.remote.datasourceimpl
+
+import com.cherrish.android.core.network.BaseResponse
+import com.cherrish.android.data.remote.datasource.CalendarDataSource
+import com.cherrish.android.data.remote.dto.response.CalendarDailyResponseDto
+import com.cherrish.android.data.remote.dto.response.CalendarDownTimeResponseDto
+import com.cherrish.android.data.remote.dto.response.CalendarMonthlyResponseDto
+import com.cherrish.android.data.remote.service.CalendarService
+import javax.inject.Inject
+
+class CalendarDataSourceImpl @Inject constructor(
+    private val calendarService: CalendarService
+) : CalendarDataSource {
+    override suspend fun getCalendarMonthly(
+        year: Int,
+        month: Int
+    ): BaseResponse<CalendarMonthlyResponseDto> =
+        calendarService.getCalendarMonthly(year = year, month = month)
+
+    override suspend fun getCalendarDaily(
+        date: String
+    ): BaseResponse<CalendarDailyResponseDto> =
+        calendarService.getCalendarDaily(date = date)
+
+    override suspend fun getCalendarEventDowntime(
+        id: Long
+    ): BaseResponse<CalendarDownTimeResponseDto> =
+        calendarService.getCalendarEventDowntime(id = id)
+}

app/src/main/java/com/cherrish/android/data/remote/dto/request/CalendarDailyRequestDto.kt

@@ -0,0 +1,10 @@
+package com.cherrish.android.data.remote.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CalendarDailyRequestDto(
+    @SerialName("date")
+    val date: String
+)

app/src/main/java/com/cherrish/android/data/remote/dto/request/CalendarMonthlyRequestDto.kt

@@ -0,0 +1,12 @@
+package com.cherrish.android.data.remote.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CalendarMonthlyRequestDto(
+    @SerialName("year")
+    val year: Int,
+    @SerialName("month")
+    val month: Int
+)

app/src/main/java/com/cherrish/android/data/remote/dto/response/CalendarDailyResponseDto.kt

@@ -0,0 +1,28 @@
+package com.cherrish.android.data.remote.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CalendarDailyResponseDto(
+    @SerialName("eventCount")
+    val eventCount: Int,
+    @SerialName("events")
+    val events: List<EventDto>
+)
+
+@Serializable
+data class EventDto(
+    @SerialName("type")
+    val type: String,
+    @SerialName("userProcedureId")
+    val userProcedureId: Long,
+    @SerialName("procedureId")
+    val procedureId: Long,
+    @SerialName("name")
+    val name: String,
+    @SerialName("scheduledAt")
+    val scheduledAt: String,
+    @SerialName("downtimeDays")
+    val downtimeDays: Int
+)

app/src/main/java/com/cherrish/android/data/remote/dto/response/CalendarDownTimeResponseDto.kt

@@ -0,0 +1,20 @@
+package com.cherrish.android.data.remote.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CalendarDownTimeResponseDto(
+    @SerialName("userProcedureId")
+    val userProcedureId: Long,
+    @SerialName("scheduledAt")
+    val scheduledAt: String,
+    @SerialName("downtimeDays")
+    val downtimeDays: Int,
+    @SerialName("sensitiveDays")
+    val sensitiveDays: List<String>,
+    @SerialName("cautionDays")
+    val cautionDays: List<String>,
+    @SerialName("recoveryDays")
+    val recoveryDays: List<String>
+)

app/src/main/java/com/cherrish/android/data/remote/dto/response/CalendarMonthlyResponseDto.kt

@@ -0,0 +1,10 @@
+package com.cherrish.android.data.remote.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CalendarMonthlyResponseDto(
+    @SerialName("dailyProcedureCounts")
+    val dailyProcedureCounts: Map<Int, Long>
+)

app/src/main/java/com/cherrish/android/data/remote/service/CalendarService.kt

@@ -0,0 +1,27 @@
+package com.cherrish.android.data.remote.service
+
+import com.cherrish.android.core.network.BaseResponse
+import com.cherrish.android.data.remote.dto.response.CalendarDailyResponseDto
+import com.cherrish.android.data.remote.dto.response.CalendarDownTimeResponseDto
+import com.cherrish.android.data.remote.dto.response.CalendarMonthlyResponseDto
+import retrofit2.http.GET
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface CalendarService {
+    @GET("api/calendar/monthly")
+    suspend fun getCalendarMonthly(
+        @Query("year") year: Int,
+        @Query("month") month: Int
+    ): BaseResponse<CalendarMonthlyResponseDto>
+
+    @GET("api/calendar/daily")
+    suspend fun getCalendarDaily(
+        @Query("date") date: String
+    ): BaseResponse<CalendarDailyResponseDto>
+
+    @GET("api/calendar/events/{id}/downtime")
+    suspend fun getCalendarEventDowntime(
+        @Path("id") id: Long
+    ): BaseResponse<CalendarDownTimeResponseDto>
+}

app/src/main/java/com/cherrish/android/data/repository/CalendarRepository.kt

@@ -0,0 +1,20 @@
+package com.cherrish.android.data.repository
+
+import com.cherrish.android.data.model.CalendarDailyResponseModel
+import com.cherrish.android.data.model.CalendarDownTimeResponseModel
+import com.cherrish.android.data.model.CalendarMonthlyResponseModel
+
+interface CalendarRepository {
+    suspend fun getCalendarMonthly(
+        year: Int,
+        month: Int
+    ): Result<CalendarMonthlyResponseModel>
+
+    suspend fun getCalendarDaily(
+        date: String
+    ): Result<CalendarDailyResponseModel>
+
+    suspend fun getCalendarEventDowntime(
+        id: Long
+    ): Result<CalendarDownTimeResponseModel>
+}

app/src/main/java/com/cherrish/android/data/repositoryimpl/CalendarRepositoryImpl.kt

@@ -0,0 +1,32 @@
+package com.cherrish.android.data.repositoryimpl
+
+import com.cherrish.android.core.util.suspendRunCatching
+import com.cherrish.android.data.model.CalendarDailyResponseModel
+import com.cherrish.android.data.model.CalendarDownTimeResponseModel
+import com.cherrish.android.data.model.CalendarMonthlyResponseModel
+import com.cherrish.android.data.model.toModel
+import com.cherrish.android.data.remote.datasource.CalendarDataSource
+import com.cherrish.android.data.repository.CalendarRepository
+import javax.inject.Inject
+
+class CalendarRepositoryImpl @Inject constructor(
+    private val calendarDataSource: CalendarDataSource
+) : CalendarRepository {
+    override suspend fun getCalendarMonthly(
+        year: Int,
+        month: Int
+    ): Result<CalendarMonthlyResponseModel> =
+        suspendRunCatching {
+            calendarDataSource.getCalendarMonthly(year = year, month = month).data!!.toModel()
+        }
+
+    override suspend fun getCalendarDaily(date: String): Result<CalendarDailyResponseModel> =
+        suspendRunCatching {
+            calendarDataSource.getCalendarDaily(date = date).data!!.toModel()
+        }
+
+    override suspend fun getCalendarEventDowntime(id: Long): Result<CalendarDownTimeResponseModel> =
+        suspendRunCatching {
+            calendarDataSource.getCalendarEventDowntime(id = id).data!!.toModel()
+        }
+}

app/src/main/java/com/cherrish/android/presentation/calendar/CalendarScreen.kt

@@ -39,7 +39,7 @@ fun CalendarRoute(
             CalendarScreen(
                 uiState = state.data,
                 paddingValues = paddingValues,
-                onMonthChange = viewModel::onMonthChanged,
+                onMonthChange = viewModel::onMonthChange,
                 onDateClick = viewModel::onDateClick,
                 onEventClick = viewModel::onEventClick,
                 onAddButtonClick = { /*TODO: 시술 선택 플로우로 이동*/ }