pricelees/roomescape-refactored
1
0
Fork 0
generated from pricelees/issue-pr-template
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[#16] Reservation 도메인 코드 코틀린 마이그레이션 #17

Merged
pricelees merged 40 commits from refactor/#16 into main 2025-07-21 12:08:56 +00:00
Conversation 0 Commits 40 Files Changed 81 +85 -84
3 changed files with 85 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4e7b850e8d - Show all commits

7
src/main/java/roomescape/reservation/business/ReservationTimeService.kt
View File

@ -28,12 +28,9 @@ class ReservationTimeService(
@Transactional(readOnly = true)
fun findAllTimes(): ReservationTimesResponse {
val response = reservationTimeRepository.findAll()
.map { it.toResponse() }
fun findAllTimes(): ReservationTimesResponse = reservationTimeRepository.findAll()
.toResponses()
return ReservationTimesResponse(response)
}
@Transactional
fun addTime(reservationTimeRequest: ReservationTimeRequest): ReservationTimeResponse {

5
src/main/java/roomescape/reservation/web/ReservationTimeDTO.kt
View File

@ -1,6 +1,7 @@
package roomescape.reservation.web
import io.swagger.v3.oas.annotations.media.Schema
import roomescape.reservation.infrastructure.persistence.ReservationTimeEntity
import java.time.LocalTime
@Schema(name = "예약 시간 저장 요청", description = "예약 시간 저장 요청시 사용됩니다.")
@ -38,3 +39,7 @@ data class ReservationTimesResponse(
@field:Schema(description = "모든 시간 목록")
val times: List<ReservationTimeResponse>
)
fun List<ReservationTimeEntity>.toResponses(): ReservationTimesResponse = ReservationTimesResponse(
this.map { it.toResponse() }
)

155
src/test/java/roomescape/reservation/business/ReservationTimeServiceTest.kt
View File

@ -1,93 +1,92 @@
package roomescape.reservation.business;
package roomescape.reservation.business
import static org.assertj.core.api.Assertions.*;
import io.kotest.assertions.throwables.shouldThrow
import io.kotest.core.spec.style.FunSpec
import io.kotest.matchers.shouldBe
import io.mockk.every
import io.mockk.mockk
import org.springframework.data.repository.findByIdOrNull
import org.springframework.http.HttpStatus
import roomescape.common.exception.ErrorType
import roomescape.common.exception.RoomescapeException
import roomescape.reservation.infrastructure.persistence.ReservationRepository
import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository
import roomescape.reservation.web.ReservationTimeRequest
import roomescape.util.ReservationTimeFixture
import java.time.LocalTime
import java.time.LocalDateTime;
import java.time.LocalTime;
class ReservationTimeServiceTest : FunSpec({
val reservationTimeRepository: ReservationTimeRepository = mockk()
val reservationRepository: ReservationRepository = mockk()
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
val reservationTimeService = ReservationTimeService(
reservationTimeRepository = reservationTimeRepository,
reservationRepository = reservationRepository
)
import roomescape.common.exception.RoomescapeException;
import roomescape.member.infrastructure.persistence.MemberEntity;
import roomescape.member.infrastructure.persistence.MemberRepository;
import roomescape.member.infrastructure.persistence.Role;
import roomescape.reservation.infrastructure.persistence.ReservationEntity;
import roomescape.reservation.infrastructure.persistence.ReservationRepository;
import roomescape.reservation.infrastructure.persistence.ReservationStatus;
import roomescape.reservation.infrastructure.persistence.ReservationTimeEntity;
import roomescape.reservation.infrastructure.persistence.ReservationTimeRepository;
import roomescape.reservation.web.ReservationTimeRequest;
import roomescape.theme.infrastructure.persistence.ThemeEntity;
import roomescape.theme.infrastructure.persistence.ThemeRepository;
context("findTimeById") {
test("시간을 찾을 수 없으면 400 에러를 던진다.") {
val id = 1L
@SpringBootTest
@Import(ReservationTimeService.class)
@Sql(scripts = "/truncate.sql", executionPhase = ExecutionPhase.BEFORE_TEST_METHOD)
class ReservationTimeServiceTest {
// Mocking the behavior of reservationTimeRepository.findByIdOrNull
every { reservationTimeRepository.findByIdOrNull(id) } returns null
@Autowired
private ReservationTimeService reservationTimeService;
@Autowired
private ReservationTimeRepository reservationTimeRepository;
@Autowired
private ReservationRepository reservationRepository;
@Autowired
private ThemeRepository themeRepository;
@Autowired
private MemberRepository memberRepository;
@Test
@DisplayName("중복된 예약 시간을 등록하는 경우 예외가 발생한다.")
void duplicateTimeFail() {
// given
reservationTimeRepository.save(new ReservationTimeEntity(null, LocalTime.of(12, 30)));
// when & then
assertThatThrownBy(() -> reservationTimeService.addTime(new ReservationTimeRequest(LocalTime.of(12, 30))))
.isInstanceOf(RoomescapeException.class);
shouldThrow<RoomescapeException> {
reservationTimeService.findTimeById(id)
}.apply {
errorType shouldBe ErrorType.RESERVATION_TIME_NOT_FOUND
httpStatus shouldBe HttpStatus.BAD_REQUEST
}
}
}
@Test
@DisplayName("존재하지 않는 ID로 시간을 조회하면 예외가 발생한다.")
void findTimeByIdFail() {
// given
ReservationTimeEntity saved = reservationTimeRepository.save(
new ReservationTimeEntity(null, LocalTime.of(12, 30)));
context("addTime") {
test("중복된 시간이 있으면 409 에러를 던진다.") {
val request = ReservationTimeRequest(startAt = LocalTime.of(10, 0))
// when
assert saved.getId() != null;
long invalidTimeId = saved.getId() + 1;
// Mocking the behavior of reservationTimeRepository.findByStartAt
every { reservationTimeRepository.findByStartAt(request.startAt) } returns listOf(mockk())
// when & then
assertThatThrownBy(() -> reservationTimeService.findTimeById(invalidTimeId))
.isInstanceOf(RoomescapeException.class);
shouldThrow<RoomescapeException> {
reservationTimeService.addTime(request)
}.apply {
errorType shouldBe ErrorType.TIME_DUPLICATED
httpStatus shouldBe HttpStatus.CONFLICT
}
}
}
@Test
@DisplayName("삭제하려는 시간에 예약이 존재하면 예외를 발생한다.")
void usingTimeDeleteFail() {
// given
LocalDateTime localDateTime = LocalDateTime.now().plusDays(1L).withNano(0);
ReservationTimeEntity reservationTime = reservationTimeRepository.save(
new ReservationTimeEntity(null, localDateTime.toLocalTime()));
ThemeEntity theme = themeRepository.save(new ThemeEntity(null, "테마명", "설명", "썸네일URL"));
MemberEntity member = memberRepository.save(
new MemberEntity(null, "name", "email@email.com", "password", Role.MEMBER));
context("removeTimeById") {
test("시간을 찾을 수 없으면 400 에러를 던진다.") {
val id = 1L
// when
reservationRepository.save(
new ReservationEntity(null, localDateTime.toLocalDate(), reservationTime, theme, member,
ReservationStatus.CONFIRMED));
// Mocking the behavior of reservationTimeRepository.findByIdOrNull
every { reservationTimeRepository.findByIdOrNull(id) } returns null
// then
assert reservationTime.getId() != null;
assertThatThrownBy(() -> reservationTimeService.removeTimeById(reservationTime.getId()))
.isInstanceOf(RoomescapeException.class);
shouldThrow<RoomescapeException> {
reservationTimeService.removeTimeById(id)
}.apply {
errorType shouldBe ErrorType.RESERVATION_TIME_NOT_FOUND
httpStatus shouldBe HttpStatus.BAD_REQUEST
}
}
}
test("예약이 있는 시간이면 409 에러를 던진다.") {
val id = 1L
val reservationTime = ReservationTimeFixture.create()
// Mocking the behavior of reservationTimeRepository.findByIdOrNull
every { reservationTimeRepository.findByIdOrNull(id) } returns reservationTime
// Mocking the behavior of reservationRepository.findByReservationTime
every { reservationRepository.findByReservationTime(reservationTime) } returns listOf(mockk())
shouldThrow<RoomescapeException> {
reservationTimeService.removeTimeById(id)
}.apply {
errorType shouldBe ErrorType.TIME_IS_USED_CONFLICT
httpStatus shouldBe HttpStatus.CONFLICT
}
}
}
})