Merge branch 'develop' into feat/#83_API_Rooms

Author: rbqks529

app/src/main/AndroidManifest.xml

@@ -17,6 +17,7 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
+            android:windowSoftInputMode="adjustResize"
             android:label="@string/app_name"
             android:theme="@style/Theme.Thip">
             <intent-filter>

app/src/main/java/com/texthip/thip/data/di/ServiceModule.kt

@@ -2,6 +2,8 @@ package com.texthip.thip.data.di
 
 import com.texthip.thip.data.service.BookService
 import com.texthip.thip.data.service.RecentSearchService
+import com.texthip.thip.data.service.CommentsService
+import com.texthip.thip.data.service.GroupService
 import com.texthip.thip.data.service.RoomsService
 import com.texthip.thip.data.service.UserService
 import dagger.Module
@@ -36,4 +38,9 @@ object ServiceModule {
     fun provideRecentSearchService(retrofit: Retrofit): RecentSearchService {
         return retrofit.create(RecentSearchService::class.java)
     }
+
+    @Provides
+    @Singleton
+    fun providesCommentsService(retrofit: Retrofit): CommentsService =
+        retrofit.create(CommentsService::class.java)
 }

app/src/main/java/com/texthip/thip/data/model/comments/request/CommentsCreateRequest.kt

@@ -0,0 +1,11 @@
+package com.texthip.thip.data.model.comments.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CommentsCreateRequest(
+    val content: String,
+    val isReplyRequest: Boolean,
+    val parentId: Int? = null,
+    val postType: String,
+)

app/src/main/java/com/texthip/thip/data/model/comments/request/CommentsLikesRequest.kt

@@ -0,0 +1,8 @@
+package com.texthip.thip.data.model.comments.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CommentsLikesRequest(
+    val type: Boolean
+)

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

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

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

@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.comments.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CommentsLikesResponse(
+    val commentId: Int,
+    val isLiked: Boolean,
+)

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

@@ -0,0 +1,41 @@
+package com.texthip.thip.data.model.comments.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CommentsResponse(
+    val commentList: List<CommentList>,
+    val nextCursor: String?,
+    val isLast: Boolean,
+)
+
+@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 likeCount: Int,
+    val isDeleted: Boolean,
+    val isLike: Boolean,
+    val replyList: List<ReplyList>,
+)
+
+@Serializable
+data class ReplyList(
+    val commentId: Int,
+    val parentCommentCreatorNickname: String,
+    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 isLike: Boolean,
+)

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

@@ -12,6 +12,7 @@ data class RoomsPlayingResponse(
     val progressStartDate: String,
     val progressEndDate: String,
     val category: String,
+    val categoryColor: String,
     val roomDescription: String,
     val memberCount: Int,
     val recruitCount: Int,

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

@@ -12,6 +12,7 @@ data class UserList(
     val userId: Int,
     val nickname: String,
     val imageUrl: String,
+    val aliasColor: String,
     val aliasName: String,
     val followerCount: Int,
 )

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

@@ -0,0 +1,53 @@
+package com.texthip.thip.data.repository
+
+import com.texthip.thip.data.model.base.handleBaseResponse
+import com.texthip.thip.data.model.comments.request.CommentsCreateRequest
+import com.texthip.thip.data.model.comments.request.CommentsLikesRequest
+import com.texthip.thip.data.service.CommentsService
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CommentsRepository @Inject constructor(
+    private val commentsService: CommentsService,
+) {
+    suspend fun getComments(
+        postId: Long,
+        postType: String = "RECORD",
+        cursor: String? = null,
+    ) = runCatching {
+        commentsService.getComments(
+            postId = postId,
+            postType = postType,
+            cursor = cursor
+        ).handleBaseResponse().getOrThrow()
+    }
+
+    suspend fun likeComment(
+        commentId: Long,
+        type: Boolean
+    ) = runCatching {
+        commentsService.likeComment(
+            commentId = commentId,
+            response = CommentsLikesRequest(type)
+        ).handleBaseResponse().getOrThrow()
+    }
+
+    suspend fun createComment(
+        postId: Long,
+        content: String,
+        isReplyRequest: Boolean,
+        parentId: Int? = null,
+        postType: String = "RECORD",
+    ) = runCatching {
+        commentsService.createComment(
+            postId = postId,
+            request = CommentsCreateRequest(
+                content = content,
+                isReplyRequest = isReplyRequest,
+                parentId = parentId,
+                postType = postType
+            )
+        ).handleBaseResponse().getOrThrow()
+    }
+}