Merge pull request #30 from UMC-HKT-Team-R/fix/27

[Fix] 캘린더 등록하기 다 param 으로 변수 바꾸기
UMC-HKT-Team-R · Jan 11, 2025 · cd471be · cd471be
2 parents c78cc25 + 714ccc9
commit cd471be
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/converter/CalendarConverter.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/converter/CalendarConverter.java
@@ -9,17 +9,20 @@
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDateTime;
+
 @Component
 @RequiredArgsConstructor
 public class CalendarConverter {
     public Calendar toCalendar(Member member,
-                               RegisterRequestDTO request,
+                               LocalDateTime date,
+                               String detailFood,
                                String imageUrl,
                                Category category,
                                Color color) {
         return Calendar.builder()
-                .date(request.getDate())
-                .detailFood(request.getDetailFood())
+                .date(date)
+                .detailFood(detailFood)
                 .color(color)
                 .category(category)
                 .imageUrl(imageUrl)

diff --git a/...r/src/main/java/com/example/Midnight/Snacker/service/CalendarService/CalendarService.java b/...r/src/main/java/com/example/Midnight/Snacker/service/CalendarService/CalendarService.java
@@ -14,7 +14,8 @@
 import java.util.List;
 
 public interface CalendarService {
-    Long addRecord(Member member, Category category, Color color, MultipartFile image, RegisterRequestDTO request);
+    //Long addRecord(Member member, Category category, Color color, MultipartFile image, RegisterRequestDTO request);
+    Long addRecord(Member member, Category category, Color color, MultipartFile image, LocalDateTime date, String detailFood);
     List<CalendarInfoDTO> getCalendarInfo(LocalDate localDate);
     CalendarResponseDTO getRecord(LocalDate date, Member member);
     void deleteRecord(Member member, Long calendarId);

diff --git a/...c/main/java/com/example/Midnight/Snacker/service/CalendarService/CalendarServiceImpl.java b/...c/main/java/com/example/Midnight/Snacker/service/CalendarService/CalendarServiceImpl.java
@@ -34,14 +34,13 @@ public class CalendarServiceImpl implements CalendarService {
     //야식 기록 추가 method
     @Override
     @Transactional
-    public Long addRecord(Member member, Category category, Color color, MultipartFile image, RegisterRequestDTO request){
+    public Long addRecord(Member member, Category category, Color color, MultipartFile image, LocalDateTime date, String detailFood){
         //upload file 하기
         String imageUrl = s3ImageService.upload(image);
        //Calendar 엔티티 생성
 
-        Calendar calendar =
-                calendarConverter.toCalendar(member,request, imageUrl, category, color);
-
+        //Calendar calendar = calendarConverter.toCalendar(member,request, imageUrl, category, color);
+        Calendar calendar = calendarConverter.toCalendar(member, date, detailFood, imageUrl, category, color);
 
         Calendar savedCalendar = calendarRepository.save(calendar);
 

diff --git a/...Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/CalendarController.java b/...Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/CalendarController.java
@@ -32,10 +32,16 @@ public ApiResponse<Long> registerCalendar(
             @Parameter(name = "user", hidden = true) @AuthUser Member member,
             @RequestParam(value = "category")Category category,
             @RequestParam(value = "colorType")Color color,
-            @RequestPart("request")RegisterRequestDTO request,
+            @RequestParam(value = "date") LocalDateTime date,
+            @RequestParam(value = "detailFood") String detailFood,
+            //@RequestPart("request")RegisterRequestDTO request,
+            //@RequestPart(value = "date") LocalDateTime date,
+            //@RequestPart(value = "detailFood") String detailFood,
             @RequestPart(value = "image") MultipartFile image){
+        //Long calendarId = calendarService.addRecord(member, category, color, image, request);
+
         Long calendarId = calendarService.addRecord(member, category,
-                color, image, request);
+                color, image, date, detailFood);
 
         return ApiResponse.of(SuccessStatus.ADD_CALENDAR_OK, calendarId);
     }