Skip to content

refactor: 참석 여부 응답 API 수정 #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jwnnoh merged 5 commits into from
Feb 4, 2025
Merged

refactor: 참석 여부 응답 API 수정 #42

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28be477
fix: attendance nullable 수정
jwnnoh Feb 3, 2025
199dc4b
fix: request DTO guestId 제외
jwnnoh Feb 3, 2025
d4a39db
feat: guestId 반환 로직 추가
jwnnoh Feb 3, 2025
840d76e
test: service, facade, repository 테스트 코드 작성
jwnnoh Feb 3, 2025
d675a29
fix: attendance nullable 롤백
jwnnoh Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion module-domain/src/main/kotlin/site/yourevents/guest/port/in/GuestUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ interface GuestUseCase {
): Guest

fun respondInvitation(
guestId: UUID?,
invitationId: UUID,
memberId: UUID,
nickname: String,
Expand Down
2 changes: 2 additions & 0 deletions module-domain/src/main/kotlin/site/yourevents/guest/port/out/GuestPersistencePort.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@ interface GuestPersistencePort {
fun findAttendanceByMemberAndInvitation(memberId: UUID, invitationId: UUID): Boolean?

fun findOwnerNickname(invitationId: UUID, memberId: UUID): String

fun findIdByMemberAndInvitation(memberId: UUID, invitationId: UUID): UUID?
}
3 changes: 2 additions & 1 deletion module-domain/src/main/kotlin/site/yourevents/guest/service/GuestService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ class GuestService(
}

override fun respondInvitation(
guestId: UUID?,
invitationId: UUID,
memberId: UUID,
nickname: String,
Expand All @@ -59,6 +58,8 @@ class GuestService(

val invitation = invitationUseCase.findById(invitationId)

val guestId = guestPersistencePort.findIdByMemberAndInvitation(memberId, invitationId)

if (guestId == null) {
guestPersistencePort.save(
GuestVO(
Expand Down
81 changes: 8 additions & 73 deletions module-domain/src/test/kotlin/site/yourevents/guest/service/GuestServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,9 @@ class GuestServiceTest : DescribeSpec({
modifiedAt = LocalDateTime.now()
)

every { guestPersistencePort.findIdByMemberAndInvitation(memberId, invitationId) } returns null

guestService.respondInvitation(
guestId = null,
invitationId = invitationId,
memberId = memberId,
nickname = guestNickname,
Expand All @@ -144,78 +145,8 @@ class GuestServiceTest : DescribeSpec({
verify(exactly = 1) { memberUseCase.findById(memberId) }
verify(exactly = 1) { invitationUseCase.findById(invitationId) }
verify(exactly = 1) {
guestPersistencePort.save(match<GuestVO> { guestVO ->
guestVO.member == member &&
guestVO.invitation == invitation &&
guestVO.nickname == guestNickname &&
guestVO.attendance == attendance
})
guestPersistencePort.findIdByMemberAndInvitation(memberId, invitationId)
}
confirmVerified(memberUseCase, invitationUseCase, guestPersistencePort)
}

it("guestId가 null이 아니면 기존 Guest의 attendance만 업데이트한다.") {
val guestId = UUID.randomUUID()
val expectedGuest = Guest(
id = guestId,
member = member,
invitation = invitation,
nickname = guestNickname,
attendance = true,
createdAt = LocalDateTime.now(),
modifiedAt = LocalDateTime.now()
)

every { guestPersistencePort.findById(any()) } returns expectedGuest

val updatedAttendance = false
expectedGuest.updateAttendance(updatedAttendance)

val slotGuest = slot<Guest>()
every { guestPersistencePort.save(capture(slotGuest)) } just runs

guestService.respondInvitation(
guestId = guestId,
invitationId = invitationId,
memberId = memberId,
nickname = guestNickname,
attendance = updatedAttendance
)

slotGuest.captured.attendance shouldBe updatedAttendance

verify(exactly = 1) { memberUseCase.findById(memberId) }
verify(exactly = 1) { invitationUseCase.findById(invitationId) }
verify(exactly = 1) { guestPersistencePort.findById(any()) }
verify(exactly = 1) { guestPersistencePort.save(any<Guest>()) }
confirmVerified(memberUseCase, invitationUseCase, guestPersistencePort)
}
}

context("respondInvitation 메서드를 통해서") {
it("guestId가 null이면 새로운 Guest를 생성한다.") {
val attendance = true

every { guestPersistencePort.save(any<GuestVO>()) } returns Guest(
id = UUID.randomUUID(),
member = member,
invitation = invitation,
nickname = guestNickname,
attendance = attendance,
createdAt = LocalDateTime.now(),
modifiedAt = LocalDateTime.now()
)

guestService.respondInvitation(
guestId = null,
invitationId = invitationId,
memberId = memberId,
nickname = guestNickname,
attendance = attendance
)

verify(exactly = 1) { memberUseCase.findById(memberId) }
verify(exactly = 1) { invitationUseCase.findById(invitationId) }
verify(exactly = 1) {
guestPersistencePort.save(match<GuestVO> { guestVO ->
guestVO.member == member &&
Expand All @@ -240,6 +171,7 @@ class GuestServiceTest : DescribeSpec({
)

every { guestPersistencePort.findById(any()) } returns expectedGuest
every { guestPersistencePort.findIdByMemberAndInvitation(memberId, invitationId) } returns guestId

val updatedAttendance = false
expectedGuest.updateAttendance(updatedAttendance)
Expand All @@ -248,7 +180,6 @@ class GuestServiceTest : DescribeSpec({
every { guestPersistencePort.save(capture(slotGuest)) } just runs

guestService.respondInvitation(
guestId = guestId,
invitationId = invitationId,
memberId = memberId,
nickname = guestNickname,
Expand All @@ -261,9 +192,13 @@ class GuestServiceTest : DescribeSpec({
verify(exactly = 1) { invitationUseCase.findById(invitationId) }
verify(exactly = 1) { guestPersistencePort.findById(any()) }
verify(exactly = 1) { guestPersistencePort.save(any<Guest>()) }
verify(exactly = 1) {
guestPersistencePort.findIdByMemberAndInvitation(memberId, invitationId)
}
confirmVerified(memberUseCase, invitationUseCase, guestPersistencePort)
}
}

context("findAttendGuestsByInvitation, findNotAttendGuestsByInvitation 메서드를 통해서") {
it("참석하는 게스트와 참석하지 않는 게스트 목록이 반환되어야 한다.") {
val attendingGuest1 = Guest(
Expand Down
2 changes: 1 addition & 1 deletion ...infrastructure/persistence-db/src/main/kotlin/site/yourevents/guest/entity/GuestEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class GuestEntity(
@Column
val nickname: String,

@Column(nullable = false)
@Column
val attendance: Boolean,
) : BaseTimeEntity() {
fun toDomain(): Guest =
Expand Down
6 changes: 6 additions & 0 deletions ...ure/persistence-db/src/main/kotlin/site/yourevents/guest/repository/GuestJPARepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,10 @@ interface GuestJPARepository : JpaRepository<GuestEntity, UUID> {
"WHERE g.member.id = :memberId " +
"AND g.invitation.id = :invitationId")
fun findOwnerNickname(invitationId: UUID, memberId: UUID): String

@Query("SELECT g.id " +
"FROM guest g " +
"WHERE g.member.id = :memberId " +
"AND g.invitation.id = :invitationId")
fun findIdByMemberIdAndInvitationId(memberId: UUID, invitationId: UUID): UUID?
}
13 changes: 7 additions & 6 deletions ...ucture/persistence-db/src/main/kotlin/site/yourevents/guest/repository/GuestRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ import kotlin.jvm.optionals.getOrNull
class GuestRepository(
private val guestJPARepository: GuestJPARepository,
) : GuestPersistencePort {
override fun save(guestVo: GuestVO): Guest {
return guestJPARepository.save(GuestEntity.from(guestVo))
override fun save(guestVo: GuestVO) =
guestJPARepository.save(GuestEntity.from(guestVo))
.toDomain()
}

override fun save(guest: Guest) {
guestJPARepository.save(GuestEntity.from(guest))
Expand All @@ -46,10 +45,12 @@ class GuestRepository(
.map(GuestEntity::toDomain)
}

override fun findAttendanceByMemberAndInvitation(memberId: UUID, invitationId: UUID): Boolean? {
return guestJPARepository.findAttendanceByMemberIdAndInvitationId(memberId, invitationId)
}
override fun findAttendanceByMemberAndInvitation(memberId: UUID, invitationId: UUID) =
guestJPARepository.findAttendanceByMemberIdAndInvitationId(memberId, invitationId)

override fun findOwnerNickname(invitationId: UUID, memberId: UUID): String =
guestJPARepository.findOwnerNickname(invitationId, memberId)

override fun findIdByMemberAndInvitation(memberId: UUID, invitationId: UUID) =
guestJPARepository.findIdByMemberIdAndInvitationId(memberId, invitationId)
}
26 changes: 24 additions & 2 deletions ...re/persistence-db/src/test/kotlin/site/yourevents/guest/repository/GuestRepositoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class GuestRepositoryTest(
lateinit var invitationEntity: InvitationEntity
lateinit var memberEntity: MemberEntity

beforeSpec {
beforeEach {
memberEntity = MemberEntity.from(
MemberVO(
socialId = "6316",
Expand All @@ -54,7 +54,7 @@ class GuestRepositoryTest(
)
}

afterSpec {
afterEach {
guestJPARepository.deleteAllInBatch()
invitationJPARepository.deleteAllInBatch()
memberJPARepository.deleteAllInBatch()
Expand All @@ -72,5 +72,27 @@ class GuestRepositoryTest(
savedGuest.invitation.id shouldBe invitationEntity.id
}
}

context("findIdByMemberIdAndInvitationId() 메서드에서") {
it("Guest가 존재하면 guestId를 반환해야 한다.") {
val savedGuest = guestRepository.save(guestVO)

val memberId = memberEntity.id!!
val invitationId = invitationEntity.id!!

val guestId = guestRepository.findIdByMemberAndInvitation(memberId, invitationId)

guestId shouldBe savedGuest.id
}

it("Guest가 존재하지 않으면 null을 반환해야 한다.") {
val memberId = memberEntity.id!!
val invitationId = invitationEntity.id!!

val guestId = guestRepository.findIdByMemberAndInvitation(memberId, invitationId)

guestId shouldBe null
}
}
}
})
1 change: 0 additions & 1 deletion ...resentation/src/main/kotlin/site/yourevents/guest/dto/request/InvitationRespondRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package site.yourevents.guest.dto.request
import java.util.UUID

data class InvitationRespondRequest(
val guestId: UUID?,
val invitationId: UUID,
val nickname: String,
val attendance: Boolean,
Expand Down
1 change: 0 additions & 1 deletion module-presentation/src/main/kotlin/site/yourevents/guest/facade/GuestFacade.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ class GuestFacade(
val memberId = authDetails.uuid

guestUseCase.respondInvitation(
invitationRespondRequest.guestId,
invitationRespondRequest.invitationId,
memberId,
invitationRespondRequest.nickname,
Expand Down
3 changes: 0 additions & 3 deletions module-presentation/src/test/kotlin/site/yourevents/guest/facade/GuestFacadeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@ class GuestFacadeTest : DescribeSpec({
any(),
any(),
any(),
any()
)
} just runs

val request = InvitationRespondRequest(
guestId = UUID.randomUUID(),
invitationId = UUID.randomUUID(),
nickname = "nickname",
attendance = true
Expand All @@ -49,7 +47,6 @@ class GuestFacadeTest : DescribeSpec({
any(),
any(),
any(),
any()
)
}
confirmVerified(guestUseCase)
Expand Down