refactor: ReservationControllerTest에서 repository 의존성 제거 (woowacourse-…

…teams#266) * refactor: GuestReservationControllerTest에서 repository 의존성 제거 * refactor: ManagerReservationControllerTest에서 repository 의존성 제거 * refactor: acceptanceTest에 있던 request fixture로 이동 * refactor: 매직넘버 제거 * refactor: 문서 이름 Camel Case로 통일 * refactor: 테스트 픽스쳐의 예약비밀번호 통일 * refactor: CommonFixture 매직넘버 정리 * refactor: 코드포매팅 * chore: 코드 리포맷팅 Co-authored-by: sakjung <[email protected]>
2yunseong · Aug 1, 2021 · 4679f0f · 4679f0f
1 parent 55fd8fa
commit 4679f0f
Show file tree

Hide file tree

Showing 16 changed files with 437 additions and 313 deletions.
diff --git a/backend/src/docs/asciidoc/reservation.adoc b/backend/src/docs/asciidoc/reservation.adoc
@@ -29,15 +29,15 @@ include::{snippets}/reservation/guest/get/http-response.adoc[]
 === 전체 예약 조회
 ==== 공간 관리자
 ===== Request
-include::{snippets}/reservation/manager/get_all/http-request.adoc[]
+include::{snippets}/reservation/manager/getAll/http-request.adoc[]
 ===== Response
-include::{snippets}/reservation/manager/get_all/http-response.adoc[]
+include::{snippets}/reservation/manager/getAll/http-response.adoc[]
 
 ==== 예약자
 ===== Request
-include::{snippets}/reservation/guest/get_all/http-request.adoc[]
+include::{snippets}/reservation/guest/getAll/http-request.adoc[]
 ===== Response
-include::{snippets}/reservation/guest/get_all/http-response.adoc[]
+include::{snippets}/reservation/guest/getAll/http-response.adoc[]
 
 === 예약 삭제
 ==== 공간 관리자
@@ -55,15 +55,15 @@ include::{snippets}/reservation/guest/delete/http-response.adoc[]
 === 예약 비밀번호 확인
 ==== 공간 관리자
 ===== Request
-include::{snippets}/reservation/manager/get_one/http-request.adoc[]
+include::{snippets}/reservation/manager/getForUpdate/http-request.adoc[]
 ===== Response
-include::{snippets}/reservation/manager/get_one/http-response.adoc[]
+include::{snippets}/reservation/manager/getForUpdate/http-response.adoc[]
 
 ==== 예약자
 ===== Request
-include::{snippets}/reservation/guest/post_for_update/http-request.adoc[]
+include::{snippets}/reservation/guest/postForUpdate/http-request.adoc[]
 ===== Response
-include::{snippets}/reservation/guest/post_for_update/http-response.adoc[]
+include::{snippets}/reservation/guest/postForUpdate/http-response.adoc[]
 
 === 예약 수정
 ==== 공간 관리자

diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/WebConfig.java b/backend/src/main/java/com/woowacourse/zzimkkong/WebConfig.java
@@ -1,7 +1,6 @@
 package com.woowacourse.zzimkkong;
 
 import org.apache.http.HttpHeaders;
-import org.apache.http.client.methods.HttpHead;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/domain/Reservation.java b/backend/src/main/java/com/woowacourse/zzimkkong/domain/Reservation.java
@@ -68,6 +68,7 @@ private boolean equals(final LocalDateTime startDateTime, final LocalDateTime en
         return startDateTime.isEqual(startTime) && endDateTime.isEqual(endTime);
     }
 
+    // TODO: reservation 객체 주입받기
     public void update(final ReservationCreateUpdateRequest reservationCreateUpdateRequest, final Space space) {
         this.startTime = reservationCreateUpdateRequest.getStartDateTime();
         this.endTime = reservationCreateUpdateRequest.getEndDateTime();

diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/dto/reservation/CoordinateResponse.java b/backend/src/main/java/com/woowacourse/zzimkkong/dto/reservation/CoordinateResponse.java
@@ -18,6 +18,11 @@ private CoordinateResponse(final int x, final int y) {
     }
 
     public static CoordinateResponse from(String coordinate) {
+        // todo 컬럼 삭제할 때 삭제하기
+        if (coordinate == null) {
+            return null;
+        }
+
         List<Integer> coordinateSet = Arrays.stream(coordinate.split(", "))
                 .map(Integer::parseInt)
                 .collect(Collectors.toList());

diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/dto/reservation/ReservationResponse.java b/backend/src/main/java/com/woowacourse/zzimkkong/dto/reservation/ReservationResponse.java
@@ -45,4 +45,24 @@ public static ReservationResponse from(final Reservation reservation) {
                 reservation.getDescription()
         );
     }
+
+    public Long getId() {
+        return id;
+    }
+
+    public LocalDateTime getStartDateTime() {
+        return startDateTime;
+    }
+
+    public LocalDateTime getEndDateTime() {
+        return endDateTime;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
 }
diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/infrastructure/BatikConverter.java b/backend/src/main/java/com/woowacourse/zzimkkong/infrastructure/BatikConverter.java
@@ -16,7 +16,7 @@ public class BatikConverter implements SvgConverter {
 
     public BatikConverter(
             @Value("${converter.temp.location}")
-            String saveDirectoryPath) {
+                    String saveDirectoryPath) {
         this.saveDirectoryPath = saveDirectoryPath;
     }
 

diff --git a/backend/src/test/java/com/woowacourse/zzimkkong/CommonFixture.java b/backend/src/test/java/com/woowacourse/zzimkkong/CommonFixture.java
@@ -1,6 +1,10 @@
 package com.woowacourse.zzimkkong;
 
 import com.woowacourse.zzimkkong.domain.*;
+import com.woowacourse.zzimkkong.dto.map.MapCreateUpdateRequest;
+import com.woowacourse.zzimkkong.dto.member.MemberSaveRequest;
+import com.woowacourse.zzimkkong.dto.space.SettingsRequest;
+import com.woowacourse.zzimkkong.dto.space.SpaceCreateUpdateRequest;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -49,6 +53,7 @@ public class CommonFixture {
             .setting(BE_SETTING)
             .mapImage(MAP_IMAGE_URL)
             .build();
+
     public static Setting FE_SETTING = new Setting.Builder()
             .availableStartTime(LocalTime.of(0, 0))
             .availableEndTime(LocalTime.of(18, 0))
@@ -69,6 +74,7 @@ public class CommonFixture {
             .setting(FE_SETTING)
             .mapImage(MAP_IMAGE_URL)
             .build();
+
     public static Reservation BE_AM_ZERO_ONE = new Reservation.Builder()
             .startTime(TOMORROW_START_TIME)
             .endTime(TOMORROW_START_TIME.plusHours(1))
@@ -104,4 +110,46 @@ public class CommonFixture {
             .password(RESERVATION_PASSWORD)
             .space(FE1)
             .build();
+
+    public static final MapCreateUpdateRequest mapCreateRequest = new MapCreateUpdateRequest(LUTHER.getName(), LUTHER.getMapDrawing(), MAP_SVG);
+    public static final MemberSaveRequest memberSaveRequest = new MemberSaveRequest(EMAIL, PASSWORD, ORGANIZATION);
+    public static final SettingsRequest beSettingsRequest = new SettingsRequest(
+            LocalTime.of(0, 0),
+            LocalTime.of(23, 59),
+            BE_SETTING.getReservationTimeUnit(),
+            BE_SETTING.getReservationMinimumTimeUnit(),
+            BE_SETTING.getReservationMaximumTimeUnit(),
+            BE_SETTING.getReservationEnable(),
+            BE_SETTING.getDisabledWeekdays()
+    );
+
+    public static final SpaceCreateUpdateRequest beSpaceCreateUpdateRequest = new SpaceCreateUpdateRequest(
+            "백엔드 강의실",
+            "시니컬하네",
+            SPACE_DRAWING,
+            beSettingsRequest,
+            MAP_SVG
+    );
+
+    public static final SettingsRequest feSettingsRequest = new SettingsRequest(
+            LocalTime.of(0, 0),
+            LocalTime.of(23, 59),
+            FE_SETTING.getReservationTimeUnit(),
+            FE_SETTING.getReservationMinimumTimeUnit(),
+            FE_SETTING.getReservationMaximumTimeUnit(),
+            FE_SETTING.getReservationEnable(),
+            FE_SETTING.getDisabledWeekdays()
+    );
+
+    public static final SpaceCreateUpdateRequest feSpaceCreateUpdateRequest = new SpaceCreateUpdateRequest(
+            "프론트엔드 강의실1",
+            "시니컬하네",
+            SPACE_DRAWING,
+            feSettingsRequest,
+            MAP_SVG
+    );
+
+    public static final String SALLY_PASSWORD = "1230";
+    public static final String SALLY_NAME = "샐리";
+    public static final String SALLY_DESCRIPTION = "집 가고 싶은 회의";
 }
diff --git a/backend/src/test/java/com/woowacourse/zzimkkong/controller/AcceptanceTest.java b/backend/src/test/java/com/woowacourse/zzimkkong/controller/AcceptanceTest.java
@@ -1,7 +1,5 @@
 package com.woowacourse.zzimkkong.controller;
 
-import com.woowacourse.zzimkkong.dto.map.MapCreateUpdateRequest;
-import com.woowacourse.zzimkkong.dto.member.MemberSaveRequest;
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.specification.RequestSpecification;
@@ -16,7 +14,6 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import static com.woowacourse.zzimkkong.CommonFixture.*;
 import static com.woowacourse.zzimkkong.DocumentUtils.setRequestSpecification;
 import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
 
@@ -26,11 +23,6 @@
 @AutoConfigureRestDocs
 @ActiveProfiles("test")
 public class AcceptanceTest {
-    protected final MapCreateUpdateRequest mapCreateRequest = new MapCreateUpdateRequest(LUTHER.getName(), LUTHER.getMapDrawing(), MAP_SVG);
-    protected final MemberSaveRequest memberSaveRequest = new MemberSaveRequest(EMAIL, PASSWORD, ORGANIZATION);
-    protected final String SALLY_PASSWORD = "1230";
-    protected final String SALLY_NAME = "샐리";
-    protected final String SALLY_DESCRIPTION = "집 가고 싶은 회의";
 
     @LocalServerPort
     int port;

diff --git a/backend/src/test/java/com/woowacourse/zzimkkong/controller/AuthControllerTest.java b/backend/src/test/java/com/woowacourse/zzimkkong/controller/AuthControllerTest.java
@@ -63,6 +63,7 @@ void invalidToken() {
         assertThat(response.statusCode()).isEqualTo(HttpStatus.UNAUTHORIZED.value());
     }
 
+    // TODO: token 필드로 가지고 메서드당 한번만 받도록 리팩토링
     static String getToken() {
         LoginRequest loginRequest = new LoginRequest(EMAIL, PASSWORD);
         ExtractableResponse<Response> loginResponse = login(loginRequest);