develop 브랜치 최신화

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/FeedDetailResponse.kt

@@ -0,0 +1,26 @@
+package com.texthip.thip.data.model.feed.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class FeedDetailResponse(
+    @SerialName("feedId") val feedId: Int,
+    @SerialName("creatorId") val creatorId: Int,
+    @SerialName("creatorNickname") val creatorNickname: String,
+    @SerialName("creatorProfileImageUrl") val creatorProfileImageUrl: String?,
+    @SerialName("aliasName") val aliasName: String,
+    @SerialName("aliasColor") val aliasColor: String,
+    @SerialName("postDate") val postDate: String,
+    @SerialName("bookTitle") val bookTitle: String,
+    @SerialName("isbn") val isbn: String,
+    @SerialName("bookAuthor") val bookAuthor: String,
+    @SerialName("contentBody") val contentBody: String,
+    @SerialName("contentUrls") val contentUrls: List<String>,
+    @SerialName("likeCount") val likeCount: Int,
+    @SerialName("commentCount") val commentCount: Int,
+    @SerialName("isSaved") val isSaved: Boolean,
+    @SerialName("isLiked") val isLiked: Boolean,
+    @SerialName("isWriter") val isWriter: Boolean,
+    @SerialName("tagList") val tagList: List<String>
+)

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/feeds/response/AllFeedResponse.kt

@@ -0,0 +1,33 @@
+package com.texthip.thip.data.model.feeds.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class AllFeedResponse(
+    @SerialName("feedList") val feedList: List<AllFeedItem>,
+    @SerialName("nextCursor") val nextCursor: String?,
+    @SerialName("isLast") val isLast: Boolean
+)
+
+@Serializable
+data class AllFeedItem(
+    @SerialName("feedId") val feedId: Int,
+    @SerialName("creatorId") val creatorId: Int,
+    @SerialName("creatorNickname") val creatorNickname: String,
+    @SerialName("creatorProfileImageUrl") val creatorProfileImageUrl: String?,
+    @SerialName("aliasName") val aliasName: String,
+    @SerialName("aliasColor") val aliasColor: String,
+    @SerialName("postDate") val postDate: String,
+    @SerialName("isbn") val isbn: String,
+    @SerialName("bookTitle") val bookTitle: String,
+    @SerialName("bookAuthor") val bookAuthor: String,
+    @SerialName("contentBody") val contentBody: String,
+    @SerialName("contentUrls") val contentUrls: List<String>,
+    @SerialName("likeCount") val likeCount: Int,
+    @SerialName("commentCount") val commentCount: Int,
+    @SerialName("isSaved") val isSaved: Boolean,
+    @SerialName("isLiked") val isLiked: Boolean,
+    @SerialName("isWriter") val isWriter: Boolean
+)

app/src/main/java/com/texthip/thip/data/model/feeds/response/MyFeedResponse.kt

@@ -0,0 +1,27 @@
+package com.texthip.thip.data.model.feeds.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class MyFeedResponse(
+    @SerialName("feedList") val feedList: List<MyFeedItem>,
+    @SerialName("nextCursor") val nextCursor: String?,
+    @SerialName("isLast") val isLast: Boolean
+)
+
+@Serializable
+data class MyFeedItem(
+    @SerialName("feedId") val feedId: Int,
+    @SerialName("postDate") val postDate: String,
+    @SerialName("isbn") val isbn: String,
+    @SerialName("bookTitle") val bookTitle: String,
+    @SerialName("bookAuthor") val bookAuthor: String,
+    @SerialName("contentBody") val contentBody: String,
+    @SerialName("contentUrls") val contentUrls: List<String>,
+    @SerialName("likeCount") val likeCount: Int,
+    @SerialName("commentCount") val commentCount: Int,
+    @SerialName("isPublic") val isPublic: Boolean,
+    @SerialName("isWriter") 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()
+    }
 }