#133 - 추가된 컬럼 및 테이블을 기반으로 Entity를 설계합니다.

app/src/test/kotlin/com/wespot/report/service/SavedReportServiceTest.kt

@@ -2,16 +2,15 @@ package com.wespot.report.service
 
 import com.wespot.common.service.ServiceTest
 import com.wespot.exception.CustomException
-import com.wespot.message.MessageJpaRepository
-import com.wespot.message.MessageMapper
+import com.wespot.message.v1.MessageJpaRepository
+import com.wespot.message.v1.MessageMapper
 import com.wespot.message.fixture.MessageFixture
 import com.wespot.report.ReportJpaRepository
 import com.wespot.report.ReportType
 import com.wespot.report.dto.ReportRequest
 import com.wespot.user.RestrictionType
 import com.wespot.user.fixture.UserFixture
 import com.wespot.user.mapper.UserMapper
-import com.wespot.user.repository.RestrictionJpaRepository
 import com.wespot.user.repository.UserJpaRepository
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.matchers.shouldBe

core/src/main/kotlin/com/wespot/image/service/ImageService.kt

@@ -23,8 +23,8 @@ class ImageService(
     override fun createPresignedUrl(imageExtension: String, expirationTime: Long): PresignedResponse {
         val prefix = UUID.randomUUID()
             .toString()
-            .replace("-", "") // prefix is what ?
-        val imageName = "$prefix.$imageExtension" // image name is prefix and image extension
+            .replace("-", "")
+        val imageName = "$prefix.$imageExtension"
         val url = s3Port.getPresignedUrl(imageName, expirationTime)
 
         return PresignedResponse(url, imageName)

domain/src/main/kotlin/com/wespot/common/ViewedOnBoardingSheet.kt

@@ -7,6 +7,7 @@ data class ViewedOnBoardingSheet(
     val userId: Long,
     var isViewedMessageOnBoardingSheet: Boolean,
     var isViewedVoteOnBoardingSheet: Boolean,
+    var isViewedAnswerMessageOnBoardingSheet: Boolean,
 ) {
 
     companion object {
@@ -21,7 +22,8 @@ data class ViewedOnBoardingSheet(
                 id = 0,
                 userId = userId,
                 isViewedMessageOnBoardingSheet = false,
-                isViewedVoteOnBoardingSheet = false
+                isViewedVoteOnBoardingSheet = false,
+                isViewedAnswerMessageOnBoardingSheet = false
             )
         }
     }

domain/src/main/kotlin/com/wespot/message/Message.kt

@@ -27,7 +27,7 @@ data class Message(
     val isSenderDeleted: Boolean,
     val senderDeletedAt: LocalDateTime?,
     val isReceiverDeleted: Boolean,
-    val receiverDeletedAt: LocalDateTime?
+    val receiverDeletedAt: LocalDateTime?,
 ) {
 
     fun updateMessage(
@@ -66,7 +66,7 @@ data class Message(
             isSenderDeleted = isSenderDeleted,
             senderDeletedAt = senderDeletedAt,
             isReceiverDeleted = isReceiverDeleted,
-            receiverDeletedAt = receiverDeletedAt
+            receiverDeletedAt = receiverDeletedAt,
         )
         message.validateMessageReceiver()
 
@@ -113,7 +113,7 @@ data class Message(
             isSenderDeleted = isSenderDeleted,
             senderDeletedAt = senderDeletedAt,
             isReceiverDeleted = isReceiverDeleted,
-            receiverDeletedAt = receiverDeletedAt
+            receiverDeletedAt = receiverDeletedAt,
         )
         message.validateSentMessage(user)
         return message
@@ -299,7 +299,7 @@ data class Message(
                 isSenderDeleted = false,
                 senderDeletedAt = null,
                 isReceiverDeleted = false,
-                receiverDeletedAt = null
+                receiverDeletedAt = null,
             )
             message.validateMessageReceiver()
 
@@ -330,7 +330,7 @@ data class Message(
                 isSenderDeleted = false,
                 senderDeletedAt = null,
                 isReceiverDeleted = false,
-                receiverDeletedAt = null
+                receiverDeletedAt = null,
             )
         }
 

domain/src/main/kotlin/com/wespot/message/MessageV2.kt

@@ -0,0 +1,31 @@
+package com.wespot.message
+
+import java.time.LocalDateTime
+
+data class MessageV2(
+    val id: Long,
+    val content: MessageContent,
+    val senderId: Long,
+    val senderName: String,
+    val receiverId: Long,
+    val isReceiverRead: Boolean,
+    val isAnonymous: Boolean,
+    val messageType: MessageType,
+    val readAt: LocalDateTime?,
+    val isSend: Boolean,
+    val sendAt: LocalDateTime?,
+    val receivedAt: LocalDateTime?,
+    val isReported: Boolean,
+    val createdAt: LocalDateTime,
+    val updatedAt: LocalDateTime,
+    val isSenderDeleted: Boolean,
+    val senderDeletedAt: LocalDateTime?,
+    val isReceiverDeleted: Boolean,
+    val receiverDeletedAt: LocalDateTime?,
+
+    val messageRoomId: Long,
+    val anonymousProfileId: Long?,
+    val messageRoomOwnerId: Long,
+    val isBookmarked: Boolean
+) {
+}

domain/src/main/kotlin/com/wespot/user/message/AnonymousProfile.kt

@@ -0,0 +1,15 @@
+package com.wespot.user.message
+
+import com.wespot.user.User
+import java.time.LocalDateTime
+
+class AnonymousProfile(
+    val id: Long,
+    val imageUrl: String,
+    val name: String,
+    val ownerId: User,
+    val receiverId: Long,
+    val createdAt: LocalDateTime,
+    val updatedAt: LocalDateTime,
+) {
+}

domain/src/main/kotlin/com/wespot/user/message/UsedAnswerMessage.kt

@@ -0,0 +1,12 @@
+package com.wespot.user.message
+
+import java.time.LocalDateTime
+
+class UsedAnswerMessage(
+    val id: Long,
+    val userId: Long,
+    val isUsedAnswerMessageFeature: Boolean = false,
+    val createdAt: LocalDateTime,
+    val updatedAt: LocalDateTime
+) {
+}

domain/src/main/kotlin/com/wespot/view/OnBoardingExplanationComponent.kt

@@ -62,7 +62,8 @@ data class OnBoardingExplanationComponent(
                             RichText.of("이해했어요", "#FF1B1C1E", 16, "Center", "SemiBold"),
                             "#FFF6FE8B",
                             "#FFC0C66B",
-                            OnClickActionType.ACTION
+                            OnClickActionType.ACTION,
+                            Paddings.of(top = 8, bottom = 8)
                         )
                     ),
                     Paddings.of(start = 20, end = 20, bottom = 12, top = 12)
@@ -116,7 +117,8 @@ data class OnBoardingExplanationComponent(
                             RichText.of("이해했어요", "#FF1B1C1E", 16, "Center", "SemiBold"),
                             "#FFF6FE8B",
                             "#FFC0C66B",
-                            OnClickActionType.ACTION
+                            OnClickActionType.ACTION,
+                            Paddings.of(top = 8, bottom = 8)
                         )
                     ),
                     Paddings.of(start = 20, end = 20, bottom = 12, top = 12)

domain/src/main/kotlin/com/wespot/view/OnBoardingWelcomePageComponent.kt

@@ -33,7 +33,7 @@ data class OnBoardingWelcomePageComponent(
                             "#FFF6FE8B",
                             "#FFC0C66B",
                             OnClickActionType.ACTION,
-                            Paddings.of(top = 16, bottom = 16)
+                            Paddings.of(top = 8, bottom = 8)
                         )
                     ),
                     Paddings.of(start = 20, end = 20, bottom = 12, top = 12)
@@ -58,7 +58,7 @@ data class OnBoardingWelcomePageComponent(
                             "#FFF6FE8B",
                             "#FFC0C66B",
                             OnClickActionType.ACTION,
-                            Paddings.of(top = 16, bottom = 16)
+                            Paddings.of(top = 8, bottom = 8)
                         )
                     ),
                     Paddings.of(start = 20, end = 20, bottom = 12, top = 12)

infrastructure/mysql/src/main/kotlin/com/wespot/common/ViewedOnBoardingJpaRepository.kt

@@ -2,8 +2,8 @@ package com.wespot.common
 
 import org.springframework.data.jpa.repository.JpaRepository
 
-interface ViewedOnBoardingJpaRepository : JpaRepository<ViewedOnBoardingSheetEntity, Long> {
+interface ViewedOnBoardingJpaRepository : JpaRepository<ViewedOnBoardingSheetJpaEntity, Long> {
 
-    fun findByUserId(userId: Long): ViewedOnBoardingSheetEntity?
+    fun findByUserId(userId: Long): ViewedOnBoardingSheetJpaEntity?
 
 }

infrastructure/mysql/src/main/kotlin/com/wespot/common/ViewedOnBoardingSheetEntity.kt → infrastructure/mysql/src/main/kotlin/com/wespot/common/ViewedOnBoardingSheetJpaEntity.kt

@@ -5,20 +5,26 @@ import software.amazon.awssdk.annotations.NotNull
 
 @Entity
 @Table(name = "viewed_on_boarding_sheet", uniqueConstraints = [UniqueConstraint(columnNames = ["user_id"])])
-data class ViewedOnBoardingSheetEntity(
+data class ViewedOnBoardingSheetJpaEntity(
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     val id: Long,
 
     @field: NotNull
     val userId: Long,
 
+    @field: NotNull
     val isViewedMessageOnBoardingSheet: Boolean,
 
+    @field: NotNull
     val isViewedVoteOnBoardingSheet: Boolean,
 
+    @field: NotNull
+    val isViewedAnswerMessageOnBoardingSheet: Boolean,
+
     @Embedded
-    val baseEntity: BaseEntity,
+    val baseEntity: BaseEntity
+
 ) {
 
 }

infrastructure/mysql/src/main/kotlin/com/wespot/common/ViewedOnBoardingSheetMapper.kt

@@ -4,20 +4,22 @@ import java.time.LocalDateTime
 
 object ViewedOnBoardingSheetMapper {
 
-    fun mapToDomainEntity(viewedOnBoardingSheetEntity: ViewedOnBoardingSheetEntity): ViewedOnBoardingSheet =
+    fun mapToDomainEntity(viewedOnBoardingSheetEntity: ViewedOnBoardingSheetJpaEntity): ViewedOnBoardingSheet =
         ViewedOnBoardingSheet(
             id = viewedOnBoardingSheetEntity.id,
             userId = viewedOnBoardingSheetEntity.userId,
             isViewedVoteOnBoardingSheet = viewedOnBoardingSheetEntity.isViewedVoteOnBoardingSheet,
-            isViewedMessageOnBoardingSheet = viewedOnBoardingSheetEntity.isViewedMessageOnBoardingSheet
+            isViewedMessageOnBoardingSheet = viewedOnBoardingSheetEntity.isViewedMessageOnBoardingSheet,
+            isViewedAnswerMessageOnBoardingSheet = viewedOnBoardingSheetEntity.isViewedAnswerMessageOnBoardingSheet
         )
 
-    fun mapToJpaEntity(viewedOnBoardingSheet: ViewedOnBoardingSheet): ViewedOnBoardingSheetEntity =
-        ViewedOnBoardingSheetEntity(
+    fun mapToJpaEntity(viewedOnBoardingSheet: ViewedOnBoardingSheet): ViewedOnBoardingSheetJpaEntity =
+        ViewedOnBoardingSheetJpaEntity(
             id = viewedOnBoardingSheet.id,
             userId = viewedOnBoardingSheet.userId,
             isViewedVoteOnBoardingSheet = viewedOnBoardingSheet.isViewedVoteOnBoardingSheet,
             isViewedMessageOnBoardingSheet = viewedOnBoardingSheet.isViewedMessageOnBoardingSheet,
+            isViewedAnswerMessageOnBoardingSheet = viewedOnBoardingSheet.isViewedAnswerMessageOnBoardingSheet,
             baseEntity = BaseEntity(LocalDateTime.now(), LocalDateTime.now())
         )
 

infrastructure/mysql/src/main/kotlin/com/wespot/message/MessageJpaEntity.kt → infrastructure/mysql/src/main/kotlin/com/wespot/message/v1/MessageJpaEntity.kt

@@ -1,6 +1,7 @@
-package com.wespot.message
+package com.wespot.message.v1
 
 import com.wespot.common.BaseEntity
+import com.wespot.message.MessageType
 import jakarta.persistence.*
 import org.jetbrains.annotations.NotNull
 import java.time.LocalDateTime

infrastructure/mysql/src/main/kotlin/com/wespot/message/MessageJpaRepository.kt → infrastructure/mysql/src/main/kotlin/com/wespot/message/v1/MessageJpaRepository.kt

@@ -1,5 +1,6 @@
-package com.wespot.message
+package com.wespot.message.v1
 
+import com.wespot.message.MessageType
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query

infrastructure/mysql/src/main/kotlin/com/wespot/message/MessageMapper.kt → infrastructure/mysql/src/main/kotlin/com/wespot/message/v1/MessageMapper.kt

@@ -1,6 +1,8 @@
-package com.wespot.message
+package com.wespot.message.v1
 
 import com.wespot.common.BaseEntity
+import com.wespot.message.Message
+import com.wespot.message.MessageContent
 
 object MessageMapper {
 

infrastructure/mysql/src/main/kotlin/com/wespot/message/MessagePersistenceAdapter.kt → infrastructure/mysql/src/main/kotlin/com/wespot/message/v1/MessagePersistenceAdapter.kt

@@ -1,5 +1,7 @@
-package com.wespot.message
+package com.wespot.message.v1
 
+import com.wespot.message.Message
+import com.wespot.message.MessageType
 import org.springframework.data.domain.Pageable
 import org.springframework.data.repository.findByIdOrNull
 import com.wespot.message.port.out.MessagePort

infrastructure/mysql/src/main/kotlin/com/wespot/message/v2/MessageJpaEntityV2.kt

@@ -0,0 +1,68 @@
+package com.wespot.message.v2
+
+import com.wespot.common.BaseEntity
+import com.wespot.message.MessageType
+import jakarta.persistence.*
+import org.jetbrains.annotations.NotNull
+import java.time.LocalDateTime
+
+@Entity
+@Table(name = "message")
+class MessageJpaEntityV2(
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    val id: Long,
+
+    @field: NotNull
+    val content: String,
+
+    @field: NotNull
+    val senderId: Long,
+
+    @field: NotNull
+    val senderName: String,
+
+    @field: NotNull
+    val receiverId: Long,
+
+    @field: NotNull
+    val isAnonymous: Boolean,
+
+    @field: NotNull
+    val isReceiverRead: Boolean,
+
+    @Enumerated(EnumType.STRING)
+    val messageType: MessageType,
+
+    @field: NotNull
+    val isSend: Boolean,
+
+    val sendAt: LocalDateTime?,
+
+    val receivedAt: LocalDateTime?,
+
+    val readAt: LocalDateTime?,
+
+    @field: NotNull
+    val isReported: Boolean,
+
+    @Embedded
+    val baseEntity: BaseEntity,
+
+    @field: NotNull
+    val isSenderDeleted: Boolean,
+
+    val senderDeletedAt: LocalDateTime?,
+
+    @field: NotNull
+    val isReceiverDeleted: Boolean,
+
+    val receiverDeletedAt: LocalDateTime?,
+
+    val messageRoomId: Long,
+    val anonymousProfileId: Long?,
+    val messageRoomOwnerId: Long,
+    val isBookmarked: Boolean
+) {
+
+}

infrastructure/mysql/src/main/kotlin/com/wespot/message/v2/MessageV2JpaRepository.kt

@@ -0,0 +1,6 @@
+package com.wespot.message.v2
+
+import org.springframework.data.jpa.repository.JpaRepository
+
+interface MessageV2JpaRepository : JpaRepository<MessageJpaEntityV2, Long> {
+}