Merge pull request #365 from apeun-gidaechi/feature/364-read-count-ti…

…mestamp-in-img-file Feature/Add read count and timestamp in Img, File Component
apeun-gidaechi · Nov 14, 2024 · 472359a · 472359a
2 parents a62cc5a + 67ba768
commit 472359a
Show file tree

Hide file tree

Showing 6 changed files with 421 additions and 101 deletions.
diff --git a/common/src/main/java/com/seugi/common/utiles/Extension.kt b/common/src/main/java/com/seugi/common/utiles/Extension.kt
@@ -9,22 +9,34 @@ import kotlinx.datetime.LocalDate
 
 fun LocalDateTime.toDeviceLocalDateTime(): LocalDateTime = this.atZone(ZoneId.of("UTC")).withZoneSameInstant(ZoneId.systemDefault()).toLocalDateTime()
 
+/**
+ * return to ex) 2024년 7월 14일 금요일
+ */
 fun LocalDateTime.toFullFormatString(): String {
     val formatter = DateTimeFormatter.ofPattern("yyyy년 M월 d일 E요일", Locale.KOREAN)
     return this.toDeviceLocalDateTime().format(formatter)
 }
 
+/**
+ * return to ex) 12:44
+ */
 fun LocalDateTime.toShortString(): String {
     val formatter = DateTimeFormatter.ofPattern("HH:mm")
     return this.toDeviceLocalDateTime().format(formatter)
 }
 
+/**
+ * return to ex) 오후 12:44
+ */
 fun LocalDateTime.toAmShortString(): String {
     val time = this.toDeviceLocalDateTime()
     val isAm = time.hour < 12
     return (if (isAm) "오전" else "오후") + " " + time.minusHours(if (!isAm && time.hour != 12) 12 else 0).format(DateTimeFormatter.ofPattern("HH:mm"))
 }
 
+/**
+ * return to ex) 7월 11일
+ */
 fun LocalDateTime.toTimeString(): String {
     val time = this.toDeviceLocalDateTime()
 

diff --git a/data/message/src/main/java/com/seugi/data/message/mapper/MessageRoomEventMapper.kt b/data/message/src/main/java/com/seugi/data/message/mapper/MessageRoomEventMapper.kt
@@ -280,6 +280,8 @@ internal fun MessageRoomEventResponse.MessageParent.Message.toModel(userId: Long
                 type = type.toMessageType(),
                 userId = this.userId,
                 uuid = uuid,
+                isFirst = false,
+                isLast = false,
             )
         }
         "FILE" -> {
@@ -292,6 +294,8 @@ internal fun MessageRoomEventResponse.MessageParent.Message.toModel(userId: Long
                 type = type.toMessageType(),
                 userId = this.userId,
                 uuid = uuid,
+                isFirst = false,
+                isLast = false,
             )
         }
 

diff --git a/data/message/src/main/java/com/seugi/data/message/model/MessageRoomEvent.kt b/data/message/src/main/java/com/seugi/data/message/model/MessageRoomEvent.kt
@@ -199,6 +199,8 @@ sealed class MessageRoomEvent(
             override val timestamp: LocalDateTime,
             override val type: MessageType,
             override val userId: Long,
+            val isFirst: Boolean,
+            val isLast: Boolean,
         ) : MessageParent(timestamp, type, userId)
 
         data class Img(
@@ -208,6 +210,8 @@ sealed class MessageRoomEvent(
             override val timestamp: LocalDateTime,
             override val type: MessageType,
             override val userId: Long,
+            val isFirst: Boolean,
+            val isLast: Boolean,
         ) : MessageParent(timestamp, type, userId)
 
         data class Enter(