From 91fe935fee7d4b93cc91c7896bab4eea2fea779c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EC=9E=AC=EC=9B=90?= Date: Tue, 15 Oct 2024 14:38:08 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=201km=20=EC=9D=B4=EC=83=81=EC=9D=B8=20?= =?UTF-8?q?=EA=B1=B0=EB=A6=AC=EC=97=90=20=EB=8C=80=ED=95=B4=20=ED=98=84?= =?UTF-8?q?=EC=9E=AC=20=EB=8B=AC=EC=84=B1=ED=95=9C=20=EA=B1=B0=EB=A6=AC?= =?UTF-8?q?=EB=A5=BC=20km=20=EB=8B=A8=EC=9C=84=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20(#266)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v1/scale/dto/ScaleCoursesResponse.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dnd/runus/presentation/v1/scale/dto/ScaleCoursesResponse.java b/src/main/java/com/dnd/runus/presentation/v1/scale/dto/ScaleCoursesResponse.java index 4e6d314c..1174b43f 100644 --- a/src/main/java/com/dnd/runus/presentation/v1/scale/dto/ScaleCoursesResponse.java +++ b/src/main/java/com/dnd/runus/presentation/v1/scale/dto/ScaleCoursesResponse.java @@ -1,13 +1,13 @@ package com.dnd.runus.presentation.v1.scale.dto; -import static com.dnd.runus.global.constant.MetricsConversionFactor.METERS_IN_A_KILOMETER; - import io.swagger.v3.oas.annotations.media.Schema; import java.text.DecimalFormat; import java.time.LocalDate; import java.util.List; +import static com.dnd.runus.global.constant.MetricsConversionFactor.METERS_IN_A_KILOMETER; + public record ScaleCoursesResponse( Info info, List achievedCourses, @@ -53,7 +53,7 @@ public record CurrentCourse( String name, @Schema(description = "현재 코스 총 거리", example = "200km") String totalDistance, - @Schema(description = "현재 달성한 거리, 현재 50m 달성", example = "50m") + @Schema(description = "현재 달성한 거리, 현재 32.3km 달성", example = "32.3km") String achievedDistance, @Schema(description = "현재 코스 설명 메시지", example = "대전까지 100km 남았어요!") String message @@ -64,7 +64,14 @@ public CurrentCourse( int achievedMeter, String message ) { - this(name, KILO_METER_FORMATTER.format(totalMeter / METERS_IN_A_KILOMETER), achievedMeter + "m", message); + this(name, KILO_METER_FORMATTER.format(totalMeter / METERS_IN_A_KILOMETER), formatAchievedDistance(achievedMeter), message); + } + + private static String formatAchievedDistance(int achievedMeter) { + if (achievedMeter < METERS_IN_A_KILOMETER) { + return achievedMeter + "m"; + } + return KILO_METER_FORMATTER.format(achievedMeter / METERS_IN_A_KILOMETER); } } }