generated from pricelees/issue-pr-template
[#18] 코드 정리 및 일부 컨벤션 통일 #19
@ -14,7 +14,7 @@ class AuthService(
|
||||
private val jwtHandler: JwtHandler
|
||||
) {
|
||||
fun login(request: LoginRequest): TokenResponse {
|
||||
val member: MemberEntity = memberService.findMemberByEmailAndPassword(
|
||||
val member: MemberEntity = memberService.findByEmailAndPassword(
|
||||
request.email,
|
||||
request.password
|
||||
)
|
||||
|
||||
@ -16,7 +16,7 @@ import roomescape.member.web.toResponse
|
||||
class MemberService(
|
||||
private val memberRepository: MemberRepository
|
||||
) {
|
||||
fun readAllMembers(): MembersResponse = MembersResponse(
|
||||
fun findAll(): MembersResponse = MembersResponse(
|
||||
memberRepository.findAll()
|
||||
.map { it.toResponse() }
|
||||
.toList()
|
||||
@ -29,7 +29,7 @@ class MemberService(
|
||||
HttpStatus.BAD_REQUEST
|
||||
)
|
||||
|
||||
fun findMemberByEmailAndPassword(email: String, password: String): MemberEntity =
|
||||
fun findByEmailAndPassword(email: String, password: String): MemberEntity =
|
||||
memberRepository.findByEmailAndPassword(email, password)
|
||||
?: throw RoomescapeException(
|
||||
ErrorType.MEMBER_NOT_FOUND,
|
||||
|
||||
@ -20,5 +20,5 @@ interface MemberAPI {
|
||||
useReturnTypeSchema = true
|
||||
)
|
||||
)
|
||||
fun readAllMembers(): ResponseEntity<CommonApiResponse<MembersResponse>>
|
||||
fun findAll(): ResponseEntity<CommonApiResponse<MembersResponse>>
|
||||
}
|
||||
|
||||
@ -13,8 +13,8 @@ class MemberController(
|
||||
) : MemberAPI {
|
||||
|
||||
@GetMapping("/members")
|
||||
override fun readAllMembers(): ResponseEntity<CommonApiResponse<MembersResponse>> {
|
||||
val response: MembersResponse = memberService.readAllMembers()
|
||||
override fun findAll(): ResponseEntity<CommonApiResponse<MembersResponse>> {
|
||||
val response: MembersResponse = memberService.findAll()
|
||||
|
||||
return ResponseEntity.ok(CommonApiResponse(response))
|
||||
}
|
||||
|
||||
@ -149,7 +149,7 @@ class ReservationService(
|
||||
status: ReservationStatus
|
||||
): ReservationEntity {
|
||||
val time = reservationTimeService.findTimeById(timeId)
|
||||
val theme = themeService.findThemeById(themeId)
|
||||
val theme = themeService.findById(themeId)
|
||||
val member = memberService.findById(memberId)
|
||||
|
||||
validateDateAndTime(date, time)
|
||||
|
||||
@ -51,7 +51,7 @@ class ReservationServiteTest : FunSpec({
|
||||
} returns false
|
||||
|
||||
every {
|
||||
themeService.findThemeById(any())
|
||||
themeService.findById(any())
|
||||
} returns mockk()
|
||||
|
||||
every {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user