Feature/#23 scheduledetail

app/src/main/kotlin/com/ddd/oi/navigation/OiNavHost.kt

@@ -55,8 +55,8 @@ fun OiNavHost(
             navigateToHome = {
                 val navOptions = navOptions {
                     popUpTo(Route.Login) {
-                        inclusive = true  // 로그인 화면도 스택에서 제거
-                        saveState = false // 로그인 화면 상태 저장하지 않음
+                        inclusive = true
+                        saveState = false
                     }
                     launchSingleTop = true
                 }
@@ -95,7 +95,8 @@ fun OiNavHost(
         )
         scheduleDetailNavGraph(
             onBackClick = { navigator.popBackStack() },
-            navigateToSearchPlace = { navigator.navigateToSearchPlace(it) }
+            navigateToSearchPlace = { navigator.navigateToSearchPlace(it) },
+            navigateToEditPlace = { navigator.navigateToUpsertPlace(it) }
         )
 
         searchPlaceNavGraph(
@@ -133,7 +134,7 @@ fun OiNavHost(
 
         profileNavGraph(
             navigatePopBack = { navigator.popBackStack() },
-            onLogout = { /* TODO: 로그아웃 처리 */ },
+            onLogout = { navigator.navigateToLogin() },
             navigateToWithdraw = { navigator.navigateToWithdraw() }
         )
 

data/src/main/kotlin/com/ddd/oi/data/core/datastore/AuthDataStore.kt

@@ -1,6 +1,7 @@
 package com.ddd.oi.data.core.datastore
 
 import android.content.Context
+import android.util.Log
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
@@ -66,10 +67,14 @@ class AuthDataStore @Inject constructor(
         return context.dataStore.data.first()[Keys.REFRESH_TOKEN]
     }
 
-    /**
-     * logout, 탈퇴시 모든 정보 제거
-     */
     suspend fun clear() {
-        context.dataStore.edit { it.clear() }
+        context.dataStore.edit { preferences ->
+            val currentSocialType = preferences[Keys.CURRENT_SOCIAL]
+            preferences.clear()
+            currentSocialType?.let {
+                Log.d("currentSocialType 저장", it)
+                preferences[Keys.CURRENT_SOCIAL] = it 
+            }
+        }
     }
 }

data/src/main/kotlin/com/ddd/oi/data/core/retrofit/api/ScheduleApiService.kt

@@ -3,6 +3,8 @@ package com.ddd.oi.data.core.retrofit.api
 import com.ddd.oi.data.core.model.BaseResponse
 import com.ddd.oi.data.schedule.model.ScheduleDto
 import com.ddd.oi.data.schedule.model.ScheduleRequest
+import com.ddd.oi.data.scheduledetail.model.EditPlaceDto
+import com.ddd.oi.data.scheduledetail.model.EditPlaceRequest
 import com.ddd.oi.data.scheduledetail.model.PlaceDto
 import retrofit2.http.Body
 import retrofit2.http.DELETE
@@ -53,7 +55,14 @@ interface ScheduleApiService {
 
     @PUT("api/v1/schedules/{scheduleId}/details/{detailId}")
     suspend fun updateScheduleDetail(
+        @Path("scheduleId") scheduleId: Long,
+        @Path("detailId") detailId: Long,
+        @Body request: EditPlaceRequest
+    ): BaseResponse<EditPlaceDto>
+
+    @DELETE("api/v1/schedules/{scheduleId}/details/{detailId}")
+    suspend fun deleteScheduleDetail(
         @Path("scheduleId") scheduleId: Long,
         @Path("detailId") detailId: Long
-    )
+    ): BaseResponse<Boolean>
 }

data/src/main/kotlin/com/ddd/oi/data/core/retrofit/di/NetworkModule.kt

@@ -8,6 +8,8 @@ import com.ddd.oi.data.core.retrofit.api.UserApiService
 import com.ddd.oi.data.place.remote.PlaceApi
 import com.ddd.oi.data.scheduledetail.remote.ScheduleDetailApi
 import com.ddd.oi.data.spot.remote.SpotApi
+import com.ddd.oi.data.core.retrofit.interceptor.TokenInterceptor
+import com.ddd.oi.data.core.retrofit.interceptor.TokenAuthenticator
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -46,22 +48,24 @@ object NetworkModule {
     @Singleton
     fun provideOkHttpClient(
         loggingInterceptor: HttpLoggingInterceptor,
+        tokenInterceptor: TokenInterceptor,
+        tokenAuthenticator: TokenAuthenticator
     ): OkHttpClient =
         OkHttpClient.Builder()
             .addInterceptor(loggingInterceptor)
+            .addInterceptor(tokenInterceptor)
+            .authenticator(tokenAuthenticator)
             .build()
 
     @Provides
     @Singleton
     @NonAuthRetrofit
     fun provideNonAuthRetrofit(
         json: Json,
-        okHttpClient: OkHttpClient
     ): Retrofit {
         return Retrofit.Builder()
             .baseUrl(BuildConfig.BASE_URL)
             .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
-            .client(okHttpClient)
             .build()
     }
 
@@ -123,7 +127,7 @@ object NetworkModule {
     ): ContentApi {
         return retrofit.create(ContentApi::class.java)
     }
-    
+
     @Provides
     @Singleton
     fun provideUserApiService(

data/src/main/kotlin/com/ddd/oi/data/scheduledetail/ScheduleDetailRepositoryImpl.kt

@@ -5,6 +5,7 @@ import com.ddd.oi.data.scheduledetail.remote.ScheduleDetailRemoteDataSource
 import com.ddd.oi.data.scheduledetail.remote.ScheduleDetailRemoteSource
 import com.ddd.oi.data.scheduledetail.remote.SpotRequest
 import com.ddd.oi.domain.model.Place
+import com.ddd.oi.domain.model.schedule.SchedulePlace
 import com.ddd.oi.domain.repository.ScheduleDetailRepository
 import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
@@ -45,11 +46,7 @@ class ScheduleDetailRepositoryImpl @Inject constructor(
         )
     }
 
-    override suspend fun postScheduleDetail(scheduleId: Int, body: List<Place>): Boolean {
-        val targetDate = Clock.System.now()
-            .toLocalDateTime(TimeZone.currentSystemDefault())
-            .toJavaLocalDateTime()
-            .format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))
+    override suspend fun postScheduleDetail(scheduleId: Int, body: List<Place>, targetDate: String): Boolean {
         return remoteDataSource.postScheduleDetail(
             scheduleId,
             body.map { place ->
@@ -65,7 +62,7 @@ class ScheduleDetailRepositoryImpl @Inject constructor(
         )
     }
 
-    override suspend fun getScheduleDetail(scheduleId: Long): Result<Map<String, List<com.ddd.oi.domain.model.schedule.Place>>> {
+    override suspend fun getScheduleDetail(scheduleId: Long): Result<Map<String, List<SchedulePlace>>> {
         return scheduleDetailRemoteSource.getScheduleDetails(scheduleId).map { dtoList ->
             dtoList.associateBy(
                 keySelector = { it.targetDate },
@@ -76,6 +73,19 @@ class ScheduleDetailRepositoryImpl @Inject constructor(
         }
     }
 
+    override suspend fun updateScheduleDetail(scheduleId: Long, scheduleDetail: SchedulePlace): Result<SchedulePlace> {
+        return scheduleDetailRemoteSource.updateScheduleDetail(scheduleId, scheduleDetail).map {
+            it.toDomain()
+        }
+    }
+
+    override suspend fun deleteScheduleDetail(
+        scheduleId: Long,
+        scheduleDetailId: Long
+    ): Result<Boolean> {
+        return scheduleDetailRemoteSource.deleteScheduleDetail(scheduleId, scheduleDetailId)
+    }
+
     data class LatLng(val latitude: Double, val longitude: Double)
 
     private fun convertTM128ToWGS84(mapX: Double, mapY: Double): LatLng {

data/src/main/kotlin/com/ddd/oi/data/scheduledetail/di/ScheduleDetailModule.kt

@@ -10,6 +10,10 @@ import dagger.Binds
 import com.ddd.oi.data.scheduledetail.remote.ScheduleDetailApi
 import com.ddd.oi.data.scheduledetail.remote.ScheduleDetailRemoteDataSource
 import com.ddd.oi.data.scheduledetail.remote.ScheduleDetailRemoteDataSourceImpl
+import com.ddd.oi.domain.usecase.scheduledetail.DeleteScheduleDetailUseCase
+import com.ddd.oi.domain.usecase.scheduledetail.DeleteScheduleDetailUseCaseImpl
+import com.ddd.oi.domain.usecase.scheduledetail.UpdateScheduleDetailUseCase
+import com.ddd.oi.domain.usecase.scheduledetail.UpdateScheduleDetailUseCaseImpl
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -41,6 +45,22 @@ object ScheduleDetailUseCaseModule {
     ): GetScheduleDetailsUseCase {
         return GetScheduleDetailsUseCaseImpl(scheduleDetailRepository)
     }
+
+    @Provides
+    @Singleton
+    fun provideUpdateScheduleDetailUseCase(
+        scheduleDetailRepository: ScheduleDetailRepository
+    ): UpdateScheduleDetailUseCase {
+        return UpdateScheduleDetailUseCaseImpl(scheduleDetailRepository)
+    }
+
+    @Provides
+    @Singleton
+    fun provideDeleteScheduleDetailUseCase(
+        scheduleDetailRepository: ScheduleDetailRepository
+    ): DeleteScheduleDetailUseCase {
+        return DeleteScheduleDetailUseCaseImpl(scheduleDetailRepository)
+    }
 }
 
 @Module

data/src/main/kotlin/com/ddd/oi/data/scheduledetail/mapper/DomainToData.kt

@@ -0,0 +1,15 @@
+package com.ddd.oi.data.scheduledetail.mapper
+
+import com.ddd.oi.data.scheduledetail.model.EditPlaceRequest
+import com.ddd.oi.domain.model.schedule.SchedulePlace
+
+internal fun SchedulePlace.toEditRequest(): EditPlaceRequest {
+    return EditPlaceRequest(
+        startTime = startTime,
+        targetDate = targetDate,
+        memo = memo,
+        spotName = spotName,
+        latitude = latitude,
+        longitude = longitude,
+    )
+}

data/src/main/kotlin/com/ddd/oi/data/scheduledetail/mapper/DtoToDomain.kt

@@ -1,10 +1,10 @@
 package com.ddd.oi.data.scheduledetail.mapper
 
 import com.ddd.oi.data.scheduledetail.model.PlaceInfo
-import com.ddd.oi.domain.model.schedule.Place
+import com.ddd.oi.domain.model.schedule.SchedulePlace
 
-internal fun PlaceInfo.toDomain(): Place {
-    return Place(
+internal fun PlaceInfo.toDomain(): SchedulePlace {
+    return SchedulePlace(
         id = id,
         startTime = startTime,
         targetDate = targetDate,

data/src/main/kotlin/com/ddd/oi/data/scheduledetail/model/EditPlaceDto.kt

@@ -0,0 +1,30 @@
+package com.ddd.oi.data.scheduledetail.model
+
+import com.ddd.oi.domain.model.schedule.SchedulePlace
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EditPlaceDto(
+    val scheduleDetailId: Long,
+    val startTime: String? = null,
+    val targetDate: String,
+    val memo: String,
+    val spotName: String,
+    val latitude: Double,
+    val longitude: Double,
+    val category: String
+) {
+    fun toDomain(): SchedulePlace {
+        return SchedulePlace(
+            id = scheduleDetailId,
+            startTime = startTime,
+            targetDate = targetDate,
+            memo = memo,
+            spotName = spotName,
+            latitude = latitude,
+            longitude = longitude,
+            category = category
+        )
+    }
+}
+

data/src/main/kotlin/com/ddd/oi/data/scheduledetail/model/EditPlaceRequest.kt

@@ -0,0 +1,13 @@
+package com.ddd.oi.data.scheduledetail.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class EditPlaceRequest(
+    val startTime: String? = null,
+    val targetDate: String,
+    val memo: String,
+    val spotName: String,
+    val latitude: Double,
+    val longitude: Double
+)

data/src/main/kotlin/com/ddd/oi/data/scheduledetail/remote/ScheduleDetailRemoteSource.kt

@@ -1,7 +1,13 @@
 package com.ddd.oi.data.scheduledetail.remote
 
+import com.ddd.oi.data.scheduledetail.model.EditPlaceDto
 import com.ddd.oi.data.scheduledetail.model.PlaceDto
+import com.ddd.oi.domain.model.schedule.SchedulePlace
 
 interface ScheduleDetailRemoteSource {
     suspend fun getScheduleDetails(scheduleId: Long): Result<List<PlaceDto>>
+
+    suspend fun updateScheduleDetail(scheduleId: Long, schedulePlace: SchedulePlace): Result<EditPlaceDto>
+
+    suspend fun deleteScheduleDetail(scheduleId: Long, scheduleDetailId: Long): Result<Boolean>
 }

data/src/main/kotlin/com/ddd/oi/data/scheduledetail/remote/ScheduleDetailRemoteSourceImpl.kt

@@ -2,8 +2,11 @@ package com.ddd.oi.data.scheduledetail.remote
 
 import com.ddd.oi.data.core.model.safeApiCall
 import com.ddd.oi.data.core.retrofit.api.ScheduleApiService
+import com.ddd.oi.data.scheduledetail.mapper.toEditRequest
+import com.ddd.oi.data.scheduledetail.model.EditPlaceDto
 import com.ddd.oi.data.scheduledetail.model.PlaceDto
 import com.ddd.oi.data.scheduledetail.model.PlaceInfo
+import com.ddd.oi.domain.model.schedule.SchedulePlace
 import javax.inject.Inject
 
 class ScheduleDetailRemoteSourceImpl @Inject constructor(
@@ -14,4 +17,21 @@ class ScheduleDetailRemoteSourceImpl @Inject constructor(
             scheduleApiService.getScheduleDetails(scheduleId = scheduleId)
         }
     }
+
+    override suspend fun updateScheduleDetail(scheduleId: Long, schedulePlace: SchedulePlace): Result<EditPlaceDto> {
+        val detailId = schedulePlace.id
+        val request = schedulePlace.toEditRequest()
+        return safeApiCall {
+            scheduleApiService.updateScheduleDetail(scheduleId = scheduleId, detailId = detailId, request = request)
+        }
+    }
+
+    override suspend fun deleteScheduleDetail(
+        scheduleId: Long,
+        scheduleDetailId: Long
+    ): Result<Boolean> {
+        return safeApiCall {
+            scheduleApiService.deleteScheduleDetail(scheduleId, scheduleDetailId)
+        }
+    }
 }

domain/src/main/kotlin/com/ddd/oi/domain/model/schedule/Schedule.kt

@@ -13,12 +13,12 @@ data class Schedule(
     val endedAt: LocalDate,
     val transportation: Transportation,
     val partySet: Set<Party>,
-    val placeList: List<Place>
+    val placeList: List<SchedulePlace>
 )
 
 // todo api 응답이랑 매핑 되게 수정 필요
 @Serializable
-data class Place(
+data class SchedulePlace(
     val id: Long,
     val startTime: String? = null,
     val targetDate: String,
@@ -46,5 +46,5 @@ enum class Party {
 }
 
 data class ScheduleDetail(
-    val details: Map<String, List<Place>>
+    val details: Map<String, List<SchedulePlace>>
 )

domain/src/main/kotlin/com/ddd/oi/domain/repository/ScheduleDetailRepository.kt

@@ -1,12 +1,15 @@
 package com.ddd.oi.domain.repository
 
 import com.ddd.oi.domain.model.Place
-
+import com.ddd.oi.domain.model.schedule.SchedulePlace
 
 
 interface ScheduleDetailRepository {
-    suspend fun getScheduleDetail(scheduleId: Long): Result<Map<String, List<com.ddd.oi.domain.model.schedule.Place>>>
+    suspend fun getScheduleDetail(scheduleId: Long): Result<Map<String, List<SchedulePlace>>>
+
+    suspend fun updateScheduleDetail(scheduleId: Long, scheduleDetail: SchedulePlace): Result<SchedulePlace>
 
+    suspend fun deleteScheduleDetail(scheduleId: Long, scheduleDetailId: Long): Result<Boolean>
 
     suspend fun putScheduleDetail(
         scheduleId: Int,
@@ -16,6 +19,7 @@ interface ScheduleDetailRepository {
 
     suspend fun postScheduleDetail(
         scheduleId: Int,
-        body: List<Place>
+        body: List<Place>,
+        targetDate: String
     ): Boolean
 }

domain/src/main/kotlin/com/ddd/oi/domain/usecase/scheduledetail/DeleteScheduleDetailUseCase.kt

@@ -0,0 +1,5 @@
+package com.ddd.oi.domain.usecase.scheduledetail
+
+interface DeleteScheduleDetailUseCase {
+    suspend operator fun invoke(scheduleId: Long, scheduleDetailId: Long): Result<Boolean>
+}