diff --git a/src/main/java/com/prgrms/catchtable/common/login/WebConfig.java b/src/main/java/com/prgrms/catchtable/common/login/WebConfig.java index 58418bc5..f5dbb6e1 100644 --- a/src/main/java/com/prgrms/catchtable/common/login/WebConfig.java +++ b/src/main/java/com/prgrms/catchtable/common/login/WebConfig.java @@ -9,7 +9,7 @@ public class WebConfig implements WebMvcConfigurer { @Override - public void addArgumentResolvers(List resolvers){ + public void addArgumentResolvers(List resolvers) { resolvers.add(new LogInArgumentResolver()); } diff --git a/src/main/java/com/prgrms/catchtable/reservation/service/MemberReservationService.java b/src/main/java/com/prgrms/catchtable/reservation/service/MemberReservationService.java index 6307cfa7..ee07abdc 100644 --- a/src/main/java/com/prgrms/catchtable/reservation/service/MemberReservationService.java +++ b/src/main/java/com/prgrms/catchtable/reservation/service/MemberReservationService.java @@ -42,7 +42,8 @@ public class MemberReservationService { private final ReservationLockRepository reservationLockRepository; @Transactional - public CreateReservationResponse preOccupyReservation(Member member, CreateReservationRequest request) { + public CreateReservationResponse preOccupyReservation(Member member, + CreateReservationRequest request) { Long reservationTimeId = request.reservationTimeId(); while (FALSE.equals(reservationLockRepository.lock(reservationTimeId))) { try { @@ -73,7 +74,8 @@ public CreateReservationResponse preOccupyReservation(Member member, CreateReser } @Transactional - public CreateReservationResponse registerReservation(Member member, CreateReservationRequest request) { + public CreateReservationResponse registerReservation(Member member, + CreateReservationRequest request) { ReservationTime reservationTime = reservationTimeRepository.findByIdWithShop( request.reservationTimeId()). orElseThrow(() -> new NotFoundCustomException(NOT_EXIST_TIME)); @@ -94,7 +96,8 @@ public CreateReservationResponse registerReservation(Member member, CreateReserv @Transactional(readOnly = true) public List getAllReservation(Member member) { - List reservations = reservationRepository.findAllWithReservationTimeAndShopByMemberId(member); + List reservations = reservationRepository.findAllWithReservationTimeAndShopByMemberId( + member); return reservations.stream() .map(ReservationMapper::toGetAllReservationRepsonse) .toList(); diff --git a/src/test/java/com/prgrms/catchtable/common/base/BaseIntegrationTest.java b/src/test/java/com/prgrms/catchtable/common/base/BaseIntegrationTest.java index cbf75673..3841e406 100644 --- a/src/test/java/com/prgrms/catchtable/common/base/BaseIntegrationTest.java +++ b/src/test/java/com/prgrms/catchtable/common/base/BaseIntegrationTest.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.prgrms.catchtable.jwt.provider.JwtTokenProvider; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpHeaders; diff --git a/src/test/java/com/prgrms/catchtable/owner/service/OwnerServiceTest.java b/src/test/java/com/prgrms/catchtable/owner/service/OwnerServiceTest.java index ebb385c1..0758a08b 100644 --- a/src/test/java/com/prgrms/catchtable/owner/service/OwnerServiceTest.java +++ b/src/test/java/com/prgrms/catchtable/owner/service/OwnerServiceTest.java @@ -79,7 +79,8 @@ void loginSuccess() { //given LoginOwnerRequest loginOwnerRequest = OwnerFixture.getLoginOwnerRequest(email, password); String encodePassword = passwordEncoder.encode(password); - Token token = new Token("AccessToken", "RefreshToken", loginOwnerRequest.email(), Role.OWNER); + Token token = new Token("AccessToken", "RefreshToken", loginOwnerRequest.email(), + Role.OWNER); //when when(ownerRepository.findOwnerByEmail(loginOwnerRequest.email())).thenReturn( diff --git a/src/test/java/com/prgrms/catchtable/reservation/controller/MemberReservationControllerTest.java b/src/test/java/com/prgrms/catchtable/reservation/controller/MemberReservationControllerTest.java index cf4733e6..f9d1ec98 100644 --- a/src/test/java/com/prgrms/catchtable/reservation/controller/MemberReservationControllerTest.java +++ b/src/test/java/com/prgrms/catchtable/reservation/controller/MemberReservationControllerTest.java @@ -1,19 +1,17 @@ package com.prgrms.catchtable.reservation.controller; -import static com.prgrms.catchtable.common.Role.*; +import static com.prgrms.catchtable.common.Role.MEMBER; import static com.prgrms.catchtable.common.exception.ErrorCode.ALREADY_OCCUPIED_RESERVATION_TIME; import static com.prgrms.catchtable.reservation.domain.ReservationStatus.CANCELLED; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.http.MediaType.APPLICATION_JSON; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.head; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import com.prgrms.catchtable.common.Role; import com.prgrms.catchtable.common.base.BaseIntegrationTest; import com.prgrms.catchtable.common.data.shop.ShopData; import com.prgrms.catchtable.jwt.token.Token; @@ -51,7 +49,6 @@ class MemberReservationControllerTest extends BaseIntegrationTest { private MemberRepository memberRepository; - @BeforeEach void setUp() { Shop shop = ShopData.getShop(); @@ -66,7 +63,7 @@ void setUp() { Token token = jwtTokenProvider.createToken(savedMember.getEmail(), MEMBER); httpHeaders.add("AccessToken", token.getAccessToken()); - httpHeaders.add("RefreshToken",token.getRefreshToken()); + httpHeaders.add("RefreshToken", token.getRefreshToken()); } @Test @@ -99,7 +96,7 @@ void schedulerTest() throws Exception { reservationTime.getId()); mockMvc.perform(post("/reservations") - .headers(httpHeaders) + .headers(httpHeaders) .contentType(APPLICATION_JSON) .content(asJsonString(request))); diff --git a/src/test/java/com/prgrms/catchtable/reservation/repository/ReservationRepositoryTest.java b/src/test/java/com/prgrms/catchtable/reservation/repository/ReservationRepositoryTest.java index 4b1a8a1b..317502c3 100644 --- a/src/test/java/com/prgrms/catchtable/reservation/repository/ReservationRepositoryTest.java +++ b/src/test/java/com/prgrms/catchtable/reservation/repository/ReservationRepositoryTest.java @@ -49,7 +49,8 @@ void findAllWithReservationTimeAndShop() { Reservation reservation = ReservationFixture.getReservation(savedReservationTime, member); reservationRepository.save(reservation); - List reservations = reservationRepository.findAllWithReservationTimeAndShopByMemberId(savedMember); + List reservations = reservationRepository.findAllWithReservationTimeAndShopByMemberId( + savedMember); Reservation findReservation = reservations.get(0); assertAll( diff --git a/src/test/java/com/prgrms/catchtable/reservation/service/MemberReservationServiceIntegrationTest.java b/src/test/java/com/prgrms/catchtable/reservation/service/MemberReservationServiceIntegrationTest.java index 79437015..c42eb129 100644 --- a/src/test/java/com/prgrms/catchtable/reservation/service/MemberReservationServiceIntegrationTest.java +++ b/src/test/java/com/prgrms/catchtable/reservation/service/MemberReservationServiceIntegrationTest.java @@ -19,7 +19,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -47,7 +46,6 @@ void setUp() { Member member = MemberFixture.member("dlswns661035@gmail.com"); memberRepository.save(member); - ReservationTime reservationTime = ReservationFixture.getReservationTimeNotPreOccupied(); reservationTime.insertShop(savedShop); reservationTimeRepository.save(reservationTime); diff --git a/src/test/java/com/prgrms/catchtable/reservation/service/MemberReservationServiceTest.java b/src/test/java/com/prgrms/catchtable/reservation/service/MemberReservationServiceTest.java index 95367806..5d837e4e 100644 --- a/src/test/java/com/prgrms/catchtable/reservation/service/MemberReservationServiceTest.java +++ b/src/test/java/com/prgrms/catchtable/reservation/service/MemberReservationServiceTest.java @@ -117,7 +117,8 @@ void registerReservation() { Optional.of(reservationTime)); when(reservationRepository.save(any(Reservation.class))).thenReturn(reservation); - CreateReservationResponse response = memberReservationService.registerReservation(member, request); + CreateReservationResponse response = memberReservationService.registerReservation(member, + request); assertAll( () -> assertThat(response.date()).isEqualTo(reservationTime.getTime()), @@ -147,7 +148,7 @@ void getAllReservation() { Member member = MemberFixture.member("dlswns661035@gmail.com"); ReservationTime reservationTime = ReservationFixture.getReservationTimeNotPreOccupied(); - Reservation reservation = ReservationFixture.getReservation(reservationTime,member); + Reservation reservation = ReservationFixture.getReservation(reservationTime, member); when(reservationRepository.findAllWithReservationTimeAndShopByMemberId(member)).thenReturn( List.of(reservation)); @@ -167,7 +168,8 @@ void getAllReservation() { @DisplayName("예약 내역이 하나도 없을 시 조회되는 예약이 없다.") void getAllReservationWithNoResult() { Member member = MemberFixture.member("dlswns661035@gmail.com"); - when(reservationRepository.findAllWithReservationTimeAndShopByMemberId(member)).thenReturn(List.of()); + when(reservationRepository.findAllWithReservationTimeAndShopByMemberId(member)).thenReturn( + List.of()); List all = memberReservationService.getAllReservation(member); assertThat(all).isEmpty();