Merge pull request #115 from prgrms-web-devcourse-final-project/feat/mission

fix : task 다시 수정

Author: parkjioh

backend/src/main/java/com/back/domain/mission/dto/response/TaskResponse.java

@@ -1,6 +1,7 @@
 package com.back.domain.mission.dto.response;
 
 import com.back.domain.mission.enums.TaskStatus;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.*;
 
 import java.time.LocalDate;
@@ -23,20 +24,23 @@ public class TaskResponse {
     private boolean canEdit;        // 지금 시점에 수정 가능한지 여부
     private LocalDate editDeadline;  // 수정 마감일
 
-    private Integer missionId;
+
+    //today 전용
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     private String missionTitle;
-    private Integer subGoalId;
-    private String subGoalTitle;  // "1주차: 기초 체력 다지기"
-    private Integer weekNum;
 
-    private PartyTaskProgressDto partyProgress;  // 파티 미션일 때만
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private String subGoalTitle;
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private PartyCompletionDto partyCompletion;
     @Getter
     @Setter
     @NoArgsConstructor
     @AllArgsConstructor
     @Builder
-    public static class PartyTaskProgressDto {
-        private Integer completedMembers;  // 완료한 인원
-        private Integer totalMembers;      // 전체 인원 (ACCEPTED)
+    public static class PartyCompletionDto {
+        private Integer completedMembers;
+        private Integer totalMembers;
     }
 }

backend/src/main/java/com/back/domain/mission/service/MissionCalculateService.java

@@ -215,8 +215,8 @@ public Integer calculatePartyWeekAverage(SubGoal subGoal) {
         return (int) (totalProgress / activeMembers.size());
     }
 
-
-    public TaskResponse.PartyTaskProgressDto calculatePartyTaskProgress(Task task, LocalDate date) {
+    //특정 테스크를 특정 날짜에 완료한 팀원 수 계산
+    public  TaskResponse.PartyCompletionDto  calculateTaskCompletion(Task task, LocalDate date) {
         Mission mission = task.getSubGoal().getMission();
 
         if (!mission.isPartyMission()) {
@@ -227,11 +227,19 @@ public TaskResponse.PartyTaskProgressDto calculatePartyTaskProgress(Task task, L
                 .filter(pm -> pm.getStatus() == PartyMemberStatus.ACCEPTED)
                 .toList();
 
-        long completedCount = activeMembers.stream()
+        int totalMembers = activeMembers.size();
+
+        long completedMembers = activeMembers.stream()
                 .filter(pm -> taskLogRepository.existsByTaskIdAndMemberIdAndDateAndStatus(
-                        task.getId(), pm.getMember().getId(), date, TaskStatus.COMPLETED))
+                        task.getId(),
+                        pm.getMember().getId(),
+                        date,
+                        TaskStatus.COMPLETED
+                ))
                 .count();
 
-        return new TaskResponse.PartyTaskProgressDto((int) completedCount, activeMembers.size());
-    }
+        return TaskResponse.PartyCompletionDto.builder()
+                .completedMembers((int) completedMembers)
+                .totalMembers(totalMembers)
+                .build();    }
 }

backend/src/main/java/com/back/domain/mission/service/MissionService.java

@@ -118,9 +118,7 @@ public MissionOverviewResponse getAllMissionsForAdmin() {
         List<MissionResponse> completedMissions = new ArrayList<>();
 
         for (Mission m : allMissions) {
-            MissionResponse response = partyMissionService.convertToSimpleResponse(
-                    m, m.getMember().getId()
-            );
+            MissionResponse response = partyMissionService.convertToDetailResponseAdmin(m);
 
             if (m.isCompleted()) {
                 completedMissions.add(response);

backend/src/main/java/com/back/domain/mission/service/TaskService.java

@@ -108,7 +108,7 @@ public List<TaskResponse> getTodayTasks(Integer memberId) {
         List<Task> tasks = taskRepository.findTodayTasks(memberId, today, todayDayNum);
 
         return tasks.stream()
-                .map(task -> convertToTaskResponse(task, memberId, today))
+                .map(task -> convertToTaskResponseForToday(task, memberId, today))
                 .collect(Collectors.toList());
     }
 
@@ -202,20 +202,19 @@ public TaskResponse toTaskResponse(Task task, Integer memberId, LocalDate date)
         return convertToTaskResponse(task, memberId, date);
     }
 
+
     private TaskResponse convertToTaskResponse(Task task, Integer memberId, LocalDate date) {
         Optional<TaskLog> taskLog = taskLogRepository.findByTaskIdAndMemberIdAndDate(
                 task.getId(), memberId, date);
 
         TaskStatus status = taskLog.map(TaskLog::getStatus).orElse(TaskStatus.PENDING);
+
         LocalDate lastCompletedDate = taskLogRepository
                 .findTopByTaskIdAndMemberIdOrderByDateDesc(task.getId(), memberId)
                 .map(TaskLog::getDate)
                 .orElse(null);
 
-        SubGoal subGoal = task.getSubGoal();
-        Mission mission = subGoal.getMission();
-
-        TaskResponse.TaskResponseBuilder builder = TaskResponse.builder()
+        return TaskResponse.builder()
                 .taskId(task.getId())
                 .title(task.getTitle())
                 .dayNum(task.getDayNum())
@@ -225,17 +224,7 @@ private TaskResponse convertToTaskResponse(Task task, Integer memberId, LocalDat
                 .hasBeenEdited(task.getHasBeenEdited())
                 .canEdit(task.canEdit())
                 .editDeadline(task.getEditDeadline())
-                .missionId(mission.getId())
-                .missionTitle(mission.getTitle())
-                .subGoalId(subGoal.getId())
-                .subGoalTitle(subGoal.getTitle())
-                .weekNum(subGoal.getOrderNum());
-
-        if (mission.isPartyMission()) {
-            builder.partyProgress(calculateService.calculatePartyTaskProgress(task, date));
-        }
-
-        return builder.build();
+                .build();
     }
 
     // 배치 변환 메서드 추가
@@ -301,4 +290,20 @@ private TaskResponse convertToTaskResponseWithMaps(
                 .editDeadline(task.getEditDeadline())
                 .build();
     }
+
+    private TaskResponse convertToTaskResponseForToday(Task task, Integer memberId, LocalDate date) {
+        TaskResponse response = convertToTaskResponse(task, memberId, date);
+
+        Mission mission = task.getSubGoal().getMission();
+        SubGoal subGoal = task.getSubGoal();
+
+        response.setMissionTitle(mission.getTitle());
+        response.setSubGoalTitle(subGoal.getTitle());
+
+        if (mission.isPartyMission()) {
+            response.setPartyCompletion(calculateService.calculateTaskCompletion(task, date));
+        }
+
+        return response;
+    }
 }

backend/src/main/resources/application.yml

@@ -39,7 +39,7 @@ spring:
       base-url: https://openrouter.ai/api
       chat:
         options:
-          model: x-ai/grok-4-fast:free
+          model: x-ai/grok-4-fast
 
   security:
     oauth2: