[Feat] 피드 나머지 api 연동

app/src/main/java/com/texthip/thip/data/model/feed/request/FeedLikeRequest.kt

@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.feed.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FeedLikeRequest(
+    @SerialName("type") val type: Boolean
+)

app/src/main/java/com/texthip/thip/data/model/feed/request/FeedSaveRequest.kt

@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.feed.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FeedSaveRequest(
+    @SerialName("type") val type: Boolean
+)

app/src/main/java/com/texthip/thip/data/model/feed/response/FeedLikeResponse.kt

@@ -0,0 +1,10 @@
+package com.texthip.thip.data.model.feed.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FeedLikeResponse(
+    @SerialName("feedId") val feedId: Long,
+    @SerialName("isLiked") val isLiked: Boolean
+)

app/src/main/java/com/texthip/thip/data/model/feed/response/FeedSaveResponse.kt

@@ -0,0 +1,10 @@
+package com.texthip.thip.data.model.feed.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FeedSaveResponse(
+    @SerialName("feedId") val feedId: Long,
+    @SerialName("isSaved") val isSaved: Boolean
+)

app/src/main/java/com/texthip/thip/data/repository/FeedRepository.kt

@@ -4,14 +4,18 @@ import android.content.Context
 import android.net.Uri
 import com.texthip.thip.data.model.base.handleBaseResponse
 import com.texthip.thip.data.model.feed.request.CreateFeedRequest
+import com.texthip.thip.data.model.feed.request.FeedLikeRequest
+import com.texthip.thip.data.model.feed.request.FeedSaveRequest
 import com.texthip.thip.data.model.feed.request.UpdateFeedRequest
+import com.texthip.thip.data.model.feed.response.AllFeedResponse
 import com.texthip.thip.data.model.feed.response.CreateFeedResponse
 import com.texthip.thip.data.model.feed.response.FeedDetailResponse
-import com.texthip.thip.data.model.feed.response.FeedWriteInfoResponse
+import com.texthip.thip.data.model.feed.response.FeedLikeResponse
 import com.texthip.thip.data.model.feed.response.FeedMineInfoResponse
-import com.texthip.thip.data.model.feed.response.RelatedBooksResponse
-import com.texthip.thip.data.model.feed.response.AllFeedResponse
+import com.texthip.thip.data.model.feed.response.FeedSaveResponse
+import com.texthip.thip.data.model.feed.response.FeedWriteInfoResponse
 import com.texthip.thip.data.model.feed.response.MyFeedResponse
+import com.texthip.thip.data.model.feed.response.RelatedBooksResponse
 import com.texthip.thip.data.service.FeedService
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
@@ -169,15 +173,15 @@ class FeedRepository @Inject constructor(
     }
 
     /** 피드 상세 조회 */
-    suspend fun getFeedDetail(feedId: Int): Result<FeedDetailResponse?> = runCatching {
+    suspend fun getFeedDetail(feedId: Long): Result<FeedDetailResponse?> = runCatching {
         feedService.getFeedDetail(feedId)
             .handleBaseResponse()
             .getOrThrow()
     }
 
     /** 피드 수정 */
     suspend fun updateFeed(
-        feedId: Int,
+        feedId: Long,
         contentBody: String? = null,
         isPublic: Boolean? = null,
         tagList: List<String>? = null,
@@ -194,7 +198,6 @@ class FeedRepository @Inject constructor(
             .handleBaseResponse()
             .getOrThrow()
     }
-
     /** 임시 파일들을 정리하는 함수 */
     private fun cleanupTempFiles(tempFiles: List<File>) {
         tempFiles.forEach { file ->
@@ -219,4 +222,27 @@ class FeedRepository @Inject constructor(
             .handleBaseResponse()
             .getOrThrow()
     }
+
+    /** 피드 삭제 */
+    suspend fun deleteFeed(feedId: Long): Result<String?> = runCatching {
+        feedService.deleteFeed(feedId)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
+    suspend fun changeFeedLike(feedId: Long, newLikeStatus: Boolean): Result<FeedLikeResponse?> = runCatching {
+        val request = FeedLikeRequest(type = newLikeStatus)
+        feedService.changeFeedLike(feedId, request)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
+    /** 피드 저장 */
+    suspend fun changeFeedSave(feedId: Long, newSaveStatus: Boolean): Result<FeedSaveResponse?> = runCatching {
+        val request = FeedSaveRequest(type = newSaveStatus)
+        feedService.changeFeedSave(feedId, request)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
 }

app/src/main/java/com/texthip/thip/data/service/FeedService.kt

@@ -1,19 +1,24 @@
 package com.texthip.thip.data.service
 
 import com.texthip.thip.data.model.base.BaseResponse
+import com.texthip.thip.data.model.feed.request.FeedLikeRequest
+import com.texthip.thip.data.model.feed.request.FeedSaveRequest
+import com.texthip.thip.data.model.feed.request.UpdateFeedRequest
+import com.texthip.thip.data.model.feed.response.AllFeedResponse
 import com.texthip.thip.data.model.feed.response.CreateFeedResponse
 import com.texthip.thip.data.model.feed.response.FeedDetailResponse
+import com.texthip.thip.data.model.feed.response.FeedLikeResponse
+import com.texthip.thip.data.model.feed.response.FeedMineInfoResponse
+import com.texthip.thip.data.model.feed.response.FeedSaveResponse
 import com.texthip.thip.data.model.feed.response.FeedUsersInfoResponse
 import com.texthip.thip.data.model.feed.response.FeedUsersResponse
 import com.texthip.thip.data.model.feed.response.FeedWriteInfoResponse
-import com.texthip.thip.data.model.feed.response.FeedMineInfoResponse
-import com.texthip.thip.data.model.feed.response.RelatedBooksResponse
-import com.texthip.thip.data.model.feed.response.AllFeedResponse
 import com.texthip.thip.data.model.feed.response.MyFeedResponse
-import com.texthip.thip.data.model.feed.request.UpdateFeedRequest
+import com.texthip.thip.data.model.feed.response.RelatedBooksResponse
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.Multipart
 import retrofit2.http.PATCH
@@ -64,7 +69,7 @@ interface FeedService {
     /** 피드 상세 조회 */
     @GET("feeds/{feedId}")
     suspend fun getFeedDetail(
-        @Path("feedId") feedId: Int
+        @Path("feedId") feedId: Long
     ): BaseResponse<FeedDetailResponse>
 
     @GET("feeds/users/{userId}/info")
@@ -77,10 +82,30 @@ interface FeedService {
         @Path("userId") userId: Long
     ): BaseResponse<FeedUsersResponse>
 
+    /** 피드 삭제 */
+    @DELETE("feeds/{feedId}")
+    suspend fun deleteFeed(
+        @Path("feedId") feedId: Long
+    ): BaseResponse<String>
+
+    /** 피드 좋아요 상태 변경 */
+    @POST("feeds/{feedId}/likes")
+    suspend fun changeFeedLike(
+        @Path("feedId") feedId: Long,
+        @Body request: FeedLikeRequest
+    ): BaseResponse<FeedLikeResponse>
+
     /** 피드 수정 */
     @PATCH("feeds/{feedId}")
     suspend fun updateFeed(
-        @Path("feedId") feedId: Int,
+        @Path("feedId") feedId: Long,
         @Body request: UpdateFeedRequest
     ): BaseResponse<CreateFeedResponse>
+
+    /** 피드 저장 상태 변경 */
+    @POST("feeds/{feedId}/saved")
+    suspend fun changeFeedSave(
+        @Path("feedId") feedId: Long,
+        @Body request: FeedSaveRequest
+    ): BaseResponse<FeedSaveResponse>
 }

app/src/main/java/com/texthip/thip/ui/common/buttons/ActionBarButton.kt

@@ -30,6 +30,7 @@ fun ActionBarButton(
     isSaveVisible: Boolean = false,
     isSaved: Boolean = false,
     isPinVisible: Boolean = false,
+    isLockIcon: Boolean = false,
     onLikeClick: () -> Unit = {},
     onCommentClick: () -> Unit = {},
     onBookmarkClick: () -> Unit = {},
@@ -88,12 +89,22 @@ fun ActionBarButton(
         }
 
         if (isSaveVisible) {
-            Icon(
-                modifier = Modifier.clickable { onBookmarkClick() },
-                painter = painterResource(if (isSaved) R.drawable.ic_save_filled else R.drawable.ic_save),
-                contentDescription = null,
-                tint = Color.Unspecified
-            )
+            if (isLockIcon) {
+                Icon(
+                    painter = painterResource(R.drawable.ic_lock),
+                    contentDescription = null,
+                    tint = Color.Unspecified
+                )
+            } else {
+                Icon(
+                    modifier = Modifier.clickable { onBookmarkClick() },
+                    painter = painterResource(
+                        if (isSaved) R.drawable.ic_save_filled else R.drawable.ic_save
+                    ),
+                    contentDescription = null,
+                    tint = Color.Unspecified
+                )
+            }
         }
     }
 }
@@ -110,10 +121,11 @@ private fun ActionBarButtonPreview() {
         commentCount = 45,
         isSaveVisible = true,
         isSaved = isSaved,
-        isPinVisible = true,
+        isPinVisible = false,
         onLikeClick = { isLiked = !isLiked },
         onCommentClick = {},
         onBookmarkClick = { isSaved = !isSaved },
-        onPinClick = {}
+        onPinClick = {},
+        isLockIcon = true
     )
 }

app/src/main/java/com/texthip/thip/ui/feed/component/MyFeedCard.kt

@@ -128,7 +128,7 @@ fun MyFeedCard(
 @Composable
 private fun MyFeedCardPrev() {
     val feed1 = FeedItem(
-        id = 1,
+        id = 1L,
         userProfileImage = "https://example.com/profile1.jpg",
         userName = "user.01",
         userRole = stringResource(R.string.influencer),
@@ -144,7 +144,7 @@ private fun MyFeedCardPrev() {
         imageUrls = emptyList()
     )
     val feed2 = FeedItem(
-        id = 2,
+        id = 2L,
         userProfileImage = "https://example.com/profile2.jpg",
         userName = "user.01",
         userRole = stringResource(R.string.influencer),