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

fix : task 요구사항 수정

Author: parkjioh

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

@@ -22,4 +22,21 @@ public class TaskResponse {
     private boolean hasBeenEdited;  // 이미 수정됐는지 여부
     private boolean canEdit;        // 지금 시점에 수정 가능한지 여부
     private LocalDate editDeadline;  // 수정 마감일
+
+    private Integer missionId;
+    private String missionTitle;
+    private Integer subGoalId;
+    private String subGoalTitle;  // "1주차: 기초 체력 다지기"
+    private Integer weekNum;
+
+    private PartyTaskProgressDto partyProgress;  // 파티 미션일 때만
+    @Getter
+    @Setter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @Builder
+    public static class PartyTaskProgressDto {
+        private Integer completedMembers;  // 완료한 인원
+        private Integer totalMembers;      // 전체 인원 (ACCEPTED)
+    }
 }

backend/src/main/java/com/back/domain/mission/repository/TaskLogRepository.java

@@ -84,4 +84,11 @@ List<TaskLog> findLastCompletedByTaskIds(
             @Param("taskIds") List<Integer> taskIds,
             @Param("memberId") Integer memberId
     );
+
+    boolean existsByTaskIdAndMemberIdAndDateAndStatus(
+            Integer taskId,
+            Integer memberId,
+            LocalDate date,
+            TaskStatus status
+    );
 }

backend/src/main/java/com/back/domain/mission/repository/TaskRepository.java

@@ -17,18 +17,23 @@ public interface TaskRepository extends JpaRepository<Task, Integer> {
     List<Task> findBySubGoalId(Integer subGoalId);
 
     @Query("""
-        SELECT t FROM Task t 
-        JOIN t.subGoal sg 
-        JOIN sg.mission m 
-        WHERE m.member.id = :memberId 
-        AND :today BETWEEN sg.startDate AND sg.endDate 
-        AND t.dayNum = :dayOfWeek 
-        AND m.isCompleted = false
+    SELECT DISTINCT t FROM Task t
+    JOIN FETCH t.subGoal sg
+    JOIN FETCH sg.mission m
+    LEFT JOIN m.party p
+    LEFT JOIN p.partyMembers pm
+    WHERE (m.member.id = :memberId 
+           OR (pm.member.id = :memberId AND pm.status = 'ACCEPTED'))
+    AND m.isCompleted = false
+    AND t.dayNum = :dayNum
+    AND :date BETWEEN sg.startDate AND sg.endDate
+    AND :date BETWEEN m.startDate AND m.endDate
+    ORDER BY m.id, sg.orderNum, t.dayNum
     """)
     List<Task> findTodayTasks(
             @Param("memberId") Integer memberId,
-            @Param("today") LocalDate today,
-            @Param("dayOfWeek") Integer dayOfWeek
+            @Param("date") LocalDate date,
+            @Param("dayNum") int dayNum
     );
 
     @Query("""

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

@@ -1,5 +1,6 @@
 package com.back.domain.mission.service;
 
+import com.back.domain.mission.dto.response.TaskResponse;
 import com.back.domain.mission.entity.Mission;
 import com.back.domain.mission.entity.SubGoal;
 import com.back.domain.mission.entity.Task;
@@ -213,4 +214,24 @@ public Integer calculatePartyWeekAverage(SubGoal subGoal) {
 
         return (int) (totalProgress / activeMembers.size());
     }
+
+
+    public TaskResponse.PartyTaskProgressDto calculatePartyTaskProgress(Task task, LocalDate date) {
+        Mission mission = task.getSubGoal().getMission();
+
+        if (!mission.isPartyMission()) {
+            return null;
+        }
+
+        List<PartyMember> activeMembers = mission.getParty().getPartyMembers().stream()
+                .filter(pm -> pm.getStatus() == PartyMemberStatus.ACCEPTED)
+                .toList();
+
+        long completedCount = activeMembers.stream()
+                .filter(pm -> taskLogRepository.existsByTaskIdAndMemberIdAndDateAndStatus(
+                        task.getId(), pm.getMember().getId(), date, TaskStatus.COMPLETED))
+                .count();
+
+        return new TaskResponse.PartyTaskProgressDto((int) completedCount, activeMembers.size());
+    }
 }

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

@@ -202,19 +202,20 @@ 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);
 
-        return TaskResponse.builder()
+        SubGoal subGoal = task.getSubGoal();
+        Mission mission = subGoal.getMission();
+
+        TaskResponse.TaskResponseBuilder builder = TaskResponse.builder()
                 .taskId(task.getId())
                 .title(task.getTitle())
                 .dayNum(task.getDayNum())
@@ -224,7 +225,17 @@ private TaskResponse convertToTaskResponse(Task task, Integer memberId, LocalDat
                 .hasBeenEdited(task.getHasBeenEdited())
                 .canEdit(task.canEdit())
                 .editDeadline(task.getEditDeadline())
-                .build();
+                .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();
     }
 
     // 배치 변환 메서드 추가