Merge pull request #134 from Nico1eKim/api/#133-group_note_edit

[API] 기록장 기록, 투표 수정

Author: Nico1eKim

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

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

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

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

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

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

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

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

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

@@ -35,6 +35,6 @@ data class PostList(
 data class VoteItems(
     val voteItemId: Int,
     val itemName: String,
-    val percentage: Int,
+    val count: Int,
     val isVoted: Boolean,
 )

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

@@ -9,6 +9,8 @@ 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.RoomsCreateDailyGreetingRequest
 import com.texthip.thip.data.model.rooms.request.RoomsCreateVoteRequest
+import com.texthip.thip.data.model.rooms.request.RoomsPatchRecordRequest
+import com.texthip.thip.data.model.rooms.request.RoomsPatchVoteRequest
 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
@@ -316,4 +318,32 @@ class RoomsRepository @Inject constructor(
             roomId = roomId,
         ).handleBaseResponse().getOrThrow()
     }
+
+    suspend fun patchRoomsRecord(
+        roomId: Int,
+        recordId: Int,
+        content: String
+    ) = runCatching {
+        roomsService.patchRoomsRecord(
+            roomId = roomId,
+            recordId = recordId,
+            request = RoomsPatchRecordRequest(
+                content = content
+            )
+        ).handleBaseResponse().getOrThrow()
+    }
+
+    suspend fun patchRoomsVote(
+        roomId: Int,
+        voteId: Int,
+        content: String,
+    ) = runCatching {
+        roomsService.patchRoomsVote(
+            roomId = roomId,
+            voteId = voteId,
+            request = RoomsPatchVoteRequest(
+                content = content,
+            )
+        ).handleBaseResponse().getOrThrow()
+    }
 }

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

@@ -6,6 +6,8 @@ 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.RoomsCreateDailyGreetingRequest
 import com.texthip.thip.data.model.rooms.request.RoomsCreateVoteRequest
+import com.texthip.thip.data.model.rooms.request.RoomsPatchRecordRequest
+import com.texthip.thip.data.model.rooms.request.RoomsPatchVoteRequest
 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
@@ -24,6 +26,8 @@ import com.texthip.thip.data.model.rooms.response.RoomsDailyGreetingResponse
 import com.texthip.thip.data.model.rooms.response.RoomsDeleteDailyGreetingResponse
 import com.texthip.thip.data.model.rooms.response.RoomsDeleteRecordResponse
 import com.texthip.thip.data.model.rooms.response.RoomsDeleteVoteResponse
+import com.texthip.thip.data.model.rooms.response.RoomsPatchRecordResponse
+import com.texthip.thip.data.model.rooms.response.RoomsPatchVoteResponse
 import com.texthip.thip.data.model.rooms.response.RoomsPlayingResponse
 import com.texthip.thip.data.model.rooms.response.RoomsPostsLikesResponse
 import com.texthip.thip.data.model.rooms.response.RoomsPostsResponse
@@ -35,6 +39,7 @@ import com.texthip.thip.data.model.rooms.response.RoomsVoteResponse
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.GET
+import retrofit2.http.PATCH
 import retrofit2.http.POST
 import retrofit2.http.Path
 import retrofit2.http.Query
@@ -195,4 +200,18 @@ interface RoomsService {
     suspend fun leaveRoom(
         @Path("roomId") roomId: Int
     ): BaseResponse<Unit>
+
+    @PATCH("rooms/{roomId}/records/{recordId}")
+    suspend fun patchRoomsRecord(
+        @Path("roomId") roomId: Int,
+        @Path("recordId") recordId: Int,
+        @Body request: RoomsPatchRecordRequest
+    ): BaseResponse<RoomsPatchRecordResponse>
+
+    @PATCH("rooms/{roomId}/votes/{voteId}")
+    suspend fun patchRoomsVote(
+        @Path("roomId") roomId: Int,
+        @Path("voteId") voteId: Int,
+        @Body request: RoomsPatchVoteRequest
+    ): BaseResponse<RoomsPatchVoteResponse>
 }

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

@@ -39,13 +39,19 @@ fun GroupVoteButton(
     hasVoted: Boolean = false, // 투표 여부
     onOptionSelected: (Int?) -> Unit
 ) {
+    val totalVotes = voteItems.sumOf { it.count }
+
     Column(
         modifier = modifier.fillMaxWidth(),
         verticalArrangement = Arrangement.spacedBy(10.dp)
     ) {
         voteItems.forEachIndexed { index, item ->
             val isSelected = selectedIndex == index
-            val votePercent = if (hasVoted) item.percentage.coerceIn(0, 100) else 0
+            val votePercent = if (totalVotes > 0) {
+                (item.count.toFloat() / totalVotes * 100).toInt()
+            } else {
+                0
+            }
 
             val animatedPercent by animateFloatAsState(
                 targetValue = votePercent / 100f,
@@ -104,7 +110,7 @@ fun GroupVoteButton(
                     )
                     if (hasVoted) {
                         Text(
-                            text = "${item.percentage}%",
+                            text = "${item.count}표",
                             color = textColor,
                             style = fontStyle
                         )

app/src/main/java/com/texthip/thip/ui/common/forms/BookPageTextField.kt

@@ -46,10 +46,12 @@ fun BookPageTextField(
     modifier: Modifier = Modifier,
     bookTotalPage: Int,
     enabled: Boolean = true,
+    readOnly: Boolean = false,
     text: String,
     isError: Boolean,
     onValueChange: (String) -> Unit,
     showClearButton: Boolean = true,
+    showTotalPage: Boolean = true
 ) {
     var hasFocusCleared by remember(text) { mutableStateOf(false) }
 
@@ -62,23 +64,30 @@ fun BookPageTextField(
                 }
             },
             enabled = enabled,
-            visualTransformation = if (enabled) {
+            readOnly = readOnly,
+            visualTransformation = if (showTotalPage) {
                 SuffixTransformation("/${bookTotalPage}p", colors.Grey02)
             } else {
                 VisualTransformation.None
             },
             keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
             modifier = modifier
                 .size(width = 320.dp, height = 48.dp)
-                .onFocusChanged { focusState ->
-                    if (focusState.isFocused && !hasFocusCleared && text.isNotEmpty()) {
-                        hasFocusCleared = true
-                        onValueChange("")
-                    }
-                    if (!focusState.isFocused) {
-                        hasFocusCleared = false
+                .then(
+                    if (enabled) {
+                        Modifier.onFocusChanged { focusState ->
+                            if (focusState.isFocused && !hasFocusCleared && text.isNotEmpty()) {
+                                hasFocusCleared = true
+                                onValueChange("")
+                            }
+                            if (!focusState.isFocused) {
+                                hasFocusCleared = false
+                            }
+                        }
+                    } else {
+                        Modifier
                     }
-                }
+                )
                 .then(
                     if (isError)
                         Modifier.border(

app/src/main/java/com/texthip/thip/ui/common/forms/BorderedTextField.kt

@@ -38,6 +38,7 @@ fun BorderedTextField(
     hint: String,
     text: String,
     canRemove: Boolean = true,
+    isEnabled: Boolean = true,
     onTextChange: (String) -> Unit,
     onDelete: () -> Unit,
     onRemoveField: () -> Unit
@@ -46,11 +47,15 @@ fun BorderedTextField(
     val interactionSource = remember { MutableInteractionSource() }
     val isFocused by interactionSource.collectIsFocusedAsState()
 
-    val iconRes = when {
-        isFocused && text.isEmpty() -> R.drawable.ic_x_circle_darkgrey
-        isFocused && text.isNotEmpty() -> R.drawable.ic_x_circle_grey
-        !isFocused && canRemove -> R.drawable.ic_delete
-        else -> null
+    val iconRes = if (isEnabled) {
+        when {
+            isFocused && text.isEmpty() -> R.drawable.ic_x_circle_darkgrey
+            isFocused && text.isNotEmpty() -> R.drawable.ic_x_circle_grey
+            !isFocused && canRemove -> R.drawable.ic_delete
+            else -> null
+        }
+    } else {
+        null
     }
 
     val iconEnabled = when (iconRes) {
@@ -74,6 +79,7 @@ fun BorderedTextField(
         BasicTextField(
             value = text,
             onValueChange = onTextChange,
+            enabled = isEnabled,
             textStyle = myStyle.copy(color = colors.White),
             singleLine = true,
             modifier = Modifier