[#14] Feat, Test: converting kind of meal to its type

Author: 김산

build.gradle

@@ -25,8 +25,8 @@ dependencies {
 
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.junit.platform:junit-platform-launcher:1.5.0'
-	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.0'
-	testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.5.0'
+	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
+	testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
 
 }
 

src/main/java/com/example/helper/constant/SpecMealInputsKor.java

@@ -28,4 +28,12 @@ public String getInputs() {
         return input;
     }
     public Integer getInputValue() { return inputValue; }
+
+    public static Integer getTypeByString(String str){
+        for(SpecMealInputsKor each : values())
+            if (each.getInputs().equals(str)) {
+                return each.getInputValue();
+            }
+        return null;
+    }
 }

src/main/java/com/example/helper/constant/Types.java

@@ -10,13 +10,13 @@ public enum Types {
     KIND_LUNCH(1),
     KIND_DINNER(2),
     KIND_LUNCH_CORNER(3),
-    DATE_MON(0),
-    DATE_TUE(1),
-    DATE_WED(2),
-    DATE_THR(3),
-    DATE_FRI(4),
-    DATE_SAT(5),
-    DATE_SUN(6);
+    DATE_MON(1),
+    DATE_TUE(2),
+    DATE_WED(3),
+    DATE_THR(4),
+    DATE_FRI(5),
+    DATE_SAT(6),
+    DATE_SUN(7);
 
     private Integer type;
 

src/main/java/com/example/helper/service/MealService.java

@@ -72,6 +72,7 @@ else if(19 <= hour && hour < 24) {
 
         Optional<Meal> result = sqlMealRepository.findByDate(Types.BLDG2_1ST.getType(), langType, kindType, date);
 
+        // TODO: 함수로 분리
         if(result.isEmpty()) {
             //throw new IllegalStateException(Messages.EXIST_MEAL_ERROR.getMessages());
             if(langType == 0) {
@@ -86,10 +87,11 @@ else if(19 <= hour && hour < 24) {
     }
 
     private Boolean specInputValidation(String dateCustom, String bld) {
-        // len = 0 or null or ...
-        Boolean ret = true;
-
-        return ret;
+        // input arguments : null, empty, " "
+        if (dateCustom == null || bld == null || dateCustom.isBlank() || bld.isBlank()) {
+            return false;
+        }
+        return true;
     }
 
     public String getNowKorMeal() {
@@ -105,8 +107,19 @@ public String getSpecKorMeal(String dateCustom, String bld) {
             return Messages.NO_MEAL_KOR.getMessages();
         }
 
+        LocalDateTime currentDateTime = LocalDateTime.now(ZoneId.of("Asia/Seoul"));
+
         if(dateCustom.equals(SpecMealInputsKor.TODAY.getInputs())) {
             // 오늘
+            String date = currentDateTime.getYear() + "-";
+            date += String.format("%02d", currentDateTime.getMonth().getValue()) + "-";
+            date += String.format("%02d", currentDateTime.getDayOfMonth()) + "";
+
+            Optional<Meal> result = sqlMealRepository.findByDate(
+                    Types.BLDG2_1ST.getType(),
+                    Types.LANG_KOR.getType(),
+                    SpecMealInputsKor.getTypeByString(bld),
+                    date);
         }
         else if(dateCustom.equals(SpecMealInputsKor.TOMORROW.getInputs())) {
             // 내일

src/test/java/com/example/helper/constant/SpecMealInputsKorTest.java

@@ -0,0 +1,30 @@
+package com.example.helper.constant;
+
+import static com.example.helper.constant.SpecMealInputsKor.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.stream.Stream;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class SpecMealInputsKorTest {
+
+    @ParameterizedTest
+    @MethodSource("provideStringsForIsTypes")
+    void enum_한국어식단_타입변환(String kind, Integer expected) {
+        // given
+        // when
+        Integer result = getTypeByString(kind);
+        // then
+        assertEquals(expected, result);
+    }
+
+    private static Stream<Arguments> provideStringsForIsTypes() {
+        return Stream.of(
+                Arguments.of(BREAKFAST.getInputs(), BREAKFAST.getInputValue()),
+                Arguments.of(LUNCH.getInputs(), LUNCH.getInputValue()),
+                Arguments.of(DINNER.getInputs(), DINNER.getInputValue())
+        );
+    }
+}