Merge pull request #40 from Leets-Official/refactor/#39

refactor: 초대장 생성/상세조회 요청, 응답 DTO 수정 및 초대장 엔티티 추가
Leets-Official · Feb 3, 2025 · 1581657 · 1581657
2 parents dcfe859 + 7c975a2
commit 1581657
Show file tree

Hide file tree

Showing 35 changed files with 150 additions and 137 deletions.
diff --git a/module-domain/src/main/kotlin/site/yourevents/guest/port/in/GuestUseCase.kt b/module-domain/src/main/kotlin/site/yourevents/guest/port/in/GuestUseCase.kt
@@ -33,4 +33,6 @@ interface GuestUseCase {
     fun getNotAttendGuestsByInvitation(invitation: Invitation): List<Guest>
 
     fun getInvitationAttendance(memberId: UUID, invitationId: UUID): Boolean?
+
+    fun getOwnerNickname(invitationId: UUID, memberId: UUID): String
 }
diff --git a/module-domain/src/main/kotlin/site/yourevents/guest/port/out/GuestPersistencePort.kt b/module-domain/src/main/kotlin/site/yourevents/guest/port/out/GuestPersistencePort.kt
@@ -22,4 +22,6 @@ interface GuestPersistencePort {
     fun findNotAttendGuestsByInvitation(invitation: Invitation): List<Guest>
 
     fun findAttendanceByMemberAndInvitation(memberId: UUID, invitationId: UUID): Boolean?
+
+    fun findOwnerNickname(invitationId: UUID, memberId: UUID): String
 }
diff --git a/module-domain/src/main/kotlin/site/yourevents/guest/service/GuestService.kt b/module-domain/src/main/kotlin/site/yourevents/guest/service/GuestService.kt
@@ -84,6 +84,9 @@ class GuestService(
     override fun getInvitationAttendance(memberId: UUID, invitationId: UUID): Boolean? =
         guestPersistencePort.findAttendanceByMemberAndInvitation(memberId, invitationId)
 
+    override fun getOwnerNickname(invitationId: UUID, memberId: UUID): String =
+        guestPersistencePort.findOwnerNickname(invitationId, memberId)
+
     private fun updateAttendance(guestId: UUID, attendance: Boolean) {
         val guest = guestPersistencePort.findById(guestId)
             ?: throw GuestNotFoundException()

diff --git a/module-domain/src/main/kotlin/site/yourevents/invitation/domain/Invitation.kt b/module-domain/src/main/kotlin/site/yourevents/invitation/domain/Invitation.kt
@@ -9,6 +9,7 @@ class Invitation(
     val id: UUID,
     val member: Member,
     var qrUrl: String,
+    var templateKey: String?,
     var deleted: Boolean,
     createdAt: LocalDateTime?,
     modifiedAt: LocalDateTime?,

diff --git a/module-domain/src/main/kotlin/site/yourevents/invitation/domain/InvitationVO.kt b/module-domain/src/main/kotlin/site/yourevents/invitation/domain/InvitationVO.kt
@@ -5,13 +5,20 @@ import site.yourevents.member.domain.Member
 data class InvitationVO(
     val member: Member,
     val qrUrl: String,
+    val templateKey: String?,
     val deleted: Boolean,
 ) {
     companion object {
-        fun of(member: Member, qrUrl: String, deleted: Boolean): InvitationVO = InvitationVO(
-            member = member,
-            qrUrl = qrUrl,
-            deleted = deleted
+        fun of(
+            member: Member,
+            qrUrl: String,
+            templateKey: String?,
+            deleted: Boolean): InvitationVO =
+            InvitationVO(
+                member = member,
+                qrUrl = qrUrl,
+                templateKey = templateKey,
+                deleted = deleted
         )
     }
 }
diff --git a/module-domain/src/main/kotlin/site/yourevents/invitation/port/in/InvitationUseCase.kt b/module-domain/src/main/kotlin/site/yourevents/invitation/port/in/InvitationUseCase.kt
@@ -9,7 +9,7 @@ interface InvitationUseCase {
 
     fun countByMember(member: Member): Int
 
-    fun createInvitation(memberId: UUID, qrUrl: String): Invitation
+    fun createInvitation(memberId: UUID, qrUrl: String, templateKey: String?): Invitation
 
     fun updateQrCode(invitationId: UUID): Invitation
 

diff --git a/module-domain/src/main/kotlin/site/yourevents/invitation/service/InvitationService.kt b/module-domain/src/main/kotlin/site/yourevents/invitation/service/InvitationService.kt
@@ -22,15 +22,15 @@ class InvitationService(
 
     override fun countByMember(member: Member) = invitationPersistencePort.countByMember(member)
 
-    override fun createInvitation(memberId: UUID, qrUrl: String): Invitation {
+    override fun createInvitation(memberId: UUID, qrUrl: String, templateKey: String?): Invitation {
         val member = memberUseCase.findById(memberId)
             ?: throw MemberNotFountException()
 
-
         return invitationPersistencePort.save(
             InvitationVO.of(
                 member = member,
                 qrUrl = qrUrl,
+                templateKey = templateKey,
                 deleted = false
             )
         )

diff --git a/module-domain/src/test/kotlin/site/yourevents/guest/domain/GuestTest.kt b/module-domain/src/test/kotlin/site/yourevents/guest/domain/GuestTest.kt
@@ -27,12 +27,14 @@ class GuestTest : DescribeSpec({
 
                 val invitationId = UUID.randomUUID()
                 val qrUrl = "http://example.com"
+                val templateKey = "templateKey"
                 val deleted = false
 
                 val invitation = Invitation(
                     id = invitationId,
                     member = member,
                     qrUrl = qrUrl,
+                    templateKey = templateKey,
                     deleted = deleted,
                     createdAt = LocalDateTime.now(),
                     modifiedAt = LocalDateTime.now()

diff --git a/module-domain/src/test/kotlin/site/yourevents/guest/domain/GuestVOTest.kt b/module-domain/src/test/kotlin/site/yourevents/guest/domain/GuestVOTest.kt
@@ -26,12 +26,14 @@ class GuestVOTest : DescribeSpec({
 
         val invitationId = UUID.randomUUID()
         val qrUrl = "http://example.com"
+        val templateKey = "templateKey"
         val deleted = false
         invitation = Invitation(
             id = invitationId,
             member = member,
             qrUrl = qrUrl,
-            deleted = false,
+            templateKey = templateKey,
+            deleted = deleted,
             createdAt = LocalDateTime.now(),
             modifiedAt = LocalDateTime.now()
         )

diff --git a/module-domain/src/test/kotlin/site/yourevents/guest/service/GuestServiceTest.kt b/module-domain/src/test/kotlin/site/yourevents/guest/service/GuestServiceTest.kt
@@ -42,6 +42,7 @@ class GuestServiceTest : DescribeSpec({
             id = invitationId,
             member = member,
             qrUrl = "https://qrUrl.com",
+            templateKey = null,
             deleted = false,
             createdAt = LocalDateTime.now(),
             modifiedAt = LocalDateTime.now()

diff --git a/module-domain/src/test/kotlin/site/yourevents/invitation/domain/InvitationTest.kt b/module-domain/src/test/kotlin/site/yourevents/invitation/domain/InvitationTest.kt
@@ -26,11 +26,13 @@ class InvitationTest : DescribeSpec({
 
                 val invitationId = UUID.randomUUID()
                 val qrUrl = "http://example.com"
+                val templateKey = "templateKey"
                 val deleted = false
                 val invitation = Invitation(
                     id = invitationId,
                     member = member,
                     qrUrl = qrUrl,
+                    templateKey = templateKey,
                     deleted = deleted,
                     createdAt = LocalDateTime.now(),
                     modifiedAt = LocalDateTime.now()
@@ -40,6 +42,7 @@ class InvitationTest : DescribeSpec({
                     id shouldBe invitationId
                     member shouldBe member
                     qrUrl shouldBe qrUrl
+                    templateKey shouldBe templateKey
                 }
             }
         }

diff --git a/module-domain/src/test/kotlin/site/yourevents/invitation/domain/InvitationVOTest.kt b/module-domain/src/test/kotlin/site/yourevents/invitation/domain/InvitationVOTest.kt
@@ -9,6 +9,7 @@ import java.util.UUID
 class InvitationVOTest : DescribeSpec({
     lateinit var member: Member
     lateinit var qrUrl: String
+    lateinit var templateKey: String
     var deleted = false
 
     beforeTest {
@@ -22,6 +23,7 @@ class InvitationVOTest : DescribeSpec({
             modifiedAt = LocalDateTime.now()
         )
         qrUrl = "http://example.com"
+        templateKey = "templateKey"
         deleted = false
     }
 
@@ -31,6 +33,7 @@ class InvitationVOTest : DescribeSpec({
                 val invitationVO = InvitationVO(
                     member = member,
                     qrUrl = qrUrl,
+                    templateKey = templateKey,
                     deleted = deleted
                 )
 
@@ -46,10 +49,16 @@ class InvitationVOTest : DescribeSpec({
                 val originalInvitationVO = InvitationVO(
                     member = member,
                     qrUrl = qrUrl,
+                    templateKey = templateKey,
                     deleted = deleted
                 )
 
-                val transformedInvitationVO = InvitationVO.of( originalInvitationVO.member, originalInvitationVO.qrUrl, originalInvitationVO.deleted)
+                val transformedInvitationVO = InvitationVO.of(
+                    originalInvitationVO.member,
+                    originalInvitationVO.qrUrl,
+                    originalInvitationVO.templateKey,
+                    originalInvitationVO.deleted
+                )
 
                 transformedInvitationVO.apply {
                     member shouldBe originalInvitationVO.member

diff --git a/module-domain/src/test/kotlin/site/yourevents/invitation/service/InvitationServiceTest.kt b/module-domain/src/test/kotlin/site/yourevents/invitation/service/InvitationServiceTest.kt
@@ -26,6 +26,7 @@ class InvitationServiceTest : DescribeSpec({
     lateinit var nickname: String
     lateinit var email: String
     lateinit var qrUrl: String
+    lateinit var templateKey: String
     lateinit var member: Member
     var deleted = false
 
@@ -36,6 +37,7 @@ class InvitationServiceTest : DescribeSpec({
         nickname = "seunghyun"
         email = "[email protected]"
         qrUrl = "http://example.com"
+        templateKey = "templateKey"
         deleted = false
 
         member = Member(
@@ -63,6 +65,7 @@ class InvitationServiceTest : DescribeSpec({
                         id = invitationId,
                         member = member,
                         qrUrl = qrUrl,
+                        templateKey = templateKey,
                         deleted = deleted,
                         createdAt = LocalDateTime.now(),
                         modifiedAt = LocalDateTime.now()
@@ -101,13 +104,14 @@ class InvitationServiceTest : DescribeSpec({
                     id = invitationId,
                     member = member,
                     qrUrl = qrUrl,
+                    templateKey = templateKey,
                     deleted = deleted,
                     createdAt = LocalDateTime.now(),
                     modifiedAt = LocalDateTime.now()
                 )
                 every { invitationPersistencePort.save(any<InvitationVO>()) } returns savedInvitation
 
-                val result = invitationService.createInvitation(memberId, qrUrl)
+                val result = invitationService.createInvitation(memberId, qrUrl, templateKey)
 
                 result shouldBe savedInvitation
 
@@ -127,6 +131,7 @@ class InvitationServiceTest : DescribeSpec({
                     id = invitationId,
                     member = member,
                     qrUrl = qrUrl,
+                    templateKey = templateKey,
                     deleted = deleted,
                     createdAt = LocalDateTime.now(),
                     modifiedAt = LocalDateTime.now()
@@ -163,6 +168,7 @@ class InvitationServiceTest : DescribeSpec({
                     id = invitationId,
                     member = member,
                     qrUrl = qrUrl,
+                    templateKey = templateKey,
                     deleted = false,
                     createdAt = LocalDateTime.now(),
                     modifiedAt = LocalDateTime.now()

diff --git a/...src/test/kotlin/site/yourevents/invitationinformation/domain/InvitationInformationTest.kt b/...src/test/kotlin/site/yourevents/invitationinformation/domain/InvitationInformationTest.kt
@@ -23,6 +23,7 @@ class InvitationInformationTest : DescribeSpec({
                     id = UUID.randomUUID(),
                     member = member,
                     qrUrl = "http://example.com",
+                    templateKey = "templateKey",
                     deleted = false,
                     createdAt = LocalDateTime.now(),
                     modifiedAt = LocalDateTime.now()

diff --git a/...c/test/kotlin/site/yourevents/invitationinformation/domain/InvitationInformationVOTest.kt b/...c/test/kotlin/site/yourevents/invitationinformation/domain/InvitationInformationVOTest.kt
@@ -28,6 +28,7 @@ class InvitationInformationVOTest : DescribeSpec({
             id = UUID.randomUUID(),
             member = member,
             qrUrl = "http://example.com",
+            templateKey = null,
             deleted = false,
             createdAt = LocalDateTime.now(),
             modifiedAt = LocalDateTime.now()

diff --git a/.../kotlin/site/yourevents/invitationinformation/service/InvitationInformationServiceTest.kt b/.../kotlin/site/yourevents/invitationinformation/service/InvitationInformationServiceTest.kt
@@ -45,6 +45,7 @@ class InvitationInformationServiceTest : DescribeSpec({
             id = invitationId,
             member = member,
             qrUrl = "http://example.com",
+            templateKey = null,
             deleted = false,
             createdAt = LocalDateTime.now(),
             modifiedAt = LocalDateTime.now()

diff --git a/...ain/src/test/kotlin/site/yourevents/invitationthumbnail/domain/InvitationThumbnailTest.kt b/...ain/src/test/kotlin/site/yourevents/invitationthumbnail/domain/InvitationThumbnailTest.kt
@@ -20,8 +20,17 @@ class InvitationThumbnailTest : DescribeSpec({
 
                 val invitationId = UUID.randomUUID()
                 val qrUrl = "http://example.com"
+                val templateKey = null
                 val deleted = false
-                val invitation = Invitation(invitationId, member, qrUrl, deleted, LocalDateTime.now(), LocalDateTime.now())
+                val invitation = Invitation(
+                    invitationId,
+                    member,
+                    qrUrl,
+                    templateKey,
+                    deleted,
+                    LocalDateTime.now(),
+                    LocalDateTime.now()
+                )
 
                 val thumbnailId = UUID.randomUUID()
                 val url = "http://example.com/"

diff --git a/...n/src/test/kotlin/site/yourevents/invitationthumbnail/domain/InvitationThumbnailVOTest.kt b/...n/src/test/kotlin/site/yourevents/invitationthumbnail/domain/InvitationThumbnailVOTest.kt
@@ -26,8 +26,17 @@ class InvitationThumbnailVOTest : DescribeSpec({
 
         val invitationId = UUID.randomUUID()
         val qrUrl = "http://example.com"
+        val templateKey = null
         val deleted = false
-        invitation = Invitation(invitationId, member, qrUrl, deleted, LocalDateTime.now(), LocalDateTime.now())
+        invitation = Invitation(
+            invitationId,
+            member,
+            qrUrl,
+            templateKey,
+            deleted,
+            LocalDateTime.now(),
+            LocalDateTime.now()
+        )
 
         url = "http://example.com/"
     }

diff --git a/...test/kotlin/site/yourevents/invitationthumbnail/service/InvitationThumbnailServiceTest.kt b/...test/kotlin/site/yourevents/invitationthumbnail/service/InvitationThumbnailServiceTest.kt
@@ -40,6 +40,7 @@ class InvitationThumbnailServiceTest : DescribeSpec({
             id = invitationId,
             member = member,
             qrUrl = "http://example.com",
+            templateKey = null,
             deleted = false,
             createdAt = LocalDateTime.now(),
             modifiedAt = LocalDateTime.now()

diff --git a/...ure/persistence-db/src/main/kotlin/site/yourevents/guest/repository/GuestJPARepository.kt b/...ure/persistence-db/src/main/kotlin/site/yourevents/guest/repository/GuestJPARepository.kt
@@ -19,11 +19,11 @@ interface GuestJPARepository : JpaRepository<GuestEntity, UUID> {
 
     @Query(
         "SELECT DISTINCT i " +
-                "FROM guest g " +
-                "JOIN g.invitation i " +
-                "WHERE g.member = :memberEntity " +
-                "AND i.member <> :memberEntity " +
-                "AND i.deleted = false"
+            "FROM guest g " +
+            "JOIN g.invitation i " +
+            "WHERE g.member = :memberEntity " +
+            "AND i.member <> :memberEntity " +
+            "AND i.deleted = false"
     )
     fun getReceivedInvitations(memberEntity: MemberEntity): List<InvitationEntity>
 
@@ -46,4 +46,10 @@ interface GuestJPARepository : JpaRepository<GuestEntity, UUID> {
         "WHERE g.member.id = :memberId " +
         "AND g.invitation.id = :invitationId")
     fun findAttendanceByMemberIdAndInvitationId(memberId: UUID, invitationId: UUID): Boolean?
+
+    @Query("SELECT g.nickname " +
+        "FROM guest g " +
+        "WHERE g.member.id = :memberId " +
+        "AND g.invitation.id = :invitationId")
+    fun findOwnerNickname(invitationId: UUID, memberId: UUID): String
 }
diff --git a/...ucture/persistence-db/src/main/kotlin/site/yourevents/guest/repository/GuestRepository.kt b/...ucture/persistence-db/src/main/kotlin/site/yourevents/guest/repository/GuestRepository.kt
@@ -49,4 +49,7 @@ class GuestRepository(
     override fun findAttendanceByMemberAndInvitation(memberId: UUID, invitationId: UUID): Boolean? {
         return guestJPARepository.findAttendanceByMemberIdAndInvitationId(memberId, invitationId)
     }
+
+    override fun findOwnerNickname(invitationId: UUID, memberId: UUID): String =
+        guestJPARepository.findOwnerNickname(invitationId, memberId)
 }
diff --git a/...ture/persistence-db/src/main/kotlin/site/yourevents/invitation/entity/InvitationEntity.kt b/...ture/persistence-db/src/main/kotlin/site/yourevents/invitation/entity/InvitationEntity.kt
@@ -26,13 +26,17 @@ class InvitationEntity(
     @Column
     val qrUrl: String,
 
+    @Column
+    val templateKey: String?,
+
     @Column
     val deleted: Boolean,
 ) : BaseTimeEntity() {
     fun toDomain(): Invitation = Invitation(
         id = id!!,
         member = member.toDomain(),
         qrUrl = qrUrl,
+        templateKey = templateKey,
         deleted = deleted,
         createdAt = createdAt,
         modifiedAt = modifiedAt
@@ -43,12 +47,14 @@ class InvitationEntity(
             id = invitation.id,
             member = MemberEntity.from(invitation.member),
             qrUrl = invitation.qrUrl,
+            templateKey = invitation.templateKey,
             deleted = invitation.deleted
         )
 
         fun from(invitationVO: InvitationVO): InvitationEntity = InvitationEntity(
             member = MemberEntity.from(invitationVO.member),
             qrUrl = invitationVO.qrUrl,
+            templateKey = invitationVO.templateKey,
             deleted = invitationVO.deleted
         )
     }

diff --git a/...re/persistence-db/src/test/kotlin/site/yourevents/guest/repository/GuestRepositoryTest.kt b/...re/persistence-db/src/test/kotlin/site/yourevents/guest/repository/GuestRepositoryTest.kt
@@ -41,6 +41,7 @@ class GuestRepositoryTest(
         invitationEntity = InvitationEntity(
             member = memberEntity,
             qrUrl = "http://example.com",
+            templateKey = null,
             deleted = false
         )
         invitationJPARepository.save(invitationEntity)