게시글, 댓글에 프로필사진 보여주기 (#78)

* PostDto, Post에 프로필사진 url 추가 * 게시글 프로필사진 보여주기 * CommentDto, Comment에 프로필사진 url 추가 * 댓글애 프로필사진 보여주기
wafflestudio · Aug 30, 2024 · 9a7f800 · 9a7f800
1 parent 33ac85f
commit 9a7f800
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostDetailScreen.kt b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostDetailScreen.kt
@@ -272,7 +272,7 @@ fun PostHeader(
             .height(IntrinsicSize.Min),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        CommunityProfilePicture(model = null) // TODO: 서버에서 프로필이미지 내려주면 반영하기
+        CommunityProfilePicture(model = post.profilePicture)
         Spacer(modifier = Modifier.width(8.dp))
         Column(
             modifier = Modifier
@@ -430,7 +430,7 @@ fun CommentItem(
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 CommunityProfilePicture(
-                    model = null,
+                    model = comment.profilePicture,
                     modifier = Modifier.size(16.dp)
                 )
                 Spacer(modifier = Modifier.width(5.dp))

diff --git a/app/src/main/java/com/wafflestudio/siksha2/models/Comment.kt b/app/src/main/java/com/wafflestudio/siksha2/models/Comment.kt
@@ -9,6 +9,7 @@ data class Comment(
     val updatedAt: LocalDateTime = LocalDateTime.MIN,
     val id: Long = 0L,
     val nickname: String = "",
+    val profilePicture: String? = null,
     val available: Boolean = true,
     val anonymous: Boolean = true,
     val isMine: Boolean = false,

diff --git a/app/src/main/java/com/wafflestudio/siksha2/models/Post.kt b/app/src/main/java/com/wafflestudio/siksha2/models/Post.kt
@@ -10,6 +10,7 @@ data class Post(
     val updatedAt: LocalDateTime = LocalDateTime.MIN,
     val id: Long = 0L,
     val nickname: String = "",
+    val profilePicture: String? = null,
     val available: Boolean = true,
     val anonymous: Boolean = true,
     val isMine: Boolean = true,

diff --git a/app/src/main/java/com/wafflestudio/siksha2/network/dto/core/CommentDto.kt b/app/src/main/java/com/wafflestudio/siksha2/network/dto/core/CommentDto.kt
@@ -12,6 +12,7 @@ data class CommentDto(
     val updated_at: String = "",
     val id: Long = 0L,
     val nickname: String? = "",
+    val profile_url: String?,
     val available: Boolean = true,
     val anonymous: Boolean = true,
     val is_mine: Boolean = false,
@@ -25,6 +26,7 @@ data class CommentDto(
         updatedAt = updated_at.toLocalDateTime(),
         id = id,
         nickname = nickname ?: "익명",
+        profilePicture = profile_url,
         available = available,
         anonymous = anonymous,
         isMine = is_mine,

diff --git a/app/src/main/java/com/wafflestudio/siksha2/network/dto/core/PostDto.kt b/app/src/main/java/com/wafflestudio/siksha2/network/dto/core/PostDto.kt
@@ -15,6 +15,7 @@ data class PostDto(
     @Json(name = "updated_at") val updatedAt: String = "",
     @Json(name = "id") val id: Long = 0L,
     @Json(name = "nickname") val nickname: String? = "",
+    @Json(name = "profile_url") val profileUrl: String?,
     @Json(name = "available") val available: Boolean = true,
     @Json(name = "anonymous") val anonymous: Boolean = true,
     @Json(name = "is_mine") val isMine: Boolean = false,
@@ -31,6 +32,7 @@ data class PostDto(
         updatedAt = updatedAt.toLocalDateTime(),
         id = id,
         nickname = nickname ?: "익명",
+        profilePicture = profileUrl,
         available = available,
         anonymous = anonymous,
         isMine = isMine,