mod/#109 : 헤으응 해줘잉

JiWoo1261 · JiWoo1261 · commit 68b7e9294fb2 · 2025-07-17T04:35:00.000+09:00
diff --git a/app/src/main/java/com/paw/key/data/dto/response/SavedListResponseDto.kt b/app/src/main/java/com/paw/key/data/dto/response/SavedListResponseDto.kt
@@ -1,59 +1,67 @@
 package com.paw.key.data.dto.response
 
+import com.paw.key.domain.model.entity.archivedlist.ArchivedListEntity
+import com.paw.key.domain.model.entity.archivedlist.ArchivedListPostsEntity
+import com.paw.key.domain.model.entity.archivedlist.WriterEntity
 import com.paw.key.domain.model.entity.savedlist.SavedListEntity
+import com.paw.key.domain.model.entity.savedlist.SavedListPostEntity
 import com.paw.key.domain.model.entity.savedlist.SavedWriterEntity
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class SavedListResponseDto(
-    @SerialName("postId")
-    val postId: Long,
+data class SavedListResponseDataDto(
+    @SerialName("posts")
+    val posts: List<SavedDto>
+) {
+    fun toEntity() = SavedListPostEntity(
+        posts = posts.map { it.toEntity() }
+    )
+}
 
+@Serializable
+data class SavedDto(
+    @SerialName("postId")
+    val postId: Int,
     @SerialName("createdAt")
     val createdAt: String,
-
-    @SerialName("isLiked")
-    val isLiked: Boolean,
-
+    @SerialName("isLike")
+    val isLike: Boolean,
     @SerialName("title")
     val title: String,
-
     @SerialName("representativeImageUrl")
-    val representativeImageUrl: String,
-
+    val representativeImageUrl: String? = null,
+    @SerialName("routeId")
+    val routeId: Int,
     @SerialName("writer")
-    val writer: List<SavedWriterDto>,
-
+    val writer: SavedWriterDto,
     @SerialName("descriptionTags")
     val descriptionTags: List<String>
-
-){
+) {
     fun toEntity() = SavedListEntity(
         postId = postId,
         createdAt = createdAt,
-        isLiked = isLiked,
+        isLiked = isLike,
         title = title,
-        representativeImageUrl = representativeImageUrl,
-        writer = writer.map { it.toEntity() },
+        representativeImageUrl = representativeImageUrl ?: "",
+        routeId = routeId,
+        writer = writer.toEntity(),
         descriptionTags = descriptionTags
     )
 }
 
 @Serializable
 data class SavedWriterDto(
     @SerialName("userId")
-    val userId: Long,
-
+    val userId: Int,
     @SerialName("petName")
     val petName: String,
-
     @SerialName("petProfileImageUrl")
     val petProfileImageUrl: String
-){
+) {
     fun toEntity() = SavedWriterEntity(
         userId = userId,
         petName = petName,
         petProfileImageUrl = petProfileImageUrl
     )
-}
+}
diff --git a/app/src/main/java/com/paw/key/data/repositoryimpl/SavedListRepositoryImpl.kt b/app/src/main/java/com/paw/key/data/repositoryimpl/SavedListRepositoryImpl.kt
@@ -2,13 +2,14 @@ package com.paw.key.data.repositoryimpl
 
 import com.paw.key.data.remote.datasource.SavedListDataSource
 import com.paw.key.domain.model.entity.savedlist.SavedListEntity
+import com.paw.key.domain.model.entity.savedlist.SavedListPostEntity
 import com.paw.key.domain.repository.SavedListRepository
 import javax.inject.Inject
 
 class SavedListRepositoryImpl @Inject constructor(
     private val savedListDataSource: SavedListDataSource,
 ) : SavedListRepository {
-    override suspend fun getSavedList(userId: Int): Result<List<SavedListEntity>> = runCatching {
-        savedListDataSource.getSavedList(userId).data.map { it.toEntity() }
+    override suspend fun getSavedList(userId: Int): Result<SavedListPostEntity> = runCatching {
+        savedListDataSource.getSavedList(userId).data.toEntity()
     }
 }
diff --git a/app/src/main/java/com/paw/key/data/service/LikeService.kt b/app/src/main/java/com/paw/key/data/service/LikeService.kt
@@ -8,15 +8,15 @@ import retrofit2.http.Path
 
 interface LikeService {
 
-    @POST("/api/v1/likes/{courseId}")
+    @POST("/api/v1/likes/{postId}")
     suspend fun likeCourse(
         @Header("X-USER-ID") userId: Int,
-        @Path("courseId") courseId: Int
+        @Path("postId") postId: Int
     ): BaseResponse<Unit>
 
-    @DELETE("/api/v1/likes/{courseId}")
+    @DELETE("/api/v1/likes/{postId}")
     suspend fun unlikeCourse(
         @Header("X-USER-ID") userId: Int,
-        @Path("courseId") courseId: Int
+        @Path("postId") postId: Int
     ): BaseResponse<Unit>
 }
diff --git a/app/src/main/java/com/paw/key/data/service/SavedListService.kt b/app/src/main/java/com/paw/key/data/service/SavedListService.kt
@@ -1,13 +1,13 @@
 package com.paw.key.data.service
 
 import com.paw.key.data.dto.response.BaseResponse
-import com.paw.key.data.dto.response.SavedListResponseDto
+import com.paw.key.data.dto.response.SavedListResponseDataDto
 import retrofit2.http.GET
 import retrofit2.http.Header
 
 interface SavedListService {
     @GET("users/me/likes")
     suspend fun getSavedList(
         @Header("X-USER-ID") userId: Int
-    ): BaseResponse<List<SavedListResponseDto>>
+    ): BaseResponse<SavedListResponseDataDto>
 }
diff --git a/app/src/main/java/com/paw/key/domain/model/entity/savedlist/SavedListEntity.kt b/app/src/main/java/com/paw/key/domain/model/entity/savedlist/SavedListEntity.kt
@@ -1,16 +1,21 @@
 package com.paw.key.domain.model.entity.savedlist
 
+
+data class SavedListPostEntity(
+    val posts: List<SavedListEntity>
+)
 data class SavedListEntity(
-    val postId: Long,
+    val postId: Int,
     val createdAt: String,
     val isLiked: Boolean,
     val title: String,
     val representativeImageUrl: String,
-    val writer: List<SavedWriterEntity>,
+    val routeId: Int,
+    val writer: SavedWriterEntity,
     val descriptionTags: List<String>
 )
 data class SavedWriterEntity(
-    val userId: Long,
+    val userId: Int,
     val petName: String,
     val petProfileImageUrl: String
 )
diff --git a/app/src/main/java/com/paw/key/domain/repository/LikeRepository.kt b/app/src/main/java/com/paw/key/domain/repository/LikeRepository.kt
@@ -1,6 +1,6 @@
 package com.paw.key.domain.repository
 
 interface LikeRepository {
-    suspend fun likeCourse(userId: Int, courseId: Int): Result<Unit>
-    suspend fun unlikeCourse(userId: Int, courseId: Int): Result<Unit>
+    suspend fun likeCourse(userId: Int, postId: Int): Result<Unit>
+    suspend fun unlikeCourse(userId: Int, postId: Int): Result<Unit>
 }
diff --git a/app/src/main/java/com/paw/key/domain/repository/SavedListRepository.kt b/app/src/main/java/com/paw/key/domain/repository/SavedListRepository.kt
@@ -1,7 +1,8 @@
 package com.paw.key.domain.repository
 
 import com.paw.key.domain.model.entity.savedlist.SavedListEntity
+import com.paw.key.domain.model.entity.savedlist.SavedListPostEntity
 
 interface SavedListRepository {
-    suspend fun getSavedList(userId: Int): Result<List<SavedListEntity>>
+    suspend fun getSavedList(userId: Int): Result<SavedListPostEntity>
 }
diff --git a/app/src/main/java/com/paw/key/presentation/ui/course/entire/tab/map/List/viewmodel/TapListViewModel.kt b/app/src/main/java/com/paw/key/presentation/ui/course/entire/tab/map/List/viewmodel/TapListViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.paw.key.data.dto.request.list.PostsListRequestDto
 import com.paw.key.data.dto.request.list.TraitList
+import com.paw.key.domain.repository.LikeRepository
 import com.paw.key.domain.repository.filter.FilterOptionRepository
 import com.paw.key.domain.repository.list.PostsListRepository
 import com.paw.key.presentation.ui.course.entire.tab.map.List.state.TapListContract
@@ -18,7 +19,8 @@ import javax.inject.Inject
 @HiltViewModel
 class TapListViewModel @Inject constructor(
     private val filterOptionRepository: FilterOptionRepository,
-    private val postsListRepository: PostsListRepository
+    private val postsListRepository: PostsListRepository,
+    private val likeRepository: LikeRepository
 ) : ViewModel() {
 
     private val _state = MutableStateFlow(TapListContract.TapListState())
@@ -122,6 +124,13 @@ class TapListViewModel @Inject constructor(
             }
         }
     }
+
+    fun toggleLike(userId: Int, postId: Int) {
+        viewModelScope.launch {
+            likeRepository.likeCourse(userId = 2, postId = 6)
+        }
+    }
+
     fun updateMood(option: String) {
         _state.update {
             it.copy(
diff --git a/app/src/main/java/com/paw/key/presentation/ui/mypage/ArchivedCourseListScreen.kt b/app/src/main/java/com/paw/key/presentation/ui/mypage/ArchivedCourseListScreen.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -25,6 +26,11 @@ fun ArchivedCourseRoute(
 ) {
     val state = viewModel.state.collectAsStateWithLifecycle()
 
+    LaunchedEffect(Unit) {
+        // Todo : userId 네비게이션 연결
+        viewModel.getArchivedList(userId = 2)
+    }
+
     ArchivedCourseListScreen(
         state = state.value,
         navigateUp = navigateUp,
diff --git a/app/src/main/java/com/paw/key/presentation/ui/mypage/MyPageScreen.kt b/app/src/main/java/com/paw/key/presentation/ui/mypage/MyPageScreen.kt
@@ -332,7 +332,9 @@ fun WalkRouteList(
                 Icon(
                     imageVector = ImageVector.vectorResource(id = R.drawable.ic_arrow_right),
                     modifier = modifier.clickable {
-                        if (index == 0) navigateSavedCourse() else navigateArchivedCourse()
+                        if (index == 0)
+                            navigateSavedCourse()
+                        else navigateArchivedCourse()
                     },
                     contentDescription = "산책루트 메뉴 이동"
                 )
diff --git a/app/src/main/java/com/paw/key/presentation/ui/mypage/SavedCourseListScreen.kt b/app/src/main/java/com/paw/key/presentation/ui/mypage/SavedCourseListScreen.kt
@@ -30,7 +30,8 @@ fun SavedCourseRoute(
         navigateUp = navigateUp,
         navigateNext = navigateNext,
         onClickLike = {
-            //viewModel.onClickLike()
+            // Todo : postid 네비게이션 연결
+            viewModel.toggleLike(postId = 28, isLiked = false)
         },
         modifier = modifier
     )
@@ -44,7 +45,12 @@ fun SavedCourseListScreen(
     onClickLike: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    Column {
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .background(PawKeyTheme.colors.white2)
+    ) {
+
         TopBar(
             title = "저장한 산책 루트",
             onBackClick = navigateUp
@@ -62,8 +68,8 @@ fun SavedCourseListScreen(
                     title = item.title,
                     createdAt = item.createdAt,
                     representativeImageUrl = item.representativeImageUrl,
-                    petName = item.writer.first().petName,
-                    petProfileImageUrl = item.writer.first().petProfileImageUrl,
+                    petName = item.writer.petName,
+                    petProfileImageUrl = item.writer.petProfileImageUrl,
                     descriptionTags = item.descriptionTags,
                     isLiked = item.isLiked,
                     onClickItem = navigateNext,
diff --git a/app/src/main/java/com/paw/key/presentation/ui/mypage/state/SavedListContract.kt b/app/src/main/java/com/paw/key/presentation/ui/mypage/state/SavedListContract.kt
@@ -1,24 +1,24 @@
 package com.paw.key.presentation.ui.mypage.state
 
 import androidx.compose.runtime.Immutable
-import com.paw.key.domain.model.entity.archivedlist.ArchivedListEntity
 import com.paw.key.domain.model.entity.savedlist.SavedListEntity
+import com.paw.key.domain.model.entity.savedlist.SavedListPostEntity
 
 @Immutable
 data class SavedListState(
-    val courseList: List<ArchivedListEntity> = emptyList()
+    val courseList: List<SavedListEntity> = emptyList()
 )
 
-//@Immutable
-//data class CourseCardData(
-//    //제목
-//    val description: String,
-//    val petName: String,
-//    val createdAt: String,
-//    val isShared: Boolean,
-//    val isLiked: Boolean,
-//    val imageUrl: String,
-//)
+@Immutable
+data class CourseCardData(
+    //제목
+    val description: String,
+    val petName: String,
+    val createdAt: String,
+    val isShared: Boolean,
+    val isLiked: Boolean,
+    val imageUrl: String,
+)
 
 sealed class SavedListSideEffect {
     data class ShowSnackBar(val message: String) : SavedListSideEffect()
diff --git a/app/src/main/java/com/paw/key/presentation/ui/mypage/viewmodel/MyPageViewModel.kt b/app/src/main/java/com/paw/key/presentation/ui/mypage/viewmodel/MyPageViewModel.kt
@@ -2,6 +2,7 @@ package com.paw.key.presentation.ui.mypage.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.paw.key.domain.repository.SavedListRepository
 import com.paw.key.domain.repository.petprofile.PetProfileRepository
 import com.paw.key.domain.repository.userprofile.UserProfileRepository
 import com.paw.key.presentation.ui.mypage.state.MyPageSideEffect
@@ -19,7 +20,7 @@ import javax.inject.Inject
 @HiltViewModel
 class MyPageViewModel @Inject constructor(
     private val petProfileRepository: PetProfileRepository,
-    private val userProfileRepository: UserProfileRepository
+    private val userProfileRepository: UserProfileRepository,
 ) : ViewModel() {
     private val _state = MutableStateFlow(MyPageState())
     val state: StateFlow<MyPageState>
diff --git a/app/src/main/java/com/paw/key/presentation/ui/mypage/viewmodel/SavedListViewModel.kt b/app/src/main/java/com/paw/key/presentation/ui/mypage/viewmodel/SavedListViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package com.paw.key.domain.repository`
`2`	`2`
`3`	`3`	`interface LikeRepository {`
`4`		`- suspend fun likeCourse(userId: Int, courseId: Int): Result<Unit>`
`5`		`- suspend fun unlikeCourse(userId: Int, courseId: Int): Result<Unit>`
	`4`	`+ suspend fun likeCourse(userId: Int, postId: Int): Result<Unit>`
	`5`	`+ suspend fun unlikeCourse(userId: Int, postId: Int): Result<Unit>`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`package com.paw.key.domain.repository`
`2`	`2`
`3`	`3`	`import com.paw.key.domain.model.entity.savedlist.SavedListEntity`
	`4`	`+import com.paw.key.domain.model.entity.savedlist.SavedListPostEntity`
`4`	`5`
`5`	`6`	`interface SavedListRepository {`
`6`		`- suspend fun getSavedList(userId: Int): Result<List<SavedListEntity>>`
	`7`	`+ suspend fun getSavedList(userId: Int): Result<SavedListPostEntity>`
`7`	`8`	`}`