Merge pull request #246 from CEOS-Developers/dev

merge dev

Author: Gothax

src/main/java/ceos/backend/domain/application/repository/ApplicationInterviewRepository.java

@@ -5,7 +5,16 @@
 import ceos.backend.domain.application.domain.ApplicationInterview;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface ApplicationInterviewRepository extends JpaRepository<ApplicationInterview, Long> {
     List<ApplicationInterview> findAllByApplication(Application application);
+
+    @Query(
+            "select ai from ApplicationInterview ai"
+                    + " join fetch ai.interview"
+                    + " where ai.application = :application")
+    List<ApplicationInterview> findAllByApplicationFetchInterview(
+            @Param("application") Application application);
 }

src/main/java/ceos/backend/infra/ses/ApplicationEmailRetryScheduler.java

@@ -11,7 +11,6 @@
 import ceos.backend.infra.ses.domain.EmailType;
 import ceos.backend.infra.ses.domain.SendStatus;
 import ceos.backend.infra.ses.repository.EmailSendHistoryRepository;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -20,6 +19,8 @@
 import org.springframework.stereotype.Component;
 import org.thymeleaf.context.Context;
 
+import java.util.List;
+
 @Slf4j
 @Component
 @RequiredArgsConstructor
@@ -59,7 +60,8 @@ public void retryFailedApplicationEmails() {
                 final List<ApplicationAnswer> answers =
                         applicationAnswerRepository.findAllByApplication(application);
                 final List<ApplicationInterview> interviews =
-                        applicationInterviewRepository.findAllByApplication(application);
+                        applicationInterviewRepository.findAllByApplicationFetchInterview(
+                                application);
                 final Context context =
                         awsSESMailGenerator.generateApplicationMailContext(
                                 application, answers, interviews);