From 123cde8f5553ad9e12deb5eef64add1fe7b0e0fe Mon Sep 17 00:00:00 2001 From: Youngho Date: Tue, 30 Apr 2024 00:02:04 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EB=8F=84=EB=B3=B4=20=EC=98=88?= =?UTF-8?q?=EC=83=81=20=EC=8B=9C=EA=B0=84=20=EB=B6=84=20=EB=8B=A8=EC=9C=84?= =?UTF-8?q?=20=EB=B0=98=ED=99=98=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/domain/parking/Parking.java | 3 ++- .../common/domain/parking/ParkingTest.java | 17 +++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/domain/src/main/java/com/parkingcomestrue/common/domain/parking/Parking.java b/domain/src/main/java/com/parkingcomestrue/common/domain/parking/Parking.java index 0f135a38..5bd934bd 100644 --- a/domain/src/main/java/com/parkingcomestrue/common/domain/parking/Parking.java +++ b/domain/src/main/java/com/parkingcomestrue/common/domain/parking/Parking.java @@ -106,7 +106,8 @@ public boolean containsPayType(List memberPayTypes) { public int calculateWalkingTime(Location destination) { double distance = calculateDistanceToDestination(destination); double averageWalkingTime = distance / AVERAGE_WALKING_SPEED; - return (int) Math.ceil(averageWalkingTime); + System.out.println(averageWalkingTime); + return (int) Math.ceil(averageWalkingTime * 60); } private double calculateDistanceToDestination(Location destination) { diff --git a/domain/src/test/java/com/parkingcomestrue/common/domain/parking/ParkingTest.java b/domain/src/test/java/com/parkingcomestrue/common/domain/parking/ParkingTest.java index 4e86762d..59064bba 100644 --- a/domain/src/test/java/com/parkingcomestrue/common/domain/parking/ParkingTest.java +++ b/domain/src/test/java/com/parkingcomestrue/common/domain/parking/ParkingTest.java @@ -1,14 +1,5 @@ package com.parkingcomestrue.common.domain.parking; -import com.parkingcomestrue.common.domain.parking.BaseInformation; -import com.parkingcomestrue.common.domain.parking.Fee; -import com.parkingcomestrue.common.domain.parking.FeePolicy; -import com.parkingcomestrue.common.domain.parking.FreeOperatingTime; -import com.parkingcomestrue.common.domain.parking.Location; -import com.parkingcomestrue.common.domain.parking.OperatingTime; -import com.parkingcomestrue.common.domain.parking.Parking; -import com.parkingcomestrue.common.domain.parking.Space; -import com.parkingcomestrue.common.domain.parking.TimeUnit; import java.util.stream.Stream; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; @@ -21,7 +12,8 @@ class ParkingTest { @Test void 목적지와_68미터_떨어진_주차장_도보_예상시간_계산() { // given (parking 과 destination 거리 68m) - int expectedTime = (int) Math.ceil(0.068 / 5); + // 0.068 / 5 * 60 + int expectedTime = 1; Parking parking = Parking.builder() .location(Location.of(127.1215865, 37.4811181)) .build(); @@ -36,8 +28,9 @@ class ParkingTest { @Test void 목적지와_333미터_떨어진_주차장_도보_예상시간_계산() { - // given (parking 과 destination 거리 68m) - int expectedTime = (int) Math.ceil(0.333 / 5); + // given (parking 과 destination 거리 333m) + // 0.333 / 5 * 60 + int expectedTime = 5; Parking parking = Parking.builder() .location(Location.of(127.1215865, 37.4811181)) .build(); From d1d7ebe448dc90debf2d4df212e56fd2eb1e71b0 Mon Sep 17 00:00:00 2001 From: youngh0 Date: Tue, 4 Jun 2024 16:46:24 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EB=AC=B8=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/parkingcomestrue/common/domain/parking/Parking.java | 1 - 1 file changed, 1 deletion(-) diff --git a/domain/src/main/java/com/parkingcomestrue/common/domain/parking/Parking.java b/domain/src/main/java/com/parkingcomestrue/common/domain/parking/Parking.java index 5bd934bd..124e2188 100644 --- a/domain/src/main/java/com/parkingcomestrue/common/domain/parking/Parking.java +++ b/domain/src/main/java/com/parkingcomestrue/common/domain/parking/Parking.java @@ -106,7 +106,6 @@ public boolean containsPayType(List memberPayTypes) { public int calculateWalkingTime(Location destination) { double distance = calculateDistanceToDestination(destination); double averageWalkingTime = distance / AVERAGE_WALKING_SPEED; - System.out.println(averageWalkingTime); return (int) Math.ceil(averageWalkingTime * 60); }