[Feat][Fix] 에고룸, 광장 버그 수정 및 로직 개선

app/src/main/java/com/egobook/app/data/api/LetterApiService.kt

@@ -2,9 +2,11 @@ package com.egobook.app.data.api
 
 import com.egobook.app.data.model.ApiResponse
 import com.egobook.app.data.model.square.letter.ArrivedPendingLetterResponse
+import com.egobook.app.data.model.square.letter.DeferredLettersResponse
+import com.egobook.app.data.model.square.letter.ReceivedRepliesResponse
 import com.egobook.app.data.model.square.letter.ReplyLetterRequest
 import com.egobook.app.data.model.square.letter.ReplyLetterResponse
-import com.egobook.app.data.model.square.letter.ReportLetterRequest
+import com.egobook.app.data.model.square.letter.ReportContentRequest
 import com.egobook.app.data.model.square.letter.SendLetterRequest
 import com.egobook.app.data.model.square.letter.SendLetterResponse
 import com.egobook.app.data.model.square.letter.SentLetterResponse
@@ -53,11 +55,29 @@ interface LetterApiService {
     @POST("/plaza/letters/{replyId}/report")
     suspend fun reportRepliedLetter(
         @Path("replyId") replyId: Long,
-        @Body request: ReportLetterRequest
+        @Body request: ReportContentRequest
+    ): ApiResponse<Unit>
+
+    @POST("/plaza/letters/{letterId}/report")
+    suspend fun reportArrivedLetter(
+        @Path("letterId") letterId: Long,
+        @Body request: ReportContentRequest
     ): ApiResponse<Unit>
 
     @DELETE("/plaza/letters/threads/{threadId}")
     suspend fun deleteLetterThread(
         @Path("threadId") threadId: Long
     ): ApiResponse<Unit>
+
+    @GET("/plaza/letters/inbox/deferred")
+    suspend fun fetchDeferredLetters(
+        @Query("page") page: Int,
+        @Query("size") size: Int
+    ): ApiResponse<DeferredLettersResponse>
+
+    @GET("/plaza/letters/replies/received")
+    suspend fun fetchReceivedReplies(
+        @Query("page") page: Int,
+        @Query("size") size: Int
+    ): ApiResponse<ReceivedRepliesResponse>
 }

app/src/main/java/com/egobook/app/data/api/QuestionApiService.kt

@@ -1,6 +1,7 @@
 package com.egobook.app.data.api
 
 import com.egobook.app.data.model.ApiResponse
+import com.egobook.app.data.model.square.letter.ReportContentRequest
 import com.egobook.app.data.model.square.question.UserTodayQuestionAnswerResponse
 import com.egobook.app.data.model.square.question.MyTodayQuestionAnswerResponse
 import com.egobook.app.data.model.square.question.TodayAnswerRequest
@@ -48,4 +49,10 @@ interface QuestionApiService {
         @Path("answerId") answerId: Long
     ): ApiResponse<Unit>
 
+    @POST("/questions/answers/{answerId}/report")
+    suspend fun reportTodayQuestionAnswer(
+        @Path("answerId") answerId: Long,
+        @Body request: ReportContentRequest
+    ): ApiResponse<Unit>
+
 }

app/src/main/java/com/egobook/app/data/model/square/friend/FriendRequestResponse.kt

@@ -10,6 +10,8 @@ data class FriendRequestResponse(
     val userId: Long,
     @SerializedName("nickname")
     val nickname: String,
+    @SerializedName("level")
+    val level: Long,
     @SerializedName("requestedAt")
     val requestedAt: String
 )
@@ -18,5 +20,6 @@ fun FriendRequestResponse.toDomain(): FriendRequest = FriendRequest(
     requestId = requestId,
     userId = userId,
     nickname = nickname,
+    level = level,
     requestedAt = requestedAt
 )

app/src/main/java/com/egobook/app/data/model/square/friend/SearchUserResponse.kt

@@ -11,7 +11,7 @@ data class SearchUserResponse(
     @SerializedName("level")
     val level: Long,
     @SerializedName("profileImageUrl")
-    val profileImageUrl: String
+    val profileImageUrl: String? = null
 )
 
 fun SearchUserResponse.toDomain(): SearchUser = SearchUser(

app/src/main/java/com/egobook/app/data/model/square/letter/ArrivedPendingLetterResponse.kt

@@ -20,15 +20,15 @@ data class ArrivedPendingLetterItemResponse(
     @SerializedName("mode")
     val mode: LetterMode,
     @SerializedName("fromLabel")
-    val fromLabel: String, // 무슨 필드인지 의미 잘 모르겠음
+    val fromLabel: String,
     @SerializedName("content")
     val content: String,
     @SerializedName("arrivedAt")
     val arrivedAt: String,
     @SerializedName("replyDeadlineAt")
     val replyDeadlineAt: String,
-    @SerializedName("letterColor")
-    val letterColor: LetterBackgroundColor // TODO: 백엔드한테 필드 넣어달라고 하기
+    @SerializedName("backgroundColor")
+    val backgroundColor: LetterBackgroundColor
 )
 
 fun ArrivedPendingLetterResponse.toDomain(): ArrivedPendingLetter = ArrivedPendingLetter(
@@ -43,5 +43,5 @@ fun ArrivedPendingLetterItemResponse.toDomain(): ArrivedPendingLetterItem = Arri
     content = content,
     arrivedAt = arrivedAt,
     replyDeadlineAt = replyDeadlineAt,
-    letterColor = letterColor
+    backgroundColor = backgroundColor
 )

app/src/main/java/com/egobook/app/data/model/square/letter/DeferredLettersResponse.kt

@@ -0,0 +1,48 @@
+package com.egobook.app.data.model.square.letter
+
+import com.egobook.app.domain.model.square.letter.DeferredLetter
+import com.egobook.app.domain.model.square.letter.LetterBackgroundColor
+import com.egobook.app.domain.model.square.letter.LetterMode
+import com.egobook.app.domain.model.square.letter.LetterStatus
+import com.google.gson.annotations.SerializedName
+
+data class DeferredLettersResponse(
+    @SerializedName("content")
+    val content: List<DeferredLetterResponse>,
+    @SerializedName("page")
+    val page: Int,
+    @SerializedName("size")
+    val size: Int,
+    @SerializedName("hasNext")
+    val hasNext: Boolean
+)
+
+data class DeferredLetterResponse(
+    @SerializedName("letterId")
+    val letterId: Long,
+    @SerializedName("status")
+    val status: LetterStatus,
+    @SerializedName("mode")
+    val mode: LetterMode,
+    @SerializedName("fromLabel")
+    val fromLabel: String,
+    @SerializedName("backgroundColor")
+    val backgroundColor: LetterBackgroundColor,
+    @SerializedName("contentPreview")
+    val contentPreview: String,
+    @SerializedName("arrivedAt")
+    val arrivedAt: String,
+    @SerializedName("replyDeadlineAt")
+    val replyDeadlineAt: String
+)
+
+fun DeferredLetterResponse.toDomain(): DeferredLetter = DeferredLetter(
+    letterId = letterId,
+    status = status,
+    mode = mode,
+    fromLabel = fromLabel,
+    backgroundColor = backgroundColor,
+    contentPreview = contentPreview,
+    arrivedAt = arrivedAt,
+    replyDeadlineAt = replyDeadlineAt
+)

app/src/main/java/com/egobook/app/data/model/square/letter/DetectAbusiveContentResponse.kt

@@ -7,7 +7,7 @@ data class DetectAbusiveContentResponse(
     @SerializedName("text")
     val text: String,
     @SerializedName("percentage")
-    val percentage: Double,
+    val riskScore: Double,
     @SerializedName("is_harmful")
     val isHarmful: Boolean,
     @SerializedName("label")
@@ -18,7 +18,7 @@ data class DetectAbusiveContentResponse(
 
 fun DetectAbusiveContentResponse.toDomain(): AbusiveContentAnalysis = AbusiveContentAnalysis(
     text = text,
-    riskScore = percentage,
+    riskScore = riskScore,
     isHarmful = isHarmful,
     label = label,
     detectedBadWords = badWords

app/src/main/java/com/egobook/app/data/model/square/letter/ReceivedRepliesResponse.kt

@@ -0,0 +1,61 @@
+package com.egobook.app.data.model.square.letter
+
+import com.egobook.app.domain.model.square.letter.LetterBackgroundColor
+import com.egobook.app.domain.model.square.letter.LetterMode
+import com.egobook.app.domain.model.square.letter.ReceivedReplies
+import com.egobook.app.domain.model.square.letter.ReceivedReply
+import com.google.gson.annotations.SerializedName
+
+data class ReceivedRepliesResponse(
+    @SerializedName("content")
+    val content: List<ReceivedReplyResponse>,
+    @SerializedName("page")
+    val page: Int,
+    @SerializedName("size")
+    val size: Int,
+    @SerializedName("hasNext")
+    val hasNext: Boolean
+)
+
+data class ReceivedReplyResponse(
+    @SerializedName("letterId")
+    val letterId: Long,
+    @SerializedName("replyId")
+    val replyId: Long,
+    @SerializedName("threadId")
+    val threadId: Long,
+    @SerializedName("replyText")
+    val replyContent: String,
+    @SerializedName("repliedAt")
+    val repliedAt: String,
+    @SerializedName("aiGenerated")
+    val isAIGenerated: Boolean,
+    @SerializedName("reported")
+    val isReported: Boolean,
+    @SerializedName("mode")
+    val mode: LetterMode,
+    @SerializedName("fromLabel")
+    val fromLabel: String,
+    @SerializedName("backgroundColor")
+    val letterColor: LetterBackgroundColor
+)
+
+fun ReceivedRepliesResponse.toDomain() = ReceivedReplies(
+    content = content.map { it.toDomain() },
+    page = page,
+    size = size,
+    hasNext = hasNext
+)
+
+fun ReceivedReplyResponse.toDomain(): ReceivedReply = ReceivedReply(
+    letterId = letterId,
+    replyId = replyId,
+    threadId = threadId,
+    replyContent = replyContent,
+    repliedAt = repliedAt,
+    isAIGenerated = isAIGenerated,
+    isReported = isReported,
+    mode = mode,
+    fromLabel = fromLabel,
+    letterColor = letterColor
+)

app/src/main/java/com/egobook/app/data/model/square/letter/ReportLetterRequest.kt → app/src/main/java/com/egobook/app/data/model/square/letter/ReportContentRequest.kt

@@ -1,17 +1,17 @@
 package com.egobook.app.data.model.square.letter
 
-import com.egobook.app.domain.model.square.letter.ReportLetter
+import com.egobook.app.domain.model.square.letter.ReportContent
 import com.egobook.app.domain.model.square.letter.ReportLetterType
 import com.google.gson.annotations.SerializedName
 
-data class ReportLetterRequest(
+data class ReportContentRequest(
     @SerializedName("reason")
     val reason: ReportLetterType,
     @SerializedName("description")
     val description: String? = null
 )
 
-fun ReportLetter.toData(): ReportLetterRequest = ReportLetterRequest(
+fun ReportContent.toData(): ReportContentRequest = ReportContentRequest(
     reason = reason,
     description = description
 )

app/src/main/java/com/egobook/app/data/model/square/letter/SentLetterWithReplyResponse.kt

@@ -24,6 +24,8 @@ data class SentLetterWithReplyResponse(
     val createdAt: String,
     @SerializedName("arrivedAt")
     val arrivedAt: String,
+    @SerializedName("fromLabel")
+    val fromLabel: String,
     @SerializedName("reply")
     val reply: LetterReplyResponse? = null
 )
@@ -58,5 +60,6 @@ fun SentLetterWithReplyResponse.toDomain(): SentLetterWithReply = SentLetterWith
     backgroundColor = backgroundColor,
     createdAt = createdAt,
     arrivedAt = arrivedAt,
+    fromLabel = fromLabel,
     reply = reply?.toDomain()
 )