Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat : 예약과 회원 연관관계 매핑 #87

Merged
merged 17 commits into from
Jan 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
dbe4141
feat : 컨트롤러에 로그인 어노테이션 추가
dlswns2480 Jan 9, 2024
703982b
feat : 서비스에 예약과 회원 연관관계 매핑
dlswns2480 Jan 9, 2024
25633e3
feat : 서비스에 예약과 회원 연관관계 매핑 테스트
dlswns2480 Jan 9, 2024
2a391aa
feat : 예약 생성 시에 회원 받는 것으로 생성자 수정
dlswns2480 Jan 9, 2024
a400371
feat : 서비스 테스트
dlswns2480 Jan 9, 2024
3df4196
feat : BaseIntegration에 토큰 관련 필요의존성 추가
dlswns2480 Jan 9, 2024
237928b
feat : BaseIntegration에 토큰 관련 필요의존성 추가
dlswns2480 Jan 9, 2024
9823017
Merge branch 'dev' into feat/#64
dlswns2480 Jan 9, 2024
0141c58
feat : 예약가져오는 쿼리 조건 추가 -> 인자로 들어온 Member와 일치하는 예약 가져옴
dlswns2480 Jan 9, 2024
0ee8ac0
feat : 예약가져오는 쿼리 조건 추가에 대한 테스트
dlswns2480 Jan 9, 2024
0ece307
feat : 예약 조회 로직 수정, 회원에 대한 예약만을 가져오는 쿼리 활용
dlswns2480 Jan 9, 2024
f4c88a8
feat : 예약 조회 로직 수정에 대한 서비스 테스트
dlswns2480 Jan 9, 2024
3b28425
feat : 예약 조회 api 로그인 어노테이션 추가 및 테스트
dlswns2480 Jan 9, 2024
3a30484
feat : 예약 테스트용 데이터 추가
dlswns2480 Jan 9, 2024
f13b9b3
style : 코드 포맷
dlswns2480 Jan 9, 2024
051a593
feat : 컨트롤러 테스트 검증요소 추가
dlswns2480 Jan 9, 2024
06820f7
refactor : 회원 예약서비스 테스트 email 넣는 부분 상수로 추출
dlswns2480 Jan 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
refactor : 회원 예약서비스 테스트 email 넣는 부분 상수로 추출
dlswns2480 committed Jan 9, 2024
commit 06820f7a5b687c013555e2c4044e67282baabeb7
Original file line number Diff line number Diff line change
@@ -51,12 +51,13 @@ class MemberReservationServiceTest {
private ReservationTimeRepository reservationTimeRepository;
@InjectMocks
private MemberReservationService memberReservationService;
private final String email = "dlswns661035@gmail.com";

@Test
@DisplayName("예약시간의 선점 여부를 검증하고 선점권이 빈 것을 확인한다.")
void validateReservation() {
//given
Member member = MemberFixture.member("dlswns661035@gmail.com");
Member member = MemberFixture.member(email);
ReservationTime reservationTime = ReservationFixture.getReservationTimeNotPreOccupied();
ReflectionTestUtils.setField(reservationTime, "id", 1L);
CreateReservationRequest request = ReservationFixture.getCreateReservationRequestWithId(
@@ -84,7 +85,7 @@ void validateReservation() {
@DisplayName("예약시간 선점권이 이미 타인에게 있는 경우 예외가 발생한다.")
void alreadyPreOccupied() {
//given
Member member = MemberFixture.member("dlswns661035@gmail.com");
Member member = MemberFixture.member(email);
ReservationTime reservationTime = ReservationFixture.getReservationTimePreOccupied();
ReflectionTestUtils.setField(reservationTime, "id", 1L);
CreateReservationRequest request = ReservationFixture.getCreateReservationRequestWithId(
@@ -103,7 +104,7 @@ void alreadyPreOccupied() {
@Test
@DisplayName("최종예약을 등록할 때 예약시간이 비었으면 성공적으로 예약 등록을 완료한다.")
void registerReservation() {
Member member = MemberFixture.member("dlswns661035@gmail.com");
Member member = MemberFixture.member(email);
ReservationTime reservationTime = ReservationFixture.getReservationTimePreOccupied();
CreateReservationRequest request = ReservationFixture.getCreateReservationRequest();
Reservation reservation = Reservation.builder()
@@ -130,7 +131,7 @@ void registerReservation() {
@Test
@DisplayName("최종예약을 등록할 때 타인이 이미 예약한 경우 예외가 발생한다.")
void registerReservationAlreadyOccupied() {
Member member = MemberFixture.member("dlswns661035@gmail.com");
Member member = MemberFixture.member(email);
ReservationTime reservationTime = ReservationFixture.getReservationTimePreOccupied();
CreateReservationRequest request = ReservationFixture.getCreateReservationRequest();

@@ -145,7 +146,7 @@ void registerReservationAlreadyOccupied() {
@Test
@DisplayName("예약 전체 조회를 할 수 있다")
void getAllReservation() {
Member member = MemberFixture.member("dlswns661035@gmail.com");
Member member = MemberFixture.member(email);

ReservationTime reservationTime = ReservationFixture.getReservationTimeNotPreOccupied();
Reservation reservation = ReservationFixture.getReservation(reservationTime, member);
@@ -167,7 +168,7 @@ void getAllReservation() {
@Test
@DisplayName("예약 내역이 하나도 없을 시 조회되는 예약이 없다.")
void getAllReservationWithNoResult() {
Member member = MemberFixture.member("dlswns661035@gmail.com");
Member member = MemberFixture.member(email);
when(reservationRepository.findAllWithReservationTimeAndShopByMemberId(member)).thenReturn(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

email을 따로 상수로 빼도 좋을 것 같아요!

List.of());