update mission history

Author: Losecow

.gitignore

@@ -215,4 +215,7 @@ src/main/resources
 .env
 
 #
-.frontend
+.frontend
+
+# 프론트엔드 파일 제외
+CC_Maker_FE/

.idea/vcs.xml

@@ -0,0 +1 @@
+Subproject commit 21ef65725bd6888c40e92e48ed1ba6f6a39329fc

CC_Maker_FE

@@ -0,0 +1,43 @@
+package com.ccapp.ccgo.mission.controller;
+
+import com.ccapp.ccgo.mission.dto.MissionHistoryDto;
+import com.ccapp.ccgo.mission.service.SubGroupMissionService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/mission/history")
+@RequiredArgsConstructor
+@Slf4j
+public class MissionHistoryController {
+    
+    private final SubGroupMissionService subGroupMissionService;
+    
+    // 서브그룹의 미션 히스토리 조회
+    @GetMapping("/subgroup/{subGroupId}")
+    public ResponseEntity<List<MissionHistoryDto>> getMissionHistoryBySubGroup(@PathVariable Long subGroupId) {
+        log.info("서브그룹 미션 히스토리 조회 요청: subGroupId = {}", subGroupId);
+        List<MissionHistoryDto> histories = subGroupMissionService.getMissionHistoryBySubGroup(subGroupId);
+        return ResponseEntity.ok(histories);
+    }
+    
+    // 사용자의 미션 히스토리 조회
+    @GetMapping("/user/{userId}")
+    public ResponseEntity<List<MissionHistoryDto>> getMissionHistoryByUser(@PathVariable Long userId) {
+        log.info("사용자 미션 히스토리 조회 요청: userId = {}", userId);
+        List<MissionHistoryDto> histories = subGroupMissionService.getMissionHistoryByUser(userId);
+        return ResponseEntity.ok(histories);
+    }
+    
+    // 팀의 미션 히스토리 조회
+    @GetMapping("/team/{teamId}")
+    public ResponseEntity<List<MissionHistoryDto>> getMissionHistoryByTeam(@PathVariable Long teamId) {
+        log.info("팀 미션 히스토리 조회 요청: teamId = {}", teamId);
+        List<MissionHistoryDto> histories = subGroupMissionService.getMissionHistoryByTeam(teamId);
+        return ResponseEntity.ok(histories);
+    }
+}

frontend

@@ -0,0 +1,27 @@
+package com.ccapp.ccgo.mission.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MissionHistoryDto {
+    
+    private Long id;
+    private Long subGroupId;
+    private String subGroupName; // 서브그룹 이름 (필요시)
+    private Long userId;
+    private String userName; // 사용자 이름
+    private Long missionTemplateId;
+    private String missionTitle; // 미션 제목
+    private String missionDescription; // 미션 설명
+    private Integer missionScore; // 미션 점수
+    private LocalDateTime completedAt;
+    private LocalDateTime createdAt;
+}

src/main/java/com/ccapp/ccgo/mission/controller/MissionHistoryController.java

@@ -0,0 +1,50 @@
+package com.ccapp.ccgo.mission.entity;
+
+import com.ccapp.ccgo.matching.domain.entity.SubGroup;
+import com.ccapp.ccgo.user.entity.User;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "mission_history")
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MissionHistory {
+    
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "sub_group_id")
+    private SubGroup subGroup;
+    
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id")
+    private User user;
+    
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "mission_template_id")
+    private MissionTemplate missionTemplate;
+    
+    @Column(name = "completed_at", nullable = false)
+    private LocalDateTime completedAt;
+    
+    @Column(name = "created_at", nullable = false)
+    private LocalDateTime createdAt;
+    
+    @PrePersist
+    protected void onCreate() {
+        createdAt = LocalDateTime.now();
+        if (completedAt == null) {
+            completedAt = LocalDateTime.now();
+        }
+    }
+}

src/main/java/com/ccapp/ccgo/mission/dto/MissionHistoryDto.java

@@ -0,0 +1,27 @@
+package com.ccapp.ccgo.mission.repository;
+
+import com.ccapp.ccgo.mission.entity.MissionHistory;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface MissionHistoryRepository extends JpaRepository<MissionHistory, Long> {
+    
+    // 특정 서브그룹의 미션 히스토리 조회
+    List<MissionHistory> findBySubGroup_IdOrderByCompletedAtDesc(Long subGroupId);
+    
+    // 특정 사용자의 미션 히스토리 조회
+    List<MissionHistory> findByUser_IdOrderByCompletedAtDesc(Long userId);
+    
+    // 특정 팀의 미션 히스토리 조회
+    @Query("SELECT mh FROM MissionHistory mh WHERE mh.subGroup.team.teamId = :teamId ORDER BY mh.completedAt DESC")
+    List<MissionHistory> findByTeamIdOrderByCompletedAtDesc(@Param("teamId") Long teamId);
+    
+    // 특정 미션 템플릿의 완료 히스토리 조회
+    List<MissionHistory> findByMissionTemplate_IdOrderByCompletedAtDesc(Long missionTemplateId);
+    
+    // 특정 서브그룹에서 특정 미션 템플릿이 완료되었는지 확인
+    boolean existsBySubGroup_IdAndMissionTemplate_Id(Long subGroupId, Long missionTemplateId);
+}

src/main/java/com/ccapp/ccgo/mission/entity/MissionHistory.java

@@ -13,5 +13,7 @@ public interface SubGroupMissionRepository extends JpaRepository<SubGroupMission
 
     Optional<SubGroupMission> findBySubGroupAndMissionTemplateId(SubGroup subGroup, Long missionTemplateId);
 
+    // 사용자가 이미 미션을 받았는지 체크하는 메서드
+    boolean existsBySubGroup_Team_TeamIdAndSubGroup_SubGroupMembers_User_Id(Long teamId, Long userId);
 
 }

src/main/java/com/ccapp/ccgo/mission/repository/MissionHistoryRepository.java

@@ -1,14 +1,19 @@
 package com.ccapp.ccgo.mission.service;
 
 import com.ccapp.ccgo.matching.domain.entity.SubGroup;
+import com.ccapp.ccgo.matching.domain.entity.SubGroupMember;
 import com.ccapp.ccgo.matching.repository.SubGroupRepository;
+import com.ccapp.ccgo.matching.repository.SubGroupMemberRepository;
 import com.ccapp.ccgo.mission.dto.ScoreboardResponseDto;
 import com.ccapp.ccgo.mission.dto.SubGroupMissionDto;
 import com.ccapp.ccgo.mission.dto.SubGroupScoreDto;
+import com.ccapp.ccgo.mission.dto.MissionHistoryDto;
 import com.ccapp.ccgo.mission.entity.MissionTemplate;
 import com.ccapp.ccgo.mission.entity.SubGroupMission;
+import com.ccapp.ccgo.mission.entity.MissionHistory;
 import com.ccapp.ccgo.mission.repository.MissionTemplateRepository;
 import com.ccapp.ccgo.mission.repository.SubGroupMissionRepository;
+import com.ccapp.ccgo.mission.repository.MissionHistoryRepository;
 import lombok.RequiredArgsConstructor;
 import java.util.concurrent.ThreadLocalRandom;
 import org.springframework.stereotype.Service;
@@ -17,14 +22,17 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.time.LocalDateTime;
 
 @Service
 @RequiredArgsConstructor
 public class SubGroupMissionService {
 
     private final SubGroupRepository subGroupRepository;
+    private final SubGroupMemberRepository subGroupMemberRepository;
     private final MissionTemplateRepository missionTemplateRepository;
     private final SubGroupMissionRepository subGroupMissionRepository;
+    private final MissionHistoryRepository missionHistoryRepository;
 
     // 서브그룹에 미션 부여
     @Transactional
@@ -36,33 +44,34 @@ public void assignMissionsToSubGroup(Long subGroupId) {
             throw new IllegalStateException("이미 이 서브그룹에 미션이 부여되어 있습니다.");
         }
 
-        assignMissionsByScore(subGroup, 1, 6);
+        // 그룹장 중복 미션 방지: 이미 미션을 받은 사용자가 있는지 체크
+        List<SubGroupMember> groupMembers = subGroupMemberRepository.findBySubGroup_Id(subGroupId);
+        List<Long> groupMemberIds = groupMembers.stream()
+                .map(member -> member.getUser().getId())
+                .collect(Collectors.toList());
+
+        for (Long memberId : groupMemberIds) {
+            boolean hasExistingMission = subGroupMissionRepository.existsBySubGroup_Team_TeamIdAndSubGroup_SubGroupMembers_User_Id(
+                    subGroup.getTeam().getTeamId(), memberId);
+            if (hasExistingMission) {
+                throw new IllegalStateException("사용자 ID " + memberId + "가 이미 다른 서브그룹에서 미션을 받았습니다.");
+            }
+        }
+ 
         assignMissionsByScore(subGroup, 3, 6);
         assignMissionsByScore(subGroup, 5, 6);
         assignMissionsByScore(subGroup, 10, 6);
     }
 
     private void assignMissionsByScore(SubGroup subGroup, Integer score, int count) {
-        // 1. 이미 할당된 미션 Template ID 목록 조회
-        List<Long> existingMissionTemplateIds = subGroupMissionRepository.findBySubGroup(subGroup).stream()
-                .map(m -> m.getMissionTemplate().getId())
-                .toList();
-
-        // 2. score 조건에 맞는 미션 템플릿 중 기존 할당 미션 제외
-        List<MissionTemplate> missions = missionTemplateRepository.findByScore(score).stream()
-                .filter(m -> !existingMissionTemplateIds.contains(m.getId()))
-                .toList();
-
-        // 3. 미션 개수 체크
+        List<MissionTemplate> missions = missionTemplateRepository.findByScore(score);
         if (missions.size() < count) {
             throw new IllegalStateException(score + "점 미션이 최소 " + count + "개 이상 필요합니다.");
         }
 
-        // 4. 랜덤 섞고 필요한 개수만큼 선택
         Collections.shuffle(missions);
         List<MissionTemplate> selected = missions.subList(0, count);
 
-        // 5. 새 미션 할당
         for (MissionTemplate missionTemplate : selected) {
             SubGroupMission mission = SubGroupMission.builder()
                     .subGroup(subGroup)
@@ -73,7 +82,6 @@ private void assignMissionsByScore(SubGroup subGroup, Integer score, int count)
         }
     }
 
-
     // 미션 완료 처리
     @Transactional
     public void completeMission(Long subGroupMissionId) {
@@ -181,8 +189,71 @@ public void completeMission(Long teamId, Long subGroupId, Long missionTemplateId
 
         // 완료 처리
         mission.setCompleted(true);
+        
+        // 미션 히스토리에 저장
+        saveMissionHistory(subGroup, mission.getMissionTemplate());
+    }
+    
+    // 미션 히스토리 저장
+    private void saveMissionHistory(SubGroup subGroup, MissionTemplate missionTemplate) {
+        // 서브그룹의 모든 멤버에 대해 히스토리 저장
+        List<SubGroupMember> members = subGroupMemberRepository.findBySubGroup_Id(subGroup.getId());
+        
+        for (SubGroupMember member : members) {
+            MissionHistory history = MissionHistory.builder()
+                    .subGroup(subGroup)
+                    .user(member.getUser())
+                    .missionTemplate(missionTemplate)
+                    .completedAt(LocalDateTime.now())
+                    .build();
+            
+                    missionHistoryRepository.save(history);
+        }
+    }
+    
+    // 서브그룹의 미션 히스토리 조회
+    @Transactional(readOnly = true)
+    public List<MissionHistoryDto> getMissionHistoryBySubGroup(Long subGroupId) {
+        List<MissionHistory> histories = missionHistoryRepository.findBySubGroup_IdOrderByCompletedAtDesc(subGroupId);
+        
+        return histories.stream()
+                .map(this::convertToDto)
+                .collect(Collectors.toList());
+    }
+    
+    // 사용자의 미션 히스토리 조회
+    @Transactional(readOnly = true)
+    public List<MissionHistoryDto> getMissionHistoryByUser(Long userId) {
+        List<MissionHistory> histories = missionHistoryRepository.findByUser_IdOrderByCompletedAtDesc(userId);
+        
+        return histories.stream()
+                .map(this::convertToDto)
+                .collect(Collectors.toList());
+    }
+    
+    // 팀의 미션 히스토리 조회
+    @Transactional(readOnly = true)
+    public List<MissionHistoryDto> getMissionHistoryByTeam(Long teamId) {
+        List<MissionHistory> histories = missionHistoryRepository.findByTeamIdOrderByCompletedAtDesc(teamId);
+        
+        return histories.stream()
+                .map(this::convertToDto)
+                .collect(Collectors.toList());
+    }
+    
+    // MissionHistory를 DTO로 변환
+    private MissionHistoryDto convertToDto(MissionHistory history) {
+        return MissionHistoryDto.builder()
+                .id(history.getId())
+                .subGroupId(history.getSubGroup().getId())
+                .userId(history.getUser().getId())
+                .userName(history.getUser().getName())
+                .missionTemplateId(history.getMissionTemplate().getId())
+                .missionTitle(history.getMissionTemplate().getTitle())
+                .missionDescription(history.getMissionTemplate().getDescription())
+                .missionScore(history.getMissionTemplate().getScore())
+                .completedAt(history.getCompletedAt())
+                .createdAt(history.getCreatedAt())
+                .build();
     }
-
-
-
 }