Skip to content

Commit

Permalink
style : 코드 포맷
Browse files Browse the repository at this point in the history
  • Loading branch information
dlswns2480 committed Jan 9, 2024
1 parent 3a30484 commit f13b9b3
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
public class WebConfig implements WebMvcConfigurer {

@Override
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers){
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
resolvers.add(new LogInArgumentResolver());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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));
Expand All @@ -94,7 +96,8 @@ public CreateReservationResponse registerReservation(Member member, CreateReserv

@Transactional(readOnly = true)
public List<GetAllReservationResponse> getAllReservation(Member member) {
List<Reservation> reservations = reservationRepository.findAllWithReservationTimeAndShopByMemberId(member);
List<Reservation> reservations = reservationRepository.findAllWithReservationTimeAndShopByMemberId(
member);
return reservations.stream()
.map(ReservationMapper::toGetAllReservationRepsonse)
.toList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -51,7 +49,6 @@ class MemberReservationControllerTest extends BaseIntegrationTest {
private MemberRepository memberRepository;



@BeforeEach
void setUp() {
Shop shop = ShopData.getShop();
Expand All @@ -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
Expand Down Expand Up @@ -99,7 +96,7 @@ void schedulerTest() throws Exception {
reservationTime.getId());

mockMvc.perform(post("/reservations")
.headers(httpHeaders)
.headers(httpHeaders)
.contentType(APPLICATION_JSON)
.content(asJsonString(request)));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ void findAllWithReservationTimeAndShop() {
Reservation reservation = ReservationFixture.getReservation(savedReservationTime, member);
reservationRepository.save(reservation);

List<Reservation> reservations = reservationRepository.findAllWithReservationTimeAndShopByMemberId(savedMember);
List<Reservation> reservations = reservationRepository.findAllWithReservationTimeAndShopByMemberId(
savedMember);
Reservation findReservation = reservations.get(0);

assertAll(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -47,7 +46,6 @@ void setUp() {
Member member = MemberFixture.member("[email protected]");
memberRepository.save(member);


ReservationTime reservationTime = ReservationFixture.getReservationTimeNotPreOccupied();
reservationTime.insertShop(savedShop);
reservationTimeRepository.save(reservationTime);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down Expand Up @@ -147,7 +148,7 @@ void getAllReservation() {
Member member = MemberFixture.member("[email protected]");

ReservationTime reservationTime = ReservationFixture.getReservationTimeNotPreOccupied();
Reservation reservation = ReservationFixture.getReservation(reservationTime,member);
Reservation reservation = ReservationFixture.getReservation(reservationTime, member);

when(reservationRepository.findAllWithReservationTimeAndShopByMemberId(member)).thenReturn(
List.of(reservation));
Expand All @@ -167,7 +168,8 @@ void getAllReservation() {
@DisplayName("예약 내역이 하나도 없을 시 조회되는 예약이 없다.")
void getAllReservationWithNoResult() {
Member member = MemberFixture.member("[email protected]");
when(reservationRepository.findAllWithReservationTimeAndShopByMemberId(member)).thenReturn(List.of());
when(reservationRepository.findAllWithReservationTimeAndShopByMemberId(member)).thenReturn(
List.of());

List<GetAllReservationResponse> all = memberReservationService.getAllReservation(member);
assertThat(all).isEmpty();
Expand Down

0 comments on commit f13b9b3

Please sign in to comment.