[Fix/meal create] 식사 도메인 내 API 수정

src/main/java/everymeal/server/global/aop/log/LogAspect.java

@@ -0,0 +1,43 @@
+package everymeal.server.global.aop.log;
+
+
+import everymeal.server.global.exception.ApplicationException;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Aspect
+@Component
+public class LogAspect {
+
+    private LogTrace logTrace;
+
+    @Autowired
+    public LogAspect(LogTrace logTrace) {
+        this.logTrace = logTrace;
+    }
+
+    @Around(
+            "everymeal.server.global.aop.log.Pointcuts.allQuery() || everymeal.server.global.aop.log.Pointcuts.allService()")
+    public Object executingTimeLog(ProceedingJoinPoint joinPoint) throws Throwable {
+        TraceInfo traceInfo = null;
+        try {
+            traceInfo = logTrace.start(joinPoint.getSignature().toShortString());
+            Object result = joinPoint.proceed();
+            logTrace.end(traceInfo);
+            return result;
+        } catch (ApplicationException e) {
+            if (traceInfo != null) {
+                logTrace.apiException(e, traceInfo);
+            }
+            throw e;
+        } catch (Exception e) {
+            if (traceInfo != null) {
+                logTrace.exception(e, traceInfo);
+            }
+            throw e;
+        }
+    }
+}

src/main/java/everymeal/server/global/aop/log/LogTrace.java

@@ -0,0 +1,89 @@
+package everymeal.server.global.aop.log;
+
+
+import everymeal.server.global.exception.ApplicationException;
+import java.util.UUID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class LogTrace {
+
+    private ThreadLocal<String> threadId = ThreadLocal.withInitial(this::createThreadId);
+
+    public TraceInfo start(String method) {
+        syncTrace();
+        String id = threadId.get();
+        long startTime = System.currentTimeMillis();
+        logger().info("[" + id + "] " + method + " ==== start");
+        return new TraceInfo(id, method, startTime);
+    }
+
+    public void end(TraceInfo traceInfo) {
+        long endTime = System.currentTimeMillis();
+        long resultTime = endTime - traceInfo.startTime();
+        if (resultTime >= 1000)
+            logger().warn(
+                            "["
+                                    + traceInfo.theadId()
+                                    + "] "
+                                    + traceInfo.method()
+                                    + " ==== execute time = "
+                                    + resultTime
+                                    + "ms");
+        else
+            logger().info(
+                            "["
+                                    + traceInfo.theadId()
+                                    + "] "
+                                    + traceInfo.method()
+                                    + " ==== execute time = "
+                                    + resultTime
+                                    + "ms");
+        removeThreadLocal();
+    }
+
+    public void apiException(ApplicationException e, TraceInfo traceInfo) {
+        logger().error(
+                        "["
+                                + traceInfo.theadId()
+                                + "] "
+                                + traceInfo.method()
+                                + " ==== API EXCEPTION! ["
+                                + e.getErrorCode()
+                                + "] "
+                                + e.getMessage());
+        removeThreadLocal();
+    }
+
+    public void exception(Exception e, TraceInfo traceInfo) {
+        logger().error(
+                        "["
+                                + traceInfo.theadId()
+                                + "] "
+                                + traceInfo.method()
+                                + " ==== INTERNAL ERROR! "
+                                + e.getMessage());
+        removeThreadLocal();
+    }
+
+    private void syncTrace() {
+        String id = threadId.get();
+        if (id == null) {
+            threadId.set(createThreadId());
+        }
+    }
+
+    private String createThreadId() {
+        return UUID.randomUUID().toString().substring(0, 8);
+    }
+
+    private void removeThreadLocal() {
+        threadId.remove();
+    }
+
+    private Logger logger() {
+        return LoggerFactory.getLogger(LogTrace.class);
+    }
+}

src/main/java/everymeal/server/global/aop/log/Pointcuts.java

@@ -0,0 +1,17 @@
+package everymeal.server.global.aop.log;
+
+
+import org.aspectj.lang.annotation.Pointcut;
+
+public class Pointcuts {
+
+    @Pointcut("execution(* everymeal.server.meal.*.*(..))")
+    public void all() {}
+
+    @Pointcut("execution(* everymeal.server..*Service.*(..))")
+    public void allService() {}
+
+    @Pointcut(
+            "execution(* everymeal.server..*Repository.*(..)) || execution(* everymeal.server..*RepositoryImpl.*(..))")
+    public void allQuery() {}
+}

src/main/java/everymeal/server/global/aop/log/TraceInfo.java

@@ -0,0 +1,3 @@
+package everymeal.server.global.aop.log;
+
+public record TraceInfo(String theadId, String method, Long startTime) {}

src/main/java/everymeal/server/global/config/QueryDslConfig.java

@@ -1,6 +1,7 @@
 package everymeal.server.global.config;
 
 
+import com.querydsl.jpa.JPQLTemplates;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
@@ -14,6 +15,6 @@ public class QueryDslConfig {
 
     @Bean
     public JPAQueryFactory jpaQueryFactory(EntityManager em) {
-        return new JPAQueryFactory(em);
+        return new JPAQueryFactory(JPQLTemplates.DEFAULT, em);
     }
 }

src/main/java/everymeal/server/global/exception/ExceptionList.java

@@ -12,7 +12,7 @@ public enum ExceptionList {
     RESTAURANT_NOT_FOUND("M0002", HttpStatus.NOT_FOUND, "등록된 식당이 아닙니다."),
     UNIVERSITY_NOT_FOUND("M0003", HttpStatus.NOT_FOUND, "등록된 학교가 아닙니다."),
     INVALID_MEAL_OFFEREDAT_REQUEST(
-            "M0004", HttpStatus.BAD_REQUEST, "등록되어 있는 식단 데이터 보다 과거의 날짜로 등록할 수 없습니다."),
+            "M0004", HttpStatus.BAD_REQUEST, "동일한 데이터를 갖는 식단 데이터가 이미 존재합니다."),
     INVALID_REQUEST("R0001", HttpStatus.BAD_REQUEST, "Request의 Data Type이 올바르지 않습니다."),
 
     USER_NOT_FOUND("U0001", HttpStatus.NOT_FOUND, "등록된 유저가 아닙니다."),

src/main/java/everymeal/server/meal/controller/MealController.java

@@ -7,6 +7,7 @@
 import everymeal.server.meal.controller.dto.response.DayMealListGetRes;
 import everymeal.server.meal.controller.dto.response.RestaurantListGetRes;
 import everymeal.server.meal.controller.dto.response.WeekMealListGetRes;
+import everymeal.server.meal.controller.dto.response.WeekMealListGetResTest;
 import everymeal.server.meal.service.MealService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -101,13 +102,14 @@ public ApplicationResponse<List<DayMealListGetRes>> getDayMeal(
      */
     @GetMapping("/week")
     @Operation(summary = "주간 식단 조회")
-    public ApplicationResponse<List<WeekMealListGetRes>> getWeekMeal(
+    public ApplicationResponse<List<WeekMealListGetResTest>> getWeekMeal(
             @RequestParam @Schema(description = "학생식당 PK", defaultValue = "1") Long restaurantIdx,
             @RequestParam
                     @Schema(
                             description = "조회하고자 하는 시작 날짜 ( yyyy-MM-dd )",
                             defaultValue = "2023-10-01")
                     String offeredAt) {
-        return ApplicationResponse.ok(mealService.getWeekMealList(restaurantIdx, offeredAt));
+//        return ApplicationResponse.ok(mealService.getWeekMealList(restaurantIdx, offeredAt));
+        return ApplicationResponse.ok(mealService.getWeekMealListTest(restaurantIdx, offeredAt));
     }
 }

src/main/java/everymeal/server/meal/controller/dto/request/MealRegisterReq.java

@@ -2,17 +2,28 @@
 
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.time.LocalDate;
+import jakarta.validation.constraints.NotBlank;
+import java.time.Instant;
 
 public record MealRegisterReq(
         @Schema(
                         description = "메뉴를 ',' 구분자를 기준으로 묶어서 하나의 문자열로 보내주세요.",
                         defaultValue = "갈비탕, 깍두기, 흰쌀밥")
+                @NotBlank
                 String menu,
-        @Schema(description = "식사 분류 ( 조식 | 중식 | 석식 | 특식 ) ENUM으로 관리합니다.", defaultValue = "LUNCH")
+        @Schema(
+                        description = "식사 분류 ( BREAKFAST | LUNCH | DINNER ) ENUM으로 관리합니다.",
+                        defaultValue = "LUNCH")
+                @NotBlank
                 String mealType,
-        @Schema(description = "식사 운영 상태 ( 운영 | 미운영 | 단축운영 )", defaultValue = "OPEN")
+        @Schema(description = "식사 운영 상태 ( OPEN | CLOSED | SHORT_OPEN )", defaultValue = "OPEN")
                 String mealStatus,
-        @Schema(description = "식사 제공 날짜 ( yyyy-MM-dd ) ", defaultValue = "2023-10-01")
-                LocalDate offeredAt,
-        @Schema(description = "가격을 Double 형태로 관리합니다.", defaultValue = "10000.0") Double price) {}
+        @Schema(description = "식사 제공 날짜 ( yyyy-MM-dd ) ", defaultValue = "2023-10-01") @NotBlank
+                Instant offeredAt,
+        @Schema(description = "가격을 Double 형태로 관리합니다.", defaultValue = "0.0") Double price,
+        @Schema(
+                        description =
+                                "음식의 카테고리 ( DEFAULT | KOREAN | JAPANESE | CHINESE | SNACKBAR | WESTERN ) 중 단일 메뉴라면 DEFAULT를 입력해주세요.",
+                        defaultValue = "DEFAULT")
+                @NotBlank
+                String category) {}

src/main/java/everymeal/server/meal/controller/dto/response/DayMealListGetRes.java

@@ -3,38 +3,45 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import everymeal.server.meal.entity.Meal;
-import everymeal.server.meal.entity.MealStatus;
-import everymeal.server.meal.entity.MealType;
-import java.time.LocalDate;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.List;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+@NoArgsConstructor
+@AllArgsConstructor
 @Getter
 @Setter
 @Builder
 public class DayMealListGetRes {
 
     private String menu;
-    private MealType mealType;
-    private MealStatus mealStatus;
+    private String mealType;
+    private String mealStatus;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
-    private LocalDate offeredAt;
+    private Instant offeredAt;
 
     private Double price;
+    private String category;
+    private String restaurantName;
 
     public static List<DayMealListGetRes> of(List<Meal> mealList) {
         return mealList.stream()
                 .map(
                         meal ->
                                 DayMealListGetRes.builder()
                                         .menu(meal.getMenu())
-                                        .mealType(meal.getMealType())
-                                        .mealStatus(meal.getMealStatus())
-                                        .offeredAt(meal.getOfferedAt())
+                                        .mealType(meal.getMealType().getValue())
+                                        .mealStatus(meal.getMealStatus().getValue())
+                                        .offeredAt(meal.getOfferedAt().truncatedTo(ChronoUnit.DAYS))
                                         .price(meal.getPrice())
+                                        .category(meal.getCategory().name())
+                                        .restaurantName(meal.getRestaurant().getName())
                                         .build())
                 .toList();
     }

src/main/java/everymeal/server/meal/controller/dto/response/DayMealListGetResTest.java

@@ -0,0 +1,33 @@
+package everymeal.server.meal.controller.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import everymeal.server.meal.entity.MealCategory;
+import everymeal.server.meal.entity.MealStatus;
+import everymeal.server.meal.entity.MealType;
+import java.time.Instant;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
+@Builder
+public class DayMealListGetResTest {
+
+    private String menu;
+    private MealType mealType;
+    private MealStatus mealStatus;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
+    private Instant offeredAt;
+
+    private Double price;
+    private MealCategory category;
+    private String restaurantName;
+
+
+}

src/main/java/everymeal/server/meal/controller/dto/response/WeekMealListGetRes.java

@@ -2,9 +2,7 @@
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Comparator;
+import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -17,26 +15,26 @@
 @Builder
 public class WeekMealListGetRes {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
-    private LocalDate offeredAt;
+    private Instant offeredAt;
 
     private List<DayMealListGetRes> dayMealListGetResList;
 
     public static List<WeekMealListGetRes> of(List<DayMealListGetRes> mealListGetRes) {
         // offeredAt을 기준으로 DayMealList 그룹핑
-        Map<LocalDate, List<DayMealListGetRes>> groupedData =
+        Map<Instant, List<DayMealListGetRes>> groupedData =
                 mealListGetRes.stream()
                         .collect(Collectors.groupingBy(DayMealListGetRes::getOfferedAt));
-        List<WeekMealListGetRes> weekMealList = new ArrayList<>();
-        for (Map.Entry<LocalDate, List<DayMealListGetRes>> entry : groupedData.entrySet()) {
-            WeekMealListGetRes weekMeal =
-                    WeekMealListGetRes.builder()
-                            .offeredAt(entry.getKey())
-                            .dayMealListGetResList(entry.getValue())
-                            .build();
-            weekMealList.add(weekMeal);
-        }
-        // offeredAt을 기준으로 오름차순 정렬
-        weekMealList.sort(Comparator.comparing(WeekMealListGetRes::getOfferedAt));
+        List<WeekMealListGetRes> weekMealList =
+                groupedData.entrySet().stream()
+                        .sorted(Map.Entry.comparingByKey())
+                        .map(
+                                entry ->
+                                        WeekMealListGetRes.builder()
+                                                .offeredAt(entry.getKey())
+                                                .dayMealListGetResList(entry.getValue())
+                                                .build())
+                        .collect(Collectors.toList());
+
         return weekMealList;
     }
 }