From ed8a743f380ac5ffeffb2076b41ec1261a1b8108 Mon Sep 17 00:00:00 2001
From: fakerdeft <whakswp123@naver.com>
Date: Wed, 8 May 2024 23:36:00 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B8=B0=EC=97=85=20=EC=83=81=EC=84=B8?=
 =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20API=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=ED=96=88=EC=8A=B5=EB=8B=88=EB=8B=A4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/coverflow/company/infrastructure/CompanyRepository.java | 1 +
 .../question/infrastructure/QuestionCustomRepositoryImpl.java   | 2 ++
 .../coverflow/question/infrastructure/QuestionRepository.java   | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/src/main/java/com/coverflow/company/infrastructure/CompanyRepository.java b/src/main/java/com/coverflow/company/infrastructure/CompanyRepository.java
index bfa14308..56503b23 100644
--- a/src/main/java/com/coverflow/company/infrastructure/CompanyRepository.java
+++ b/src/main/java/com/coverflow/company/infrastructure/CompanyRepository.java
@@ -18,6 +18,7 @@ public interface CompanyRepository extends JpaRepository<Company, Long>, Company
     @Query("""
             SELECT c
             FROM Company c
+            JOIN FETCH c.questions
             WHERE c.id = :companyId
             AND c.companyStatus = 'REGISTRATION'
             """)
diff --git a/src/main/java/com/coverflow/question/infrastructure/QuestionCustomRepositoryImpl.java b/src/main/java/com/coverflow/question/infrastructure/QuestionCustomRepositoryImpl.java
index 98f0425d..e43d4ff5 100644
--- a/src/main/java/com/coverflow/question/infrastructure/QuestionCustomRepositoryImpl.java
+++ b/src/main/java/com/coverflow/question/infrastructure/QuestionCustomRepositoryImpl.java
@@ -64,6 +64,7 @@ public Optional<Page<Question>> findRegisteredQuestionsById(
         CompletableFuture<List<Question>> questionsFuture = CompletableFuture.supplyAsync(() ->
                 jpaQueryFactory
                         .selectFrom(question)
+                        .leftJoin(question.answers).fetchJoin()
                         .where(
                                 question.company.id.eq(companyId),
                                 question.questionStatus.eq(true),
@@ -72,6 +73,7 @@ public Optional<Page<Question>> findRegisteredQuestionsById(
                         .offset(pageable.getOffset())
                         .limit(pageable.getPageSize())
                         .orderBy(makeOrderSpecifiers(question, pageable))
+                        .distinct()
                         .fetch()
         );
 
diff --git a/src/main/java/com/coverflow/question/infrastructure/QuestionRepository.java b/src/main/java/com/coverflow/question/infrastructure/QuestionRepository.java
index 2c1d3fe1..f051f212 100644
--- a/src/main/java/com/coverflow/question/infrastructure/QuestionRepository.java
+++ b/src/main/java/com/coverflow/question/infrastructure/QuestionRepository.java
@@ -17,6 +17,7 @@ public interface QuestionRepository extends JpaRepository<Question, Long>, Quest
     @Query("""
             SELECT q
             FROM Question q
+            JOIN FETCH q.answers
             WHERE q.member.id = :memberId
             AND q.questionStatus = true
             ORDER BY q.createdAt DESC
@@ -29,6 +30,7 @@ Optional<Page<Question>> findRegisteredQuestionsByMemberId(
     @Query("""
             SELECT DISTINCT q
             FROM Question q
+            JOIN FETCH q.answers
             WHERE q.id = :questionId
             AND q.questionStatus = true
             """)