[#18] 코드 정리 및 일부 컨벤션 통일 #19

Merged
pricelees merged 24 commits from refactor/#18 into main 2025-07-22 09:05:31 +00:00
6 changed files with 8 additions and 8 deletions
Showing only changes of commit 50a0478326 - Show all commits

View File

@ -14,7 +14,7 @@ class AuthService(
private val jwtHandler: JwtHandler private val jwtHandler: JwtHandler
) { ) {
fun login(request: LoginRequest): TokenResponse { fun login(request: LoginRequest): TokenResponse {
val member: MemberEntity = memberService.findMemberByEmailAndPassword( val member: MemberEntity = memberService.findByEmailAndPassword(
request.email, request.email,
request.password request.password
) )

View File

@ -16,7 +16,7 @@ import roomescape.member.web.toResponse
class MemberService( class MemberService(
private val memberRepository: MemberRepository private val memberRepository: MemberRepository
) { ) {
fun readAllMembers(): MembersResponse = MembersResponse( fun findAll(): MembersResponse = MembersResponse(
memberRepository.findAll() memberRepository.findAll()
.map { it.toResponse() } .map { it.toResponse() }
.toList() .toList()
@ -29,7 +29,7 @@ class MemberService(
HttpStatus.BAD_REQUEST HttpStatus.BAD_REQUEST
) )
fun findMemberByEmailAndPassword(email: String, password: String): MemberEntity = fun findByEmailAndPassword(email: String, password: String): MemberEntity =
memberRepository.findByEmailAndPassword(email, password) memberRepository.findByEmailAndPassword(email, password)
?: throw RoomescapeException( ?: throw RoomescapeException(
ErrorType.MEMBER_NOT_FOUND, ErrorType.MEMBER_NOT_FOUND,

View File

@ -20,5 +20,5 @@ interface MemberAPI {
useReturnTypeSchema = true useReturnTypeSchema = true
) )
) )
fun readAllMembers(): ResponseEntity<CommonApiResponse<MembersResponse>> fun findAll(): ResponseEntity<CommonApiResponse<MembersResponse>>
} }

View File

@ -13,8 +13,8 @@ class MemberController(
) : MemberAPI { ) : MemberAPI {
@GetMapping("/members") @GetMapping("/members")
override fun readAllMembers(): ResponseEntity<CommonApiResponse<MembersResponse>> { override fun findAll(): ResponseEntity<CommonApiResponse<MembersResponse>> {
val response: MembersResponse = memberService.readAllMembers() val response: MembersResponse = memberService.findAll()
return ResponseEntity.ok(CommonApiResponse(response)) return ResponseEntity.ok(CommonApiResponse(response))
} }

View File

@ -149,7 +149,7 @@ class ReservationService(
status: ReservationStatus status: ReservationStatus
): ReservationEntity { ): ReservationEntity {
val time = reservationTimeService.findTimeById(timeId) val time = reservationTimeService.findTimeById(timeId)
val theme = themeService.findThemeById(themeId) val theme = themeService.findById(themeId)
val member = memberService.findById(memberId) val member = memberService.findById(memberId)
validateDateAndTime(date, time) validateDateAndTime(date, time)

View File

@ -51,7 +51,7 @@ class ReservationServiteTest : FunSpec({
} returns false } returns false
every { every {
themeService.findThemeById(any()) themeService.findById(any())
} returns mockk() } returns mockk()
every { every {