diff --git a/src/main/java/roomescape/auth/service/AuthService.kt b/src/main/java/roomescape/auth/service/AuthService.kt index b6ee6e00..59cf0630 100644 --- a/src/main/java/roomescape/auth/service/AuthService.kt +++ b/src/main/java/roomescape/auth/service/AuthService.kt @@ -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 ) diff --git a/src/main/java/roomescape/member/business/MemberService.kt b/src/main/java/roomescape/member/business/MemberService.kt index 512f947d..fcb28ee6 100644 --- a/src/main/java/roomescape/member/business/MemberService.kt +++ b/src/main/java/roomescape/member/business/MemberService.kt @@ -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, diff --git a/src/main/java/roomescape/member/docs/MemberAPI.kt b/src/main/java/roomescape/member/docs/MemberAPI.kt index de8608ca..b69bcef3 100644 --- a/src/main/java/roomescape/member/docs/MemberAPI.kt +++ b/src/main/java/roomescape/member/docs/MemberAPI.kt @@ -20,5 +20,5 @@ interface MemberAPI { useReturnTypeSchema = true ) ) - fun readAllMembers(): ResponseEntity> + fun findAll(): ResponseEntity> } diff --git a/src/main/java/roomescape/member/web/MemberController.kt b/src/main/java/roomescape/member/web/MemberController.kt index 435ca9d4..0ba7b0bf 100644 --- a/src/main/java/roomescape/member/web/MemberController.kt +++ b/src/main/java/roomescape/member/web/MemberController.kt @@ -13,8 +13,8 @@ class MemberController( ) : MemberAPI { @GetMapping("/members") - override fun readAllMembers(): ResponseEntity> { - val response: MembersResponse = memberService.readAllMembers() + override fun findAll(): ResponseEntity> { + val response: MembersResponse = memberService.findAll() return ResponseEntity.ok(CommonApiResponse(response)) } diff --git a/src/main/java/roomescape/reservation/business/ReservationService.kt b/src/main/java/roomescape/reservation/business/ReservationService.kt index 1047b9c7..6db9c0a6 100644 --- a/src/main/java/roomescape/reservation/business/ReservationService.kt +++ b/src/main/java/roomescape/reservation/business/ReservationService.kt @@ -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) diff --git a/src/test/java/roomescape/reservation/business/ReservationServiteTest.kt b/src/test/java/roomescape/reservation/business/ReservationServiteTest.kt index c9b2fa6a..fa525e5c 100644 --- a/src/test/java/roomescape/reservation/business/ReservationServiteTest.kt +++ b/src/test/java/roomescape/reservation/business/ReservationServiteTest.kt @@ -51,7 +51,7 @@ class ReservationServiteTest : FunSpec({ } returns false every { - themeService.findThemeById(any()) + themeService.findById(any()) } returns mockk() every {