Merge pull request #15 from GNU-connect/fix-diet

[Fix] 식단 출력 함수 리팩토링

Author: JangDongHo

src/main/java/com/example/Jinus/repository/cafeteria/CafeteriaRepository.java

@@ -10,7 +10,12 @@
 
 @Repository
 public interface CafeteriaRepository extends JpaRepository<CafeteriaEntity, Integer> {
-    @Query("SELECT c.cafeteriaNameKo, c.thumbnailUrl FROM CafeteriaEntity c WHERE c.campusId = :campusId")
+    @Query(
+            "SELECT c.cafeteriaNameKo, c.thumbnailUrl " +
+            "FROM CafeteriaEntity c " +
+            "WHERE c.campusId = :campusId " +
+            "ORDER BY c.cafeteriaNameKo ASC"
+    )
     List<Object[]> findCafeteriaListByCampusId(int campusId);
 
     @Query(

src/main/java/com/example/Jinus/repository/v2/cafeteria/CafeteriaRepositoryV2.java

@@ -11,7 +11,12 @@
 
 public interface CafeteriaRepositoryV2 extends JpaRepository<CafeteriaEntity, Integer> {
     // 사용자 campusId와 동일한 식당이름과 url 찾기
-    @Query("SELECT c.cafeteriaNameKo, c.thumbnailUrl FROM CafeteriaEntity c WHERE c.campusId = :campusId")
+    @Query(
+            "SELECT c.cafeteriaNameKo, c.thumbnailUrl " +
+            "FROM CafeteriaEntity c " +
+            "WHERE c.campusId = :campusId " +
+            "ORDER BY c.cafeteriaNameKo ASC"
+    )
     List<Object[]> findCafeteriaListByCampusId(@Param("campusId")int campusId);
 
     // campusId와 식당이름으로 cafeteriaId 찾기

src/main/java/com/example/Jinus/service/v2/cafeteria/DietServiceV2.java

@@ -7,6 +7,7 @@
 import com.example.Jinus.repository.v2.cafeteria.CampusRepositoryV2;
 import com.example.Jinus.repository.v2.cafeteria.DietRepositoryV2;
 import com.example.Jinus.repository.v2.userInfo.UserRepositoryV2;
+import com.example.Jinus.utility.DateUtils;
 import com.example.Jinus.utility.JsonUtils;
 import com.example.Jinus.utility.SimpleTextResponse;
 import lombok.RequiredArgsConstructor;
@@ -70,7 +71,7 @@ public String makeResponse(HandleRequestDto parameters) {
                 StringBuilder diets = processDietList(dietList);
                 return makeContents(parameters, cafeteriaId, diets);
             } else { // 메뉴 존재하지 않는 경우
-                StringBuilder diets = new StringBuilder("\n\n").append("메뉴가 존재하지 않습니다.");
+                StringBuilder diets = new StringBuilder("\n메뉴가 존재하지 않습니다.");
                 return makeContents(parameters, cafeteriaId, diets);
             }
         } else { // 식당 존재하지 않는 경우
@@ -150,9 +151,11 @@ private String makeContents(HandleRequestDto parameters, int cafeteriaId, String
 
         // 식단 날짜
         Date dietDate = getCurrentDate(parameters.getDay());
+        String day = DateUtils.getDayOfWeekInKorean(dietDate);
+
         // 메뉴 연결
-        StringBuilder description = new StringBuilder(String.valueOf(dietDate)).append(" ")
-                .append(parameters.getPeriod()).append(diets);
+        StringBuilder description = new StringBuilder(String.valueOf(dietDate)).append("(").append(day).append(") ")
+                .append(parameters.getPeriod()).append("\n").append(diets);
 
         return mappingResponse(parameters, imgUrl, title.toString(), description.toString());
     }

src/main/java/com/example/Jinus/utility/DateUtils.java

@@ -0,0 +1,31 @@
+package com.example.Jinus.utility;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.Map;
+
+public class DateUtils {
+    // 주어진 날짜 문자열에 대해 요일을 한글로 반환하는 메서드
+    public static String getDayOfWeekInKorean(Date date) {
+        java.util.Date utilDate = new java.util.Date(date.getTime());
+        LocalDate localDate = utilDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        // 요일 가져오기
+        DayOfWeek dayOfWeek = localDate.getDayOfWeek();
+
+        // 요일을 한글로 변환하는 매핑 (월, 화, 수, ...)
+        Map<DayOfWeek, String> koreanDays = Map.of(
+                DayOfWeek.MONDAY, "월",
+                DayOfWeek.TUESDAY, "화",
+                DayOfWeek.WEDNESDAY, "수",
+                DayOfWeek.THURSDAY, "목",
+                DayOfWeek.FRIDAY, "금",
+                DayOfWeek.SATURDAY, "토",
+                DayOfWeek.SUNDAY, "일"
+        );
+
+        // 변환된 요일 반환
+        return koreanDays.get(dayOfWeek);
+    }
+}