[API] 특정 사용자 피드 조회 및 기타 api 연결

app/src/main/java/com/texthip/thip/data/model/comments/response/CommentsDeleteResponse.kt

@@ -0,0 +1,8 @@
+package com.texthip.thip.data.model.comments.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CommentsDeleteResponse(
+    val postId: Long
+)

app/src/main/java/com/texthip/thip/data/model/comments/response/CommentsResponse.kt

@@ -11,16 +11,17 @@ data class CommentsResponse(
 
 @Serializable
 data class CommentList(
-    val commentId: Int,
-    val creatorId: Int,
-    val creatorProfileImageUrl: String,
-    val creatorNickname: String,
-    val aliasName: String,
-    val aliasColor: String,
-    val postDate: String,
-    val content: String,
+    val commentId: Int?,
+    val creatorId: Int?,
+    val creatorProfileImageUrl: String?,
+    val creatorNickname: String?,
+    val aliasName: String?,
+    val aliasColor: String?,
+    val postDate: String?,
+    val content: String?,
     val likeCount: Int,
     val isDeleted: Boolean,
+    val isWriter: Boolean,
     val isLike: Boolean,
     val replyList: List<ReplyList>,
 )
@@ -38,4 +39,5 @@ data class ReplyList(
     val content: String,
     val likeCount: Int,
     val isLike: Boolean,
+    val isWriter: Boolean,
 )

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

@@ -0,0 +1,16 @@
+package com.texthip.thip.data.model.feed.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FeedUsersInfoResponse(
+    val creatorId: Int,
+    val profileImageUrl: String,
+    val nickname: String,
+    val aliasName: String,
+    val aliasColor: String,
+    val followerCount: Int,
+    val totalFeedCount: Int,
+    val isFollowing: Boolean,
+    val latestFollowerProfileImageUrls: List<String>
+)

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

@@ -0,0 +1,27 @@
+package com.texthip.thip.data.model.feed.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FeedUsersResponse (
+    val feedList: List<FeedList>,
+    val nextCursor: String? = null,
+    val isLast: Boolean = false,
+)
+
+@Serializable
+data class FeedList(
+    val feedId: Long,
+    val postDate: String,
+    val isbn: String,
+    val bookTitle: String,
+    val bookAuthor: String,
+    val contentBody: String,
+    val contentUrls: List<String>,
+    val likeCount: Int,
+    val commentCount: Int,
+    val isPublic: Boolean,
+    val isSaved: Boolean,
+    val isLiked: Boolean,
+    val isWriter: Boolean,
+)

app/src/main/java/com/texthip/thip/data/model/rooms/request/RoomsDailyGreetingRequest.kt

@@ -0,0 +1,8 @@
+package com.texthip.thip.data.model.rooms.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RoomsDailyGreetingRequest(
+    val content: String,
+)

app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomsDailyGreetingResponse.kt

@@ -0,0 +1,10 @@
+package com.texthip.thip.data.model.rooms.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RoomsDailyGreetingResponse(
+    val attendanceCheckId: Long,
+    val roomId: Long,
+    val isFirstWrite: Boolean,
+)

app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomsDeleteVoteResponse.kt

@@ -0,0 +1,8 @@
+package com.texthip.thip.data.model.rooms.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RoomsDeleteVoteResponse(
+    val roomId: Int
+)

app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomsPostsResponse.kt

@@ -24,6 +24,7 @@ data class PostList(
     val content: String,
     val likeCount: Int,
     val commentCount: Int,
+    val isOverview: Boolean,
     val isLiked: Boolean,
     val isWriter: Boolean,
     val isLocked: Boolean,

app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomsRecordsPinResponse.kt

@@ -0,0 +1,11 @@
+package com.texthip.thip.data.model.rooms.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RoomsRecordsPinResponse(
+    val bookTitle: String,
+    val authorName: String,
+    val bookImageUrl: String,
+    val isbn: String,
+)

app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomsVoteResponse.kt

@@ -4,7 +4,5 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class RoomsVoteResponse(
-    val voteItemId: Int,
-    val roomId: Int,
-    val type: Boolean,
-)
+    val voteItems: List<VoteItems>,
+)

app/src/main/java/com/texthip/thip/data/model/users/response/MyFollowingsResponse.kt

@@ -19,16 +19,4 @@ data class FollowingList(
     @SerializedName("aliasName") val aliasName: String,
     @SerializedName("aliasColor") val aliasColor: String,
     @SerializedName("isFollowing") val isFollowing: Boolean
-)
-
-@Serializable
-data class MyRecentFollowingsResponse(
-    @SerializedName("recentWriters") val recentWriters: List<RecentWriterList>
-)
-
-@Serializable
-data class RecentWriterList(
-    @SerializedName("userId") val userId: Long,
-    @SerializedName("nickname") val nickname: String,
-    @SerializedName("profileImageUrl") val profileImageUrl: String?
 )

app/src/main/java/com/texthip/thip/data/model/users/response/UsersMyFollowingsRecentFeedsResponse.kt

@@ -0,0 +1,15 @@
+package com.texthip.thip.data.model.users.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UsersMyFollowingsRecentFeedsResponse(
+    val recentWriters: List<RecentWriterList>
+)
+
+@Serializable
+data class RecentWriterList(
+    val userId: Long,
+    val nickname: String,
+    val profileImageUrl: String
+)

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

@@ -50,4 +50,10 @@ class CommentsRepository @Inject constructor(
             )
         ).handleBaseResponse().getOrThrow()
     }
+
+    suspend fun deleteComment(
+        commentId: Long
+    ) = runCatching {
+        commentsService.deleteComment(commentId).handleBaseResponse().getOrThrow()
+    }
 }

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

@@ -32,7 +32,7 @@ class FeedRepository @Inject constructor(
         val response = feedService.getFeedWriteInfo()
             .handleBaseResponse()
             .getOrThrow()
-        
+
         // 카테고리 순서 조정
         val orderedCategories = response?.categoryList?.sortedBy { category ->
             when (category.category) {
@@ -44,7 +44,7 @@ class FeedRepository @Inject constructor(
                 else -> 999
             }
         } ?: emptyList()
-        
+
         response?.copy(categoryList = orderedCategories)
     }
 
@@ -69,7 +69,7 @@ class FeedRepository @Inject constructor(
 
         // 임시 파일 목록 추적
         val tempFiles = mutableListOf<File>()
-        
+
         try {
             // 이미지 파일들을 MultipartBody.Part로 변환
             val imageParts = if (imageUris.isNotEmpty()) {
@@ -95,7 +95,11 @@ class FeedRepository @Inject constructor(
         }
     }
 
-    private fun uriToMultipartBodyPart(uri: Uri, paramName: String, tempFiles: MutableList<File>): MultipartBody.Part? {
+    private fun uriToMultipartBodyPart(
+        uri: Uri,
+        paramName: String,
+        tempFiles: MutableList<File>
+    ): MultipartBody.Part? {
         return try {
             // MIME 타입 확인
             val mimeType = context.contentResolver.getType(uri) ?: "image/jpeg"
@@ -105,21 +109,21 @@ class FeedRepository @Inject constructor(
                 "image/jpeg", "image/jpg" -> "jpg"
                 else -> "jpg" // 기본값
             }
-            
+
             // 파일명 생성
             val fileName = "feed_image_${System.currentTimeMillis()}.$extension"
             val tempFile = File(context.cacheDir, fileName)
-            
+
             // 임시 파일 목록에 추가
             tempFiles.add(tempFile)
-            
+
             // InputStream을 use 블록으로 안전하게 관리
             context.contentResolver.openInputStream(uri)?.use { inputStream ->
                 FileOutputStream(tempFile).use { outputStream ->
                     inputStream.copyTo(outputStream)
                 }
             } ?: return null
-            
+
             // MultipartBody.Part 생성
             val requestFile = tempFile.asRequestBody(mimeType.toMediaType())
             MultipartBody.Part.createFormData(paramName, fileName, requestFile)
@@ -141,4 +145,16 @@ class FeedRepository @Inject constructor(
             }
         }
     }
+
+    suspend fun getFeedUsersInfo(userId: Long) = runCatching {
+        feedService.getFeedUsersInfo(userId)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
+    suspend fun getFeedUsers(userId: Long) = runCatching {
+        feedService.getFeedUsers(userId)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
 }

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

@@ -8,6 +8,7 @@ import com.texthip.thip.data.model.rooms.request.CreateRoomRequest
 import com.texthip.thip.data.model.rooms.request.RoomJoinRequest
 import com.texthip.thip.data.model.rooms.request.RoomSecretRoomRequest
 import com.texthip.thip.data.model.rooms.request.RoomsCreateVoteRequest
+import com.texthip.thip.data.model.rooms.request.RoomsDailyGreetingRequest
 import com.texthip.thip.data.model.rooms.request.RoomsPostsLikesRequest
 import com.texthip.thip.data.model.rooms.request.RoomsRecordRequest
 import com.texthip.thip.data.model.rooms.request.RoomsVoteRequest
@@ -223,6 +224,16 @@ class RoomsRepository @Inject constructor(
         ).handleBaseResponse().getOrThrow()
     }
 
+    suspend fun deleteRoomsVote(
+        roomId: Int,
+        voteId: Int
+    ) = runCatching {
+        roomsService.deleteRoomsVote(
+            roomId = roomId,
+            voteId = voteId
+        ).handleBaseResponse().getOrThrow()
+    }
+
     suspend fun postRoomsPostsLikes(
         postId: Int,
         type: Boolean,
@@ -236,4 +247,26 @@ class RoomsRepository @Inject constructor(
             )
         ).handleBaseResponse().getOrThrow()
     }
+
+    suspend fun postRoomsDailyGreeting(
+        roomId: Int,
+        content: String
+    ) = runCatching {
+        roomsService.postRoomsDailyGreeting(
+            roomId = roomId,
+            request = RoomsDailyGreetingRequest(
+                content = content
+            )
+        ).handleBaseResponse().getOrThrow()
+    }
+
+    suspend fun getRoomsRecordsPin(
+        roomId: Int,
+        recordId: Int
+    ) = runCatching {
+        roomsService.getRoomsRecordsPin(
+            roomId = roomId,
+            recordId = recordId
+        ).handleBaseResponse().getOrThrow()
+    }
 }

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

@@ -2,12 +2,11 @@ package com.texthip.thip.data.repository
 
 import com.texthip.thip.data.model.base.handleBaseResponse
 import com.texthip.thip.data.model.users.request.FollowRequest
-import com.texthip.thip.data.model.users.response.MyFollowingsResponse
-import com.texthip.thip.data.model.users.response.MyPageInfoResponse
 import com.texthip.thip.data.model.users.request.NicknameRequest
 import com.texthip.thip.data.model.users.response.AliasChoiceResponse
 import com.texthip.thip.data.model.users.response.FollowResponse
-import com.texthip.thip.data.model.users.response.MyRecentFollowingsResponse
+import com.texthip.thip.data.model.users.response.MyFollowingsResponse
+import com.texthip.thip.data.model.users.response.MyPageInfoResponse
 import com.texthip.thip.data.model.users.response.NicknameResponse
 import com.texthip.thip.data.model.users.response.OthersFollowersResponse
 import com.texthip.thip.data.service.UserService
@@ -28,8 +27,8 @@ class UserRepository @Inject constructor(
             .getOrThrow()
     }
 
-    suspend fun getRecentWriters(): Result<MyRecentFollowingsResponse?> = runCatching {
-        userService.getRecentWriters()
+    suspend fun getMyFollowingsRecentFeeds() = runCatching {
+        userService.getMyFollowingsRecentFeeds()
             .handleBaseResponse()
             .getOrThrow()
     }

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

@@ -4,9 +4,11 @@ import com.texthip.thip.data.model.base.BaseResponse
 import com.texthip.thip.data.model.comments.request.CommentsCreateRequest
 import com.texthip.thip.data.model.comments.request.CommentsLikesRequest
 import com.texthip.thip.data.model.comments.response.CommentsCreateResponse
+import com.texthip.thip.data.model.comments.response.CommentsDeleteResponse
 import com.texthip.thip.data.model.comments.response.CommentsLikesResponse
 import com.texthip.thip.data.model.comments.response.CommentsResponse
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Path
@@ -31,4 +33,9 @@ interface CommentsService {
         @Path("postId") postId: Long,
         @Body request: CommentsCreateRequest
     ): BaseResponse<CommentsCreateResponse>
+
+    @DELETE("comments/{commentId}")
+    suspend fun deleteComment(
+        @Path("commentId") commentId: Long
+    ): BaseResponse<CommentsDeleteResponse>
 }