refactor: startDate 삭제

umc-5th-hackathon-team-I · Jan 2, 2024 · 44be66b · 44be66b
1 parent a46090b
commit 44be66b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/com/teami/domain/calendar/controller/CalendarController.java b/src/main/java/com/teami/domain/calendar/controller/CalendarController.java
@@ -20,8 +20,8 @@ public class CalendarController {
 
     @PostMapping
     @Operation(summary = "캘린더 생성 API")
-    public ApiResponse<CalendarMissionsResponse> createCalendar(@RequestParam Long memberId, @RequestParam LocalDate startDate) {
-        return ApiResponse.onSuccess(calendarService.createCalendar(memberId, startDate));
+    public ApiResponse<CalendarMissionsResponse> createCalendar(@RequestParam Long memberId) {
+        return ApiResponse.onSuccess(calendarService.createCalendar(memberId));
     }
 
     @GetMapping

diff --git a/src/main/java/com/teami/domain/calendar/dto/response/CalendarMissionsResponse.java b/src/main/java/com/teami/domain/calendar/dto/response/CalendarMissionsResponse.java
@@ -9,5 +9,6 @@
 @AllArgsConstructor
 public class CalendarMissionsResponse {
     private Long calenderId;
+    private String nickname;
     private List<CalendarMissionResponse> missions;
 }
diff --git a/src/main/java/com/teami/domain/calendar/mapper/CalendarMapper.java b/src/main/java/com/teami/domain/calendar/mapper/CalendarMapper.java
@@ -29,8 +29,8 @@ public CalendarMission toCalendarMission(String content, LocalDate date, boolean
                 .build();
     }
 
-    public CalendarMissionsResponse toCalendarMissionsResponse(Calendar calendar, List<CalendarMissionResponse> missionResponses) {
-        return new CalendarMissionsResponse(calendar.getId(), missionResponses);
+    public CalendarMissionsResponse toCalendarMissionsResponse(Member member, Calendar calendar, List<CalendarMissionResponse> missionResponses) {
+        return new CalendarMissionsResponse(calendar.getId(), member.getNickname(),  missionResponses);
     }
 
     public List<CalendarMissionResponse> toCalendarMissionResponseList(List<CalendarMission> missions) {

diff --git a/src/main/java/com/teami/domain/calendar/service/CalendarService.java b/src/main/java/com/teami/domain/calendar/service/CalendarService.java
@@ -35,7 +35,7 @@ public class CalendarService {
     private final RewardService rewardService;
 
     @Transactional
-    public CalendarMissionsResponse createCalendar(Long memberId, LocalDate startDate) {
+    public CalendarMissionsResponse createCalendar(Long memberId) {
         Member loginUser = memberService.findMemberById(memberId);
 
         // 이전 캘린더가 다 수행되지 않았을 경우 예외 처리
@@ -47,7 +47,7 @@ public CalendarMissionsResponse createCalendar(Long memberId, LocalDate startDat
         // 캘린더 내의 모든 미션들 생성
         try {
             List<NewMissionResponse> missions = missionService.generateMission();
-            return calendarMapper.toCalendarMissionsResponse(newCalendar, toCalendarMissionsResponse(missions, newCalendar));
+            return calendarMapper.toCalendarMissionsResponse(loginUser, newCalendar, toCalendarMissionsResponse(loginUser, missions, newCalendar));
 
         } catch (Exception e) {
             throw new ExceptionHandler(ErrorStatus.CREATE_MISSION_FAILED);
@@ -64,7 +64,7 @@ public CalendarMissionsResponse getCalendar(Long memberId) {
         }
 
         List<CalendarMission> missions = calendarMissionRepository.findAllByCalendarOrderByDate(calendar.get());
-        return calendarMapper.toCalendarMissionsResponse(calendar.get(), calendarMapper.toCalendarMissionResponseList(missions));
+        return calendarMapper.toCalendarMissionsResponse(loginUser, calendar.get(), calendarMapper.toCalendarMissionResponseList(missions));
     }
 
     @Transactional
@@ -87,7 +87,7 @@ public CalendarMissionIdResponse completeMission(Long memberId, Long missionId)
         return new CalendarMissionIdResponse(calendarMission.getId());
     }
 
-    private List<CalendarMissionResponse> toCalendarMissionsResponse(List<NewMissionResponse> missions, Calendar calendar) {
+    private List<CalendarMissionResponse> toCalendarMissionsResponse(Member member, List<NewMissionResponse> missions, Calendar calendar) {
         LocalDate now = LocalDate.now();
         List<CalendarMissionResponse> calendarMissions = new ArrayList<>();
         for(int i = 0; i < 30;i++) {