feat : 파티 목록 조회 api 개선 (#123)

Author: HeegangBae

backend/src/main/java/com/back/domain/party/party/controller/ApiV1PartyController.java

@@ -2,7 +2,6 @@
 
 import com.back.domain.member.entity.Member;
 import com.back.domain.member.service.MemberService;
-import com.back.domain.mission.entity.Mission;
 import com.back.domain.mission.enums.MissionCategory;
 import com.back.domain.party.party.dto.*;
 import com.back.domain.party.party.entity.Party;
@@ -145,14 +144,8 @@ public ResponseEntity<ApiResponse<Page<PartyDto>>> getPublicParties(
     @GetMapping("/{partyId}")
     @Operation(summary = "파티 상세 조회", description = "특정 파티의 상세 정보를 조회하고 조회수를 1 증가시키는 API (미션ID 포함)")
     public ResponseEntity<ApiResponse<PartyDto>> getPartyDetails(@PathVariable Integer partyId) {
-        // 1. 파티 정보 조회 및 조회수 증가
-        Party party = partyService.getPartyDetails(partyId);
 
-        // 2. 파티에 연결된 미션 정보 조회 (Service에 추가된 헬퍼 메서드 사용)
-        Mission mission = partyService.getMissionByPartyId(partyId);
-
-        // 3. Party와 Mission 정보를 모두 DTO에 담아 반환
-        PartyDto partyDto = new PartyDto(party, mission);
+        PartyDto partyDto = partyService.getPartyDetails(partyId);
 
         return ResponseEntity
                 .status(HttpStatus.OK)

backend/src/main/java/com/back/domain/party/party/dto/PartyDto.java

@@ -29,6 +29,8 @@ public class PartyDto {
     private LocalDate endDate;
     private LocalDate createDate;
     private Integer views;
+    private String missionTitle;
+    private Boolean missionIsCompleted;
 
 
     public PartyDto(Party party, Mission mission) {
@@ -53,11 +55,24 @@ public PartyDto(Party party, Mission mission) {
             this.category = mission.getCategory();
             this.startDate = mission.getStartDate();
             this.endDate = mission.getEndDate();
+            this.missionTitle = mission.getTitle();
+            this.missionIsCompleted = mission.isCompleted();
+        } else {
+            this.category = null;
+            this.startDate = null;
+            this.endDate = null;
+            this.missionTitle = null;
+            this.missionIsCompleted = null;
         }
 
         this.members = party.getPartyMembers().stream()
                 .filter(pm -> pm.getStatus() == PartyMemberStatus.ACCEPTED)
-                .map(partyMember -> new PartyMemberDto(partyMember.getMember()))
+                .map(partyMember -> {
+                    return new PartyMemberDto(
+                            partyMember.getMember(),
+                            null
+                    );
+                })
                 .collect(Collectors.toList());
     }
 
@@ -79,10 +94,12 @@ public PartyDto(Party party) {
         this.category = null;
         this.startDate = null;
         this.endDate = null;
+        this.missionTitle = null;
+        this.missionIsCompleted = null;
 
         this.members = party.getPartyMembers().stream()
                 .filter(pm -> pm.getStatus() == PartyMemberStatus.ACCEPTED)
-                .map(partyMember -> new PartyMemberDto(partyMember.getMember()))
+                .map(partyMember -> new PartyMemberDto(partyMember.getMember(), null))
                 .collect(Collectors.toList());
     }
 

backend/src/main/java/com/back/domain/party/party/dto/PartyMemberDto.java

@@ -12,6 +12,14 @@ public class PartyMemberDto {
     private Integer id;
     private String email;
     private String name;
+    private String status;
+
+    public PartyMemberDto(Member member, String missionStatus) {
+        this.id = member.getId();
+        this.email = member.getEmail();
+        this.name = member.getName();
+        this.status = missionStatus;
+    }
 
     public PartyMemberDto(Member member) {
         this.id = member.getId();

backend/src/main/java/com/back/domain/party/party/service/PartyService.java

@@ -4,8 +4,10 @@
 import com.back.domain.member.repository.MemberRepository;
 import com.back.domain.mission.entity.Mission;
 import com.back.domain.mission.enums.MissionCategory;
+import com.back.domain.mission.repository.MissionCompletionLogRepository;
 import com.back.domain.mission.repository.MissionRepository;
 import com.back.domain.party.party.dto.PartyDto;
+import com.back.domain.party.party.dto.PartyMemberDto;
 import com.back.domain.party.party.dto.PartyRequestDto;
 import com.back.domain.party.party.dto.PartyUpdateRequestDto;
 import com.back.domain.party.party.entity.Party;
@@ -41,6 +43,8 @@ public class PartyService {
     private final MemberRepository memberRepository;
     private final PartyMemberRepository partyMemberRepository;
     private final MissionRepository missionRepository;
+    private final MissionCompletionLogRepository completionLogRepository;
+
 
     public Page<PartyDto> getPublicPartyList(
             Pageable pageable,
@@ -210,23 +214,44 @@ public void deleteParty(Integer partyId, Integer memberId) {
         partyRepository.delete(party);
     }
 
+    private String getMemberMissionStatus(Integer missionId, Integer memberId) {
+        boolean isCompleted = completionLogRepository.existsByMissionIdAndMemberId(missionId, memberId);
+        return isCompleted ? "COMPLETED" : "PROGRESS";
+    }
+
+    // 파티 상세 조회 (캐시 적용)
     @Cacheable(value = "partyDetails", key = "#partyId")
-    @Transactional
-    public Party getPartyDetails(Integer partyId) {
+    @Transactional(readOnly = true)
+    public PartyDto getPartyDetails(Integer partyId) {
         Party party = partyRepository.findById(partyId)
                 .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND, "파티를 찾을 수 없습니다."));
 
         party.incrementViews();
 
-        return party;
-    }
+        Mission mission = missionRepository.findByPartyId(partyId).stream().findFirst().orElse(null);
+
+        // 파티원 DTO 리스트 생성 로직
+        List<PartyMemberDto> memberDtos = party.getPartyMembers().stream()
+                .filter(pm -> pm.getStatus() == PartyMemberStatus.ACCEPTED)
+                .map(partyMember -> {
+                    String memberMissionStatus = null;
+                    if (mission != null) {
+                        memberMissionStatus = getMemberMissionStatus( // 상태 계산 로직 사용
+                                mission.getId(),
+                                partyMember.getMember().getId()
+                        );
+                    }
+                    return new PartyMemberDto(
+                            partyMember.getMember(),
+                            memberMissionStatus
+                    );
+                })
+                .collect(Collectors.toList());
 
-    @Cacheable(value = "missionByParty", key = "#partyId")
-    @Transactional(readOnly = true)
-    public Mission getMissionByPartyId(Integer partyId) {
-        return missionRepository.findByPartyId(partyId).stream()
-                .findFirst()
-                .orElse(null);
+        PartyDto dto = new PartyDto(party, mission);
+        dto.setMembers(memberDtos);
+
+        return dto;
     }
 
     @Transactional