merge #113 ->develop

[Mod/#109] api연결 다해따. .

Author: vvan2

app/src/main/java/com/paw/key/core/designsystem/component/ImageModal.kt

@@ -37,17 +37,6 @@ fun ImageModal(
                 .wrapContentSize(),
             horizontalAlignment = Alignment.End
         ) {
-            Icon(
-                imageVector = Icons.Default.Close,
-                contentDescription = "닫기",
-                tint = Color.White,
-                modifier = Modifier
-                    .align(Alignment.End)
-                    .clickable { onDismiss() }
-                    .padding(bottom = 8.dp)
-                    .size(24.dp)
-            )
-
             AsyncImage(
                 model = imageUrl,
                 contentDescription = null,
@@ -62,11 +51,6 @@ fun ImageModal(
 //                contentDescription = null,
 //                modifier = Modifier
 //            )
-            /*Image( //테스트용!!
-                painter = painterResource(id = R.drawable.test),
-                contentDescription = null,
-                modifier = Modifier
-            )*/
         }
     }
 }

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
     )
-}
+}

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()
     }
 }

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>
 }

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>
 }

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
 )

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>
 }

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>
 }

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(
@@ -315,19 +324,19 @@ class TapListViewModel @Inject constructor(
         return isAllOptionsSelected()
     }
 
-    fun toggleLike(postId: Int, isLiked: Boolean) {
-        viewModelScope.launch {
-            _state.update { state ->
-                val updatedPosts = state.postsResult?.posts?.map {
-                    if (it.postId == postId) it.copy(isLike = isLiked) else it
-                } ?: emptyList()
-
-                val updatedPostsResult = state.postsResult?.copy(posts = updatedPosts)
-
-                state.copy(
-                    postsResult = updatedPostsResult
-                )
-            }
-        }
-    }
+//    fun toggleLike(postId: Int, isLiked: Boolean) {
+//        viewModelScope.launch {
+//            _state.update { state ->
+//                val updatedPosts = state.postsResult?.posts?.map {
+//                    if (it.postId == postId) it.copy(isLike = isLiked) else it
+//                } ?: emptyList()
+//
+//                val updatedPostsResult = state.postsResult?.copy(posts = updatedPosts)
+//
+//                state.copy(
+//                    postsResult = updatedPostsResult
+//                )
+//            }
+//        }
+//    }
 }

app/src/main/java/com/paw/key/presentation/ui/mypage/ArchivedCourseDetailScreen.kt

@@ -115,7 +115,7 @@ fun ArchivedCourseDetailScreen(
                         petName = petName,
                         date = date,
                         location = location,
-                        isLike = isLike,
+                        onClickLike = {},
                         content = content,
                         petProfileImage = petProfileImage,
                         routeMapImageUrl = routeMapImageUrl,