From 6c8595657386be0cd5efb79e88acfcdce4d10f3a Mon Sep 17 00:00:00 2001 From: Sojeong0430 Date: Sun, 12 Jan 2025 07:08:04 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=A8=C2=A0Feat:=20=ED=95=9C=EB=8B=AC?= =?UTF-8?q?=20=EB=8F=99=EC=95=88=EC=9D=98=20=EC=95=BC=EC=8B=9D=20=EA=B2=B0?= =?UTF-8?q?=EC=82=B0=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../apiPayload/code/status/SuccessStatus.java | 1 + ...rConverter.java => CalenderConverter.java} | 18 +++-- .../Midnight/Snacker/domain/Calendar.java | 4 +- .../enums/{Category.java => CategoryE.java} | 2 +- .../repository/CalendarRepository.java | 3 + .../CalendarService/CalendarService.java | 6 +- .../CalendarService/CalendarServiceImpl.java | 14 ++-- .../RecommendServiceImpl.java | 4 +- .../CalenderCountService.java | 13 ++++ .../CalenderCountServiceImpl.java | 65 +++++++++++++++++++ .../web/controller/CalendarController.java | 31 +++++++-- .../web/dto/CalendarDTO/CalendarInfoDTO.java | 5 +- .../calenderCountRequestDTO.java | 4 ++ .../calenderCountResponseDTO.java | 26 ++++++++ .../recommendDTO/RecommendResponseDTO.java | 4 +- 16 files changed, 168 insertions(+), 34 deletions(-) rename Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/converter/{CalendarConverter.java => CalenderConverter.java} (58%) rename Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/enums/{Category.java => CategoryE.java} (84%) create mode 100644 Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/calenderCountService/CalenderCountService.java create mode 100644 Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/calenderCountService/CalenderCountServiceImpl.java create mode 100644 Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/calenderCountDTO/calenderCountRequestDTO.java create mode 100644 Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/calenderCountDTO/calenderCountResponseDTO.java diff --git a/.idea/misc.xml b/.idea/misc.xml index e84ca07..fbe46a4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/apiPayload/code/status/SuccessStatus.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/apiPayload/code/status/SuccessStatus.java index 9747627..fd9e5a5 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/apiPayload/code/status/SuccessStatus.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/apiPayload/code/status/SuccessStatus.java @@ -23,6 +23,7 @@ public enum SuccessStatus implements BaseCode { //캘린더 ADD_CALENDAR_OK(HttpStatus.OK, "COMMON200", "달력에 기록이 되었습니다."), INQUERY_MONTH_CALENDAR_OK(HttpStatus.OK, "COMMON200", "달력을 불러왔습니다."), + MONTH_CATEGORY_COUNT_OK(HttpStatus.OK, "COMMON200", "한달 동안의 야식 카테고리 결산입니다."), //기록 INQUERY_DATE_CALENDAR_OK(HttpStatus.OK,"COMMON200", "기록을 불러왔습니다."), 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/CalenderConverter.java similarity index 58% rename from Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/converter/CalendarConverter.java rename to Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/converter/CalenderConverter.java index 3050639..69e99f6 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/converter/CalendarConverter.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/converter/CalenderConverter.java @@ -2,31 +2,37 @@ import com.example.Midnight.Snacker.domain.Calendar; import com.example.Midnight.Snacker.domain.Member; -import com.example.Midnight.Snacker.domain.enums.Category; +import com.example.Midnight.Snacker.domain.enums.CategoryE; import com.example.Midnight.Snacker.domain.enums.Color; -import com.example.Midnight.Snacker.web.dto.CalendarDTO.RegisterRequestDTO; +import com.example.Midnight.Snacker.web.dto.calenderCountDTO.calenderCountResponseDTO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import org.springframework.web.multipart.MultipartFile; import java.time.LocalDateTime; +import java.util.List; @Component @RequiredArgsConstructor -public class CalendarConverter { +public class CalenderConverter { public Calendar toCalendar(Member member, LocalDateTime date, String detailFood, String imageUrl, - Category category, + CategoryE categoryE, Color color) { return Calendar.builder() .date(date) .detailFood(detailFood) .color(color) - .category(category) + .categoryE(categoryE) .imageUrl(imageUrl) .member(member) .build(); } + + public calenderCountResponseDTO.MissionPreviewListDTO toCCList (List countPreviewDTOList){ + return calenderCountResponseDTO.MissionPreviewListDTO.builder() + .monthCountPreviewDTOList(countPreviewDTOList) + .build(); + } } diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/Calendar.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/Calendar.java index 06913db..27e7cdd 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/Calendar.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/Calendar.java @@ -1,7 +1,7 @@ package com.example.Midnight.Snacker.domain; import com.example.Midnight.Snacker.domain.common.BaseEntity; -import com.example.Midnight.Snacker.domain.enums.Category; +import com.example.Midnight.Snacker.domain.enums.CategoryE; import com.example.Midnight.Snacker.domain.enums.Color; import jakarta.persistence.*; import lombok.*; @@ -35,7 +35,7 @@ public class Calendar extends BaseEntity { @Enumerated(EnumType.STRING) @Column(nullable = false) - private Category category; + private CategoryE categoryE; @Column(nullable = false) private String detailFood; //상세 음식 diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/enums/Category.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/enums/CategoryE.java similarity index 84% rename from Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/enums/Category.java rename to Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/enums/CategoryE.java index b7828ae..54245a1 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/enums/Category.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/domain/enums/CategoryE.java @@ -1,5 +1,5 @@ package com.example.Midnight.Snacker.domain.enums; -public enum Category { +public enum CategoryE { 한식, 중식, 일식, 양식, 아시안, 패스트푸드, 카페, 고기 } diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/repository/CalendarRepository.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/repository/CalendarRepository.java index dfb6126..d69e88d 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/repository/CalendarRepository.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/repository/CalendarRepository.java @@ -1,9 +1,11 @@ package com.example.Midnight.Snacker.repository; import com.example.Midnight.Snacker.domain.Calendar; +import com.example.Midnight.Snacker.domain.Member; import com.example.Midnight.Snacker.web.dto.CalendarDTO.CalendarInfoDTO; import org.springframework.data.jpa.repository.JpaRepository; +import java.awt.print.Pageable; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; @@ -11,4 +13,5 @@ public interface CalendarRepository extends JpaRepository { List findAllByDateBetweenOrderByDateAsc(LocalDateTime startDate, LocalDateTime endDate); + List findAllByMember(Member member); } diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/CalendarService/CalendarService.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/CalendarService/CalendarService.java index 359c584..8999286 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/CalendarService/CalendarService.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/CalendarService/CalendarService.java @@ -1,12 +1,10 @@ package com.example.Midnight.Snacker.service.CalendarService; -import com.example.Midnight.Snacker.converter.CalendarConverter; import com.example.Midnight.Snacker.domain.Member; -import com.example.Midnight.Snacker.domain.enums.Category; +import com.example.Midnight.Snacker.domain.enums.CategoryE; import com.example.Midnight.Snacker.domain.enums.Color; import com.example.Midnight.Snacker.web.dto.CalendarDTO.CalendarInfoDTO; import com.example.Midnight.Snacker.web.dto.CalendarDTO.CalendarResponseDTO; -import com.example.Midnight.Snacker.web.dto.CalendarDTO.RegisterRequestDTO; import org.springframework.web.multipart.MultipartFile; import java.time.LocalDate; @@ -15,7 +13,7 @@ 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, LocalDateTime date, String detailFood); + Long addRecord(Member member, CategoryE categoryE, Color color, MultipartFile image, LocalDateTime date, String detailFood); List getCalendarInfo(LocalDate localDate); CalendarResponseDTO getRecord(LocalDate date, Member member); void deleteRecord(Member member, Long calendarId); diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/CalendarService/CalendarServiceImpl.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/CalendarService/CalendarServiceImpl.java index a30c635..d92acd4 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/CalendarService/CalendarServiceImpl.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/CalendarService/CalendarServiceImpl.java @@ -2,19 +2,17 @@ import com.example.Midnight.Snacker.apiPayload.code.status.ErrorStatus; import com.example.Midnight.Snacker.apiPayload.exception.CustomException; -import com.example.Midnight.Snacker.converter.CalendarConverter; +import com.example.Midnight.Snacker.converter.CalenderConverter; import com.example.Midnight.Snacker.domain.Calendar; import com.example.Midnight.Snacker.domain.Member; -import com.example.Midnight.Snacker.domain.enums.Category; +import com.example.Midnight.Snacker.domain.enums.CategoryE; import com.example.Midnight.Snacker.domain.enums.Color; import com.example.Midnight.Snacker.repository.CalendarRepository; import com.example.Midnight.Snacker.repository.MemberRepository; import com.example.Midnight.Snacker.service.S3Service.S3ImageService; import com.example.Midnight.Snacker.web.dto.CalendarDTO.CalendarInfoDTO; import com.example.Midnight.Snacker.web.dto.CalendarDTO.CalendarResponseDTO; -import com.example.Midnight.Snacker.web.dto.CalendarDTO.RegisterRequestDTO; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -28,19 +26,19 @@ public class CalendarServiceImpl implements CalendarService { private final CalendarRepository calendarRepository; private final S3ImageService s3ImageService; - private final CalendarConverter calendarConverter; + private final CalenderConverter calenderConverter; private final MemberRepository memberRepository; //야식 기록 추가 method @Override @Transactional - public Long addRecord(Member member, Category category, Color color, MultipartFile image, LocalDateTime date, String detailFood){ + public Long addRecord(Member member, CategoryE categoryE, 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, date, detailFood, imageUrl, category, color); + Calendar calendar = calenderConverter.toCalendar(member, date, detailFood, imageUrl, categoryE, color); Calendar savedCalendar = calendarRepository.save(calendar); @@ -72,7 +70,7 @@ public List getCalendarInfo(LocalDate localDate){ return calendars.stream() .map(calendar -> new CalendarInfoDTO( calendar.getId(), - calendar.getCategory(), + calendar.getCategoryE(), calendar.getColor(), calendar.getDetailFood(), calendar.getImageUrl() diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/RecommendService/RecommendServiceImpl.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/RecommendService/RecommendServiceImpl.java index fb50a7d..be578be 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/RecommendService/RecommendServiceImpl.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/RecommendService/RecommendServiceImpl.java @@ -1,6 +1,6 @@ package com.example.Midnight.Snacker.service.RecommendService; -import com.example.Midnight.Snacker.domain.enums.Category; +import com.example.Midnight.Snacker.domain.enums.CategoryE; import com.example.Midnight.Snacker.domain.enums.Color; import com.example.Midnight.Snacker.web.dto.recommendDTO.RecommendResponseDTO; import com.fasterxml.jackson.databind.ObjectMapper; @@ -104,7 +104,7 @@ private RecommendResponseDTO.RecommendationResultDTO parseResponse(String respon RecommendResponseDTO.RecommendationDTO dto = RecommendResponseDTO.RecommendationDTO.builder() .type(convertToColor(type)) .menu(menu) - .category(Category.valueOf(category)) + .categoryE(CategoryE.valueOf(category)) .description(descriptions) .build(); diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/calenderCountService/CalenderCountService.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/calenderCountService/CalenderCountService.java new file mode 100644 index 0000000..7349898 --- /dev/null +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/calenderCountService/CalenderCountService.java @@ -0,0 +1,13 @@ +package com.example.Midnight.Snacker.service.calenderCountService; + +import com.example.Midnight.Snacker.domain.Calendar; +import com.example.Midnight.Snacker.domain.Member; +import com.example.Midnight.Snacker.web.dto.calenderCountDTO.calenderCountResponseDTO; + +import java.util.List; + +public interface CalenderCountService { + public List getCalenderList(Member member); + public List getMonthCountPreviewDTOList(); + public void categoryCount(List countPreviewDTOList,List member30CalenderList); +} diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/calenderCountService/CalenderCountServiceImpl.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/calenderCountService/CalenderCountServiceImpl.java new file mode 100644 index 0000000..e0d0bb4 --- /dev/null +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/service/calenderCountService/CalenderCountServiceImpl.java @@ -0,0 +1,65 @@ +package com.example.Midnight.Snacker.service.calenderCountService; + +import com.example.Midnight.Snacker.domain.Calendar; +import com.example.Midnight.Snacker.domain.Category; +import com.example.Midnight.Snacker.domain.Member; +import com.example.Midnight.Snacker.domain.enums.CategoryE; +import com.example.Midnight.Snacker.repository.CalendarRepository; +import com.example.Midnight.Snacker.web.dto.calenderCountDTO.calenderCountResponseDTO; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +@Service +@AllArgsConstructor +public class CalenderCountServiceImpl implements CalenderCountService { + + private final CalendarRepository calendarRepository; + + @Override + public List getCalenderList (Member member){ + List CalList = calendarRepository.findAllByMember(member); + + // 오늘 날짜 + LocalDateTime thirtyDaysAgo = LocalDateTime.now().minusDays(30); + + // 30일 이내 데이터 필터링 + List filteredList = CalList.stream() + .filter(calendar -> calendar.getCreatedAt().isAfter(thirtyDaysAgo)) // 생성일이 30일 이전인 데이터 제외 + .collect(Collectors.toList()); + + return filteredList; + } + + @Override + public List getMonthCountPreviewDTOList() { + List countList = new ArrayList<>(); + + List menuList = Arrays.asList(CategoryE.한식, CategoryE.중식, CategoryE.일식, CategoryE.양식, CategoryE.아시안, CategoryE.패스트푸드, CategoryE.카페, CategoryE.고기); + for (int i = 0; i < menuList.size(); i++) { + calenderCountResponseDTO.monthCountPreviewDTO cm = new calenderCountResponseDTO.monthCountPreviewDTO(); + cm.setCategory(menuList.get(i)); + cm.setCount(0); + countList.add(cm); + } + return countList; + } + + @Override + public void categoryCount(List countPreviewDTOList,List member30CalenderList ){ + member30CalenderList.stream() + .forEach(calendar -> { + CategoryE category = calendar.getCategoryE(); + + countPreviewDTOList.stream() + .filter(cm -> cm.getCategory().equals(category)) + .forEach(cm -> cm.setCount(cm.getCount() + 1)); + }); + } + +} diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/CalendarController.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/CalendarController.java index 67b9325..009b4df 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/CalendarController.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/CalendarController.java @@ -2,13 +2,16 @@ import com.example.Midnight.Snacker.apiPayload.ApiResponse; import com.example.Midnight.Snacker.apiPayload.code.status.SuccessStatus; +import com.example.Midnight.Snacker.converter.CalenderConverter; +import com.example.Midnight.Snacker.domain.Calendar; import com.example.Midnight.Snacker.domain.Member; -import com.example.Midnight.Snacker.domain.enums.Category; +import com.example.Midnight.Snacker.domain.enums.CategoryE; import com.example.Midnight.Snacker.domain.enums.Color; import com.example.Midnight.Snacker.security.handler.annotation.AuthUser; import com.example.Midnight.Snacker.service.CalendarService.CalendarService; +import com.example.Midnight.Snacker.service.calenderCountService.CalenderCountService; import com.example.Midnight.Snacker.web.dto.CalendarDTO.CalendarResponseDTO; -import com.example.Midnight.Snacker.web.dto.CalendarDTO.RegisterRequestDTO; +import com.example.Midnight.Snacker.web.dto.calenderCountDTO.calenderCountResponseDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import lombok.*; @@ -16,21 +19,23 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.awt.*; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/api/calendar") public class CalendarController { private final CalendarService calendarService; + private final CalenderCountService calenderCountService; + private final CalenderConverter calenderConverter; @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @Operation(summary = "캘린더 등록") public ApiResponse registerCalendar( @Parameter(name = "user", hidden = true) @AuthUser Member member, - @RequestParam(value = "category")Category category, + @RequestParam(value = "categoryE") CategoryE categoryE, @RequestParam(value = "colorType")Color color, @RequestParam(value = "date") LocalDateTime date, @RequestParam(value = "detailFood") String detailFood, @@ -40,7 +45,7 @@ public ApiResponse registerCalendar( @RequestPart(value = "image") MultipartFile image){ //Long calendarId = calendarService.addRecord(member, category, color, image, request); - Long calendarId = calendarService.addRecord(member, category, + Long calendarId = calendarService.addRecord(member, categoryE, color, image, date, detailFood); return ApiResponse.of(SuccessStatus.ADD_CALENDAR_OK, calendarId); @@ -65,4 +70,20 @@ public ApiResponse deleteCalendar( calendarService.deleteRecord(member, calendarId); return ApiResponse.of(SuccessStatus.DELETE_RECORD_OK,null); } + + + @GetMapping("/api/calender/count") + @Operation(summary = "한달 동안의 야식 카테고리 결산") + public ApiResponse monthCategoryCount( + @Parameter(name = "user", hidden = true) @AuthUser Member member) + { + List ll = calenderCountService.getCalenderList(member); + List kk = calenderCountService.getMonthCountPreviewDTOList(); + calenderCountService.categoryCount(kk,ll); + + calenderCountResponseDTO.MissionPreviewListDTO result = calenderConverter.toCCList(kk); + + return ApiResponse.of(SuccessStatus.MONTH_CATEGORY_COUNT_OK,result); + } + } diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/CalendarDTO/CalendarInfoDTO.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/CalendarDTO/CalendarInfoDTO.java index b48f1de..d28882b 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/CalendarDTO/CalendarInfoDTO.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/CalendarDTO/CalendarInfoDTO.java @@ -1,10 +1,9 @@ package com.example.Midnight.Snacker.web.dto.CalendarDTO; -import com.example.Midnight.Snacker.domain.enums.Category; +import com.example.Midnight.Snacker.domain.enums.CategoryE; import com.example.Midnight.Snacker.domain.enums.Color; import lombok.AllArgsConstructor; import lombok.Getter; -import lombok.NoArgsConstructor; import lombok.Setter; @Getter @@ -12,7 +11,7 @@ @Setter public class CalendarInfoDTO { private final Long calendarId; - private final Category category; + private final CategoryE categoryE; private final Color color; private final String detailFood; private final String imageUrl; diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/calenderCountDTO/calenderCountRequestDTO.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/calenderCountDTO/calenderCountRequestDTO.java new file mode 100644 index 0000000..2d4e20e --- /dev/null +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/calenderCountDTO/calenderCountRequestDTO.java @@ -0,0 +1,4 @@ +package com.example.Midnight.Snacker.web.dto.calenderCountDTO; + +public class calenderCountRequestDTO { +} diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/calenderCountDTO/calenderCountResponseDTO.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/calenderCountDTO/calenderCountResponseDTO.java new file mode 100644 index 0000000..3ca318c --- /dev/null +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/calenderCountDTO/calenderCountResponseDTO.java @@ -0,0 +1,26 @@ +package com.example.Midnight.Snacker.web.dto.calenderCountDTO; + +import com.example.Midnight.Snacker.domain.enums.CategoryE; +import lombok.*; + +import java.util.List; + +public class calenderCountResponseDTO { + + @Getter + @Setter + @NoArgsConstructor + @AllArgsConstructor + public static class monthCountPreviewDTO { + private CategoryE category; + private Integer count; + } + + @Getter + @NoArgsConstructor + @AllArgsConstructor + @Builder + public static class MissionPreviewListDTO { + private List monthCountPreviewDTOList; + } +} diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/recommendDTO/RecommendResponseDTO.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/recommendDTO/RecommendResponseDTO.java index 1133cc5..7df7fbc 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/recommendDTO/RecommendResponseDTO.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/dto/recommendDTO/RecommendResponseDTO.java @@ -1,6 +1,6 @@ package com.example.Midnight.Snacker.web.dto.recommendDTO; -import com.example.Midnight.Snacker.domain.enums.Category; +import com.example.Midnight.Snacker.domain.enums.CategoryE; import com.example.Midnight.Snacker.domain.enums.Color; import lombok.AllArgsConstructor; import lombok.Builder; @@ -18,7 +18,7 @@ public class RecommendResponseDTO { public static class RecommendationDTO { private Color type; private String menu; - private Category category; + private CategoryE categoryE; private List description; } From 7c7c6ef9728901feb8ed44e90bcddf920f7783aa Mon Sep 17 00:00:00 2001 From: Sojeong0430 Date: Sun, 12 Jan 2025 07:20:14 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Chore:=20Swagger=20?= =?UTF-8?q?=EC=84=A4=EB=AA=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Midnight/Snacker/web/controller/CalendarController.java | 5 +++-- .../Midnight/Snacker/web/controller/PostController.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/CalendarController.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/CalendarController.java index 0659e4f..fa49327 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/CalendarController.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/CalendarController.java @@ -49,7 +49,8 @@ public ApiResponse registerCalendar( } @GetMapping - @Operation + @Operation( + summary = "모든 기록 조회 API") public ApiResponse showCalendar( @Parameter(name = "user", hidden = true) @AuthUser Member member, @RequestParam(value = "date") LocalDate date){ @@ -60,7 +61,7 @@ public ApiResponse showCalendar( } @DeleteMapping("/{calendarId}") - @Operation + @Operation(summary = "기록 삭제") public ApiResponse deleteCalendar( @Parameter(name = "user", hidden = true) @AuthUser Member member, @PathVariable("calendarId") Long calendarId){ diff --git a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/PostController.java b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/PostController.java index 48b1726..65c20f0 100644 --- a/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/PostController.java +++ b/Midnight-Snacker/src/main/java/com/example/Midnight/Snacker/web/controller/PostController.java @@ -56,9 +56,10 @@ public ApiResponse DeletePost(@PathVariable(name = "postId") long postId){ } @GetMapping("/api/post/all") - @Operation + @Operation( + summary = "모든 게시분 조회 API") public ApiResponse getAllPosts() { - PostResponseDTO.getPostResponseDTO response = postService.getPost(); + PostResponseDTO.getPostResponseDTO response = null; return ApiResponse.of(SuccessStatus.INQUERY_POST_OK,response); } }