쿼리 추가 발생 문제 해결

backend/src/main/java/mouda/backend/darakbang/infrastructure/DarakbangRepository.java

@@ -1,8 +1,10 @@
 package mouda.backend.darakbang.infrastructure;
 
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import mouda.backend.darakbang.domain.Darakbang;
@@ -15,4 +17,11 @@ public interface DarakbangRepository extends JpaRepository<Darakbang, Long> {
 	boolean existsByCode(String code);
 
 	Optional<Darakbang> findByCode(String code);
+
+	@Query("""
+		SELECT d
+		FROM Darakbang d
+		WHERE d.id IN :darakbangIds
+		""")
+	List<Darakbang> findAllByIds(List<Long> darakbangIds);
 }

backend/src/main/java/mouda/backend/darakbangmember/implement/DarakbangMemberFinder.java

@@ -8,6 +8,7 @@
 
 import lombok.RequiredArgsConstructor;
 import mouda.backend.darakbang.domain.Darakbang;
+import mouda.backend.darakbang.infrastructure.DarakbangRepository;
 import mouda.backend.darakbangmember.domain.DarakBangMemberRole;
 import mouda.backend.darakbangmember.domain.DarakbangMember;
 import mouda.backend.darakbangmember.domain.DarakbangMembers;
@@ -21,6 +22,7 @@
 public class DarakbangMemberFinder {
 
 	private final DarakbangMemberRepository darakbangMemberRepository;
+	private final DarakbangRepository darakbangRepository;
 
 	public DarakbangMember find(Darakbang darakbang, Member member) {
 		return darakbangMemberRepository.findByDarakbangIdAndMemberId(darakbang.getId(), member.getId())
@@ -29,10 +31,8 @@ public DarakbangMember find(Darakbang darakbang, Member member) {
 	}
 
 	public List<Darakbang> findAllByMember(Member member) {
-		return darakbangMemberRepository.findAllByMemberId(member.getId())
-			.stream()
-			.map(DarakbangMember::getDarakbang)
-			.toList();
+		List<Long> darakbangIds = darakbangMemberRepository.findAllDarakbangIdsByMemberId(member.getId());
+		return darakbangRepository.findAllByIds(darakbangIds);
 	}
 
 	public DarakbangMembers findAllDarakbangMembers(Long darakbangId) {

backend/src/main/java/mouda/backend/darakbangmember/infrastructure/DarakbangMemberRepository.java

@@ -4,14 +4,20 @@
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import mouda.backend.darakbangmember.domain.DarakbangMember;
 
 @Repository
 public interface DarakbangMemberRepository extends JpaRepository<DarakbangMember, Long> {
 
-	List<DarakbangMember> findAllByMemberId(long memberId);
+	@Query("""
+		SELECT dm.darakbang.id
+		FROM DarakbangMember dm
+		WHERE dm.memberId = :memberId
+		""")
+	List<Long> findAllDarakbangIdsByMemberId(long memberId);
 
 	Optional<DarakbangMember> findByDarakbangIdAndMemberId(Long darakbangId, Long id);
 

backend/src/main/java/mouda/backend/moim/domain/Moim.java

@@ -16,6 +16,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import mouda.backend.moim.exception.MoimErrorMessage;
@@ -25,6 +26,7 @@
 @Table(name = "moim")
 @Getter
 @NoArgsConstructor
+@EqualsAndHashCode
 public class Moim {
 
 	private static final int TITLE_MAX_LENGTH = 30;
@@ -215,7 +217,6 @@ public boolean isCompleted() {
 		return moimStatus == MoimStatus.COMPLETED;
 	}
 
-
 	public boolean isMoiming() {
 		return moimStatus == MoimStatus.MOIMING;
 	}

backend/src/main/java/mouda/backend/moim/domain/MoimOverview.java

@@ -9,9 +9,9 @@ public class MoimOverview {
 	private final int currentPeople;
 	private final boolean isZzimed;
 
-	public MoimOverview(Moim moim, int currentPeople, boolean isZzimed) {
+	public MoimOverview(Moim moim, long currentPeople, boolean isZzimed) {
 		this.moim = moim;
-		this.currentPeople = currentPeople;
+		this.currentPeople = (int)currentPeople;
 		this.isZzimed = isZzimed;
 	}
 }

backend/src/main/java/mouda/backend/moim/domain/Zzim.java

@@ -1,6 +1,7 @@
 package mouda.backend.moim.domain;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -22,11 +23,11 @@ public class Zzim {
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 
-	@ManyToOne
+	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(nullable = false)
 	private Moim moim;
 
-	@ManyToOne
+	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(nullable = false)
 	private DarakbangMember darakbangMember;
 

backend/src/main/java/mouda/backend/moim/implement/finder/MoimFinder.java

@@ -1,7 +1,10 @@
 package mouda.backend.moim.implement.finder;
 
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
@@ -19,6 +22,7 @@
 import mouda.backend.moim.infrastructure.ChamyoRepository;
 import mouda.backend.moim.infrastructure.MoimRepository;
 import mouda.backend.moim.infrastructure.ZzimRepository;
+import mouda.backend.moim.infrastructure.dto.ChamyoMoim;
 
 @Component
 @RequiredArgsConstructor
@@ -38,17 +42,25 @@ public Moim read(long moimId, long currentDarakbangId) {
 	}
 
 	public List<MoimOverview> readAll(long darakbangId, DarakbangMember darakbangMember) {
-		return moimRepository.findAllByDarakbangIdOrderByIdDesc(darakbangId).stream()
-			.map(moim -> createMoimOverview(moim, darakbangMember))
-			.toList();
+		List<Moim> moims = moimRepository.findAllByDarakbangIdOrderByIdDesc(darakbangId);
+		List<ChamyoMoim> chamyoMoims = chamyoRepository.findAllByMoims(moims);
+		Set<Long> zzimedMoimIds = zzimRepository.findAllByDarakbangMemberId(darakbangMember.getId());
+
+		return createMoimOverview(moims, chamyoMoims, zzimedMoimIds);
 	}
 
 	public List<MoimOverview> readAllMyMoim(DarakbangMember darakbangMember, FilterType filterType) {
-		return chamyoRepository.findAllByDarakbangMemberIdOrderByIdDesc(darakbangMember.getId()).stream()
-			.map(Chamyo::getMoim)
+		List<ChamyoMoim> chamyoMoims = chamyoRepository.findAllByDarakbangMemberId(darakbangMember.getId());
+		Set<Long> moimIds = chamyoMoims.stream()
+			.map(ChamyoMoim::getMoimId)
+			.collect(Collectors.toSet());
+		List<Moim> moims = moimRepository.findAllByIds(moimIds)
+			.stream()
 			.filter(getFilter(filterType))
-			.map(moim -> createMoimOverview(moim, darakbangMember))
 			.toList();
+		Set<Long> zzimedMoimIds = zzimRepository.findAllByDarakbangMemberId(darakbangMember.getId());
+
+		return createMoimOverview(moims, chamyoMoims, zzimedMoimIds);
 	}
 
 	private Predicate<Moim> getFilter(FilterType filterType) {
@@ -62,16 +74,25 @@ private Predicate<Moim> getFilter(FilterType filterType) {
 	}
 
 	public List<MoimOverview> readAllZzimedMoim(DarakbangMember darakbangMember) {
-		return zzimRepository.findAllByDarakbangMemberIdOrderByIdDesc(darakbangMember.getId()).stream()
-			.map(zzim -> createMoimOverview(zzim.getMoim(), darakbangMember))
-			.toList();
+		Set<Long> zzimMoimIds = zzimRepository.findAllByDarakbangMemberId(darakbangMember.getId());
+		List<Moim> moims = moimRepository.findAllByIds(zzimMoimIds);
+		List<ChamyoMoim> chamyoMoims = chamyoRepository.findAllByMoims(moims);
+
+		return createMoimOverview(moims, chamyoMoims, zzimMoimIds);
 	}
 
-	private MoimOverview createMoimOverview(Moim moim, DarakbangMember darakbangMember) {
-		int currentPeople = countCurrentPeople(moim);
-		boolean isZzimed = zzimFinder.isMoimZzimedByMember(moim.getId(), darakbangMember);
+	private List<MoimOverview> createMoimOverview(List<Moim> moims, List<ChamyoMoim> chamyoMoims,
+		Set<Long> zzimedMoimIds) {
+		Map<Long, Long> chamyoMap = chamyoMoims.stream()
+			.collect(Collectors.toMap(ChamyoMoim::getMoimId, ChamyoMoim::getChamyoCount));
 
-		return new MoimOverview(moim, currentPeople, isZzimed);
+		return moims.stream()
+			.map(moim -> new MoimOverview(
+				moim,
+				chamyoMap.getOrDefault(moim.getId(), 0L),
+				zzimedMoimIds.contains(moim.getId())
+			))
+			.toList();
 	}
 
 	public int countCurrentPeople(Moim moim) {

backend/src/main/java/mouda/backend/moim/infrastructure/ChamyoRepository.java

@@ -9,6 +9,7 @@
 
 import mouda.backend.moim.domain.Chamyo;
 import mouda.backend.moim.domain.Moim;
+import mouda.backend.moim.infrastructure.dto.ChamyoMoim;
 
 public interface ChamyoRepository extends JpaRepository<Chamyo, Long> {
 
@@ -36,4 +37,32 @@ public interface ChamyoRepository extends JpaRepository<Chamyo, Long> {
 
 	@Query("SELECT c FROM Chamyo c WHERE c.moim.id = :moimId AND c.moimRole = 'MOIMER'")
 	Optional<Chamyo> findMoimerByMoimId(@Param("moimId") Long moimId);
+
+	@Query("""
+		SELECT new mouda.backend.moim.infrastructure.dto.ChamyoMoim(
+			c.moim.id,
+			(SELECT COUNT(c2)
+			FROM Chamyo c2
+			WHERE c2.moim = c.moim)
+		)
+		FROM Chamyo c
+		WHERE c.darakbangMember.id = :darakbangMemberId
+		GROUP BY c.moim
+		ORDER BY c.moim.id DESC
+		""")
+	List<ChamyoMoim> findAllByDarakbangMemberId(long darakbangMemberId);
+
+	@Query("""
+		SELECT new mouda.backend.moim.infrastructure.dto.ChamyoMoim(
+			c.moim.id,
+			(SELECT COUNT(c2)
+			FROM Chamyo c2
+			WHERE c2.moim = c.moim)
+		)
+		FROM Chamyo c
+		WHERE c.moim IN :moims
+		GROUP BY c.moim
+		ORDER BY c.moim.id DESC
+		""")
+	List<ChamyoMoim> findAllByMoims(List<Moim> moims);
 }

backend/src/main/java/mouda/backend/moim/infrastructure/MoimRepository.java

@@ -2,13 +2,13 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import mouda.backend.darakbang.domain.Darakbang;
 import mouda.backend.moim.domain.Moim;
 import mouda.backend.moim.domain.MoimStatus;
 
@@ -33,4 +33,11 @@ public interface MoimRepository extends JpaRepository<Moim, Long> {
 
 	boolean existsByIdAndDarakbangId(Long moimId, Long darakbangId);
 
+	@Query("""
+			SELECT m
+			FROM Moim m
+			WHERE m.id IN :moimIds
+			ORDER BY m.id DESC
+		""")
+	List<Moim> findAllByIds(Set<Long> moimIds);
 }

backend/src/main/java/mouda/backend/moim/infrastructure/ZzimRepository.java

@@ -2,8 +2,10 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import mouda.backend.moim.domain.Zzim;
 
@@ -14,4 +16,13 @@ public interface ZzimRepository extends JpaRepository<Zzim, Long> {
 	Optional<Zzim> findByMoimIdAndDarakbangMemberId(Long moimId, Long darakbangMemberId);
 
 	List<Zzim> findAllByDarakbangMemberIdOrderByIdDesc(Long darakbangMemberId);
+
+	@Query("""		
+		SELECT
+			z.moim.id
+		FROM Zzim z
+		WHERE z.darakbangMember.id = :darakbangMemberId
+		ORDER BY z.id DESC
+		""")
+	Set<Long> findAllByDarakbangMemberId(long darakbangMemberId);
 }

backend/src/main/java/mouda/backend/moim/infrastructure/dto/ChamyoMoim.java

@@ -0,0 +1,13 @@
+package mouda.backend.moim.infrastructure.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+
+@Getter
+@EqualsAndHashCode
+@AllArgsConstructor
+public class ChamyoMoim {
+	private final long moimId;
+	private final long chamyoCount;
+}