Skip to content

Commit

Permalink
Merge pull request #38 from Leets-Official/refactor/#37
Browse files Browse the repository at this point in the history
refactor: 가시성 수정자 변경
  • Loading branch information
jwnnoh authored Feb 2, 2025
2 parents ce7e20c + dc7dde0 commit dcfe859
Show file tree
Hide file tree
Showing 18 changed files with 42 additions and 89 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import java.time.LocalDateTime

data class InvitationInformationVO(
val invitation: Invitation,
var title: String,
var schedule: LocalDateTime,
var location: String,
var remark: String,
val title: String,
val schedule: LocalDateTime,
val location: String,
val remark: String,
) {
companion object {
fun of(invitation: Invitation, title: String, schedule: LocalDateTime, location: String, remark: String) =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package site.yourevents.invitationinformation.service
import jakarta.transaction.Transactional
import org.springframework.stereotype.Service
import site.yourevents.invitation.domain.Invitation
import site.yourevents.invitation.exception.InvitationNotFoundException
import site.yourevents.invitation.port.`in`.InvitationUseCase
import site.yourevents.invitationinformation.domain.InvitationInformation
import site.yourevents.invitationinformation.domain.InvitationInformationVO
import site.yourevents.invitationinformation.exception.InvitationInformationNotFoundException
import site.yourevents.invitationinformation.port.`in`.InvitationInformationUseCase
import site.yourevents.invitationinformation.port.out.InvitationInformationPersistencePort
import java.time.LocalDateTime
Expand All @@ -27,7 +27,6 @@ class InvitationInformationService(
): InvitationInformation {

val invitation = invitationUseCase.findById(invitationId)
?: throw InvitationNotFoundException()

return invitationInformationPersistencePort.save(
InvitationInformationVO.of(
Expand All @@ -42,5 +41,5 @@ class InvitationInformationService(

override fun findByInvitation(invitation: Invitation): InvitationInformation =
invitationInformationPersistencePort.findByInvitation(invitation)
?: throw InvitationNotFoundException()
?: throw InvitationInformationNotFoundException()
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package site.yourevents.invitationthumnail.service
import jakarta.transaction.Transactional
import org.springframework.stereotype.Service
import site.yourevents.invitation.domain.Invitation
import site.yourevents.invitation.exception.InvitationNotFoundException
import site.yourevents.invitation.port.`in`.InvitationUseCase
import site.yourevents.invitationthumnail.domain.InvitationThumbnail
import site.yourevents.invitationthumnail.domain.InvitationThumbnailVO
Expand All @@ -24,7 +23,6 @@ class InvitationThumbnailService(
): InvitationThumbnail {

val invitation = invitationUseCase.findById(invitationId)
?: throw InvitationNotFoundException()

return invitationThumbnailPersistencePort.save(
InvitationThumbnailVO.of(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,11 @@ import java.time.LocalDateTime
import java.util.UUID

class Member(
private val id: UUID,
private val socialId: String,
private val nickname: String,
private val email: String,
val id: UUID,
val socialId: String,
val nickname: String,
val email: String,
createdAt: LocalDateTime?,
modifiedAt: LocalDateTime?,
) : BaseTime(createdAt, modifiedAt) {
fun getId(): UUID = id

fun getSocialId(): String = socialId

fun getNickname(): String = nickname

fun getEmail(): String = email
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class InvitationEntity(
companion object {
fun from(invitation: Invitation): InvitationEntity = InvitationEntity(
id = invitation.id,
//무슨 일이 있어도 건들면 안됩니다. 얘가 있어야 다른 엔티티에서 id를 받아올 수 있습니다. 얘가 없으면 하이버네이트에서 새로운 null 값의 엔티티라고 생각합니다.
member = MemberEntity.from(invitation.member),
qrUrl = invitation.qrUrl,
deleted = invitation.deleted
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package site.yourevents.invitationinformation.entity

import jakarta.persistence.CascadeType
import jakarta.persistence.Column
import jakarta.persistence.Entity
import jakarta.persistence.GeneratedValue
Expand All @@ -26,16 +25,16 @@ class InvitationInformationEntity(
val invitation: InvitationEntity,

@Column
var title: String,
val title: String,

@Column
var schedule: LocalDateTime,
val schedule: LocalDateTime,

@Column
var location: String,
val location: String,

@Column
var remark: String,
val remark: String,
) : BaseTimeEntity() {
fun toDomain(): InvitationInformation =
InvitationInformation(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ import java.util.UUID
class MemberEntity(
@Id
@GeneratedValue(strategy = GenerationType.UUID)
private val id: UUID? = null,
val id: UUID? = null,

@Column
private val socialId: String,
val socialId: String,

@Column
private val nickname: String,
val nickname: String,

@Column
private val email: String,
val email: String,
) : BaseTimeEntity() {
fun toDomain(): Member = Member(
id = id!!,
Expand All @@ -42,10 +42,10 @@ class MemberEntity(
)

fun from(member: Member): MemberEntity = MemberEntity(
id = member.getId(),
socialId = member.getSocialId(),
nickname = member.getNickname(),
email = member.getEmail()
id = member.id,
socialId = member.socialId,
nickname = member.nickname,
email = member.email
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class GuestRepositoryTest(
savedGuest.nickname shouldBe guestVO.nickname
savedGuest.attendance shouldBe guestVO.attendance

savedGuest.member.getSocialId() shouldBe memberEntity.toDomain().getSocialId()
savedGuest.member.socialId shouldBe memberEntity.toDomain().socialId
savedGuest.invitation.id shouldBe invitationEntity.id
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ class InvitationInformationRepositoryTest(
savedInfo.invitation.id shouldBe invitationEntity.id
savedInfo.invitation.qrUrl shouldBe invitationEntity.qrUrl
savedInfo.invitation.deleted shouldBe invitationEntity.deleted
savedInfo.invitation.member.getSocialId() shouldBe memberEntity.toDomain().getSocialId()
savedInfo.invitation.member.getNickname() shouldBe memberEntity.toDomain().getNickname()
savedInfo.invitation.member.getEmail() shouldBe memberEntity.toDomain().getEmail()
savedInfo.invitation.member.socialId shouldBe memberEntity.toDomain().socialId
savedInfo.invitation.member.nickname shouldBe memberEntity.toDomain().nickname
savedInfo.invitation.member.email shouldBe memberEntity.toDomain().email
}
}
})
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ class InvitationThumbnailRepositoryTest(

savedThumbnail.url shouldBe invitationThumbnailVO.url
savedThumbnail.invitation.id shouldBe invitationThumbnailVO.invitation.id
savedThumbnail.invitation.member.getSocialId() shouldBe memberEntity.toDomain().getSocialId()
savedThumbnail.invitation.member.getEmail() shouldBe memberEntity.toDomain().getEmail()
savedThumbnail.invitation.member.getNickname() shouldBe memberEntity.toDomain().getNickname()
savedThumbnail.invitation.member.socialId shouldBe memberEntity.toDomain().socialId
savedThumbnail.invitation.member.email shouldBe memberEntity.toDomain().email
savedThumbnail.invitation.member.nickname shouldBe memberEntity.toDomain().nickname

}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ class MemberRepositoryTest(
val member = memberRepository.findBySocialId(socialId)

member!!.apply {
getSocialId() shouldBe socialId
getNickname() shouldBe nickname
getEmail() shouldBe email
socialId shouldBe socialId
nickname shouldBe nickname
email shouldBe email
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class AuthDetailsService(
?: throw MemberNotFountException()

return AuthDetails(
member.getId(),
member.getSocialId(),
member.id,
member.socialId,
"ROLE_USER",
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ class AuthFacade(
?: memberUseCase.createMember(kakaoProfile)

val accessToken: String = tokenUseCase.generateAccessToken(
member.getId(),
member.getSocialId(),
member.id,
member.socialId,
"ROLE_USER",
)

return LoginResponse.of(
member.getId(),
member.getSocialId(),
member.getNickname(),
member.id,
member.socialId,
member.nickname,
accessToken,
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ data class CreateInvitationResponse(

val invitationResponse = InvitationResponseDto(
invitationId = invitation.id,
memberId = invitation.member.getId(),
memberId = invitation.member.id,
qrUrl = invitation.qrUrl,
deleted = invitation.deleted
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class InvitationFacade(
) {
val invitation = invitationUseCase.findById(invitationId)

if (invitation.member.getId() != authDetails.uuid) {
if (invitation.member.id != authDetails.uuid) {
throw UnauthorizedException()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class MemberFacade(
val sentInvitationCount = invitationUseCase.countByMember(member)

return MemberInfoResponse.of(
member.getNickname(),
member.nickname,
receivedInvitationCount,
sentInvitationCount
)
Expand Down

0 comments on commit dcfe859

Please sign in to comment.