feat : 파티 멤버 칭호/아이템 정보 조인 (#157)

Author: HeegangBae

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

@@ -0,0 +1,24 @@
+package com.back.domain.party.party.dto;
+
+import com.back.domain.item.entity.Item;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class ItemDecorationDto {
+    private Integer id;
+    private String name;
+    private String iconUrl; // Item.img 필드를 iconUrl로 매핑
+
+    public ItemDecorationDto(Item item) {
+        if (item != null) {
+            this.id = item.getId();
+            this.name = item.getName();
+            // Item Entity의 img 필드가 아이콘 URL 경로를 담고 있다고 가정
+            this.iconUrl = item.getImg();
+        }
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.back.domain.party.party.dto;
 
 import com.back.domain.member.entity.Member;
+import com.back.domain.title.entity.Title;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -14,16 +15,36 @@ public class PartyMemberDto {
     private String name;
     private String status;
 
+    private String title;
+    private ItemDecorationDto item;
+
     public PartyMemberDto(Member member, String missionStatus) {
         this.id = member.getId();
         this.email = member.getEmail();
         this.name = member.getName();
         this.status = missionStatus;
+
+        // Member Entity에서 장착된 칭호 정보를 가져와 매핑
+        Title equippedTitle = member.getTitle(); // Member.title (장착된 칭호)
+        this.title = (equippedTitle != null) ? equippedTitle.getContent() : null;
+
+        this.item = (member.getItem() != null)
+                ? new ItemDecorationDto(member.getItem())
+                : null;
     }
 
     public PartyMemberDto(Member member) {
         this.id = member.getId();
         this.email = member.getEmail();
         this.name = member.getName();
+        this.status = null;
+
+        // Member Entity에서 장착된 칭호 정보를 가져와 매핑
+        Title equippedTitle = member.getTitle();
+        this.title = (equippedTitle != null) ? equippedTitle.getContent() : null;
+
+        this.item = (member.getItem() != null)
+                ? new ItemDecorationDto(member.getItem())
+                : null;
     }
 }

backend/src/main/java/com/back/domain/party/party/repository/PartyRepository.java

@@ -6,6 +6,7 @@
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.Optional;
@@ -14,13 +15,20 @@
 public interface PartyRepository extends JpaRepository<Party, Integer> {
 
     @Override
-    @EntityGraph(attributePaths = {"leader", "partyMembers.member"})
+    @EntityGraph(attributePaths = {
+            "leader",
+            "partyMembers.member",
+            "partyMembers.member.title",
+            "partyMembers.member.item"
+    })
     Optional<Party> findById(Integer partyId);
 
     @Query(value = "SELECT DISTINCT p FROM Party p " +
             "LEFT JOIN FETCH p.leader l " +
             "LEFT JOIN FETCH p.partyMembers pm " +
             "LEFT JOIN FETCH pm.member mbm " +
+            "LEFT JOIN FETCH mbm.title t " +
+            "LEFT JOIN FETCH mbm.item i " +
             "LEFT JOIN Mission m ON m.party = p " +
             "WHERE p.isPublic = true",
             countQuery = "SELECT COUNT(p) FROM Party p WHERE p.isPublic = true")
@@ -30,11 +38,13 @@ public interface PartyRepository extends JpaRepository<Party, Integer> {
             "LEFT JOIN FETCH p.leader l " +
             "LEFT JOIN FETCH p.partyMembers pm " +
             "LEFT JOIN FETCH pm.member mbm " +
-            "WHERE p.leader.id = :memberId " + // 리더인 경우
-            "OR EXISTS (SELECT pm2 FROM PartyMember pm2 WHERE pm2.party = p AND pm2.member.id = :memberId)" + // 멤버인 경우
-            "GROUP BY p.id, l.id, mbm.id, pm.status, pm.joinedAt",
+            "LEFT JOIN FETCH mbm.title t " +
+            "LEFT JOIN FETCH mbm.item i " +
+            "WHERE p.leader.id = :memberId " +
+            "OR EXISTS (SELECT pm2 FROM PartyMember pm2 WHERE pm2.party = p AND pm2.member.id = :memberId)" +
+            "GROUP BY p.id, l.id, mbm.id, pm.status, pm.joinedAt, t.id, i.id",
             countQuery = "SELECT COUNT(DISTINCT p) FROM Party p " +
                     "LEFT JOIN PartyMember pm ON pm.party = p " +
                     "WHERE p.leader.id = :memberId OR pm.member.id = :memberId")
-    Page<Party> findMyPartiesWithMissionAndMembers(Integer memberId, Pageable pageable);
+    Page<Party> findMyPartiesWithMissionAndMembers(@Param("memberId") Integer memberId, Pageable pageable);
 }