🔗 :: (#445) fetch join으로 인한 in query 문제

Team-return · Nov 12, 2023 · 4eaa116 · 4eaa116
2 parents 191ace5 + d24e2b9
commit 4eaa116
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/...va/team/retum/jobis/domain/recruitment/dto/response/TeacherQueryRecruitmentsResponse.java b/...va/team/retum/jobis/domain/recruitment/dto/response/TeacherQueryRecruitmentsResponse.java
@@ -29,5 +29,6 @@ public static class TeacherRecruitmentResponse {
         private LocalDate start;
         private LocalDate end;
         private Boolean militarySupport;
+        private Long companyId;
     }
 }
diff --git a/...s-application/src/main/java/team/retum/jobis/domain/recruitment/spi/vo/RecruitmentVO.java b/...s-application/src/main/java/team/retum/jobis/domain/recruitment/spi/vo/RecruitmentVO.java
@@ -25,5 +25,6 @@ public class RecruitmentVO {
     private final Long requestedApplicationCount;
     private final Long approvedApplicationCount;
     private final Long isBookmarked;
+    private final Long companyId;
 
 }
diff --git a/...ain/java/team/retum/jobis/domain/recruitment/usecase/TeacherQueryRecruitmentsUseCase.java b/...ain/java/team/retum/jobis/domain/recruitment/usecase/TeacherQueryRecruitmentsUseCase.java
@@ -50,6 +50,7 @@ public TeacherQueryRecruitmentsResponse execute(String companyName, LocalDate st
                                         .applicationApprovedCount(recruitment.getApprovedApplicationCount())
                                         .recruitmentCount(recruitment.getTotalHiring())
                                         .recruitmentJob(getJobKeywords(recruitment.getJobCodes()))
+                                        .companyId(recruitment.getCompanyId())
                                         .build()
                         ).toList();
 

diff --git a/...n/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java b/...n/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java
@@ -200,7 +200,7 @@ public void deleteApplicationByIds(List<Long> applicationIds) {
 
     @Override
     public List<Application> queryApplicationsByIds(List<Long> applicationIds) {
-        return applicationJpaRepository.findAllByIdIn(applicationIds).stream()
+        return applicationJpaRepository.findByIdIn(applicationIds).stream()
                 .map(applicationMapper::toDomain)
                 .toList();
     }

diff --git a/.../team/retum/jobis/domain/application/persistence/repository/ApplicationJpaRepository.java b/.../team/retum/jobis/domain/application/persistence/repository/ApplicationJpaRepository.java
@@ -9,8 +9,7 @@
 
 public interface ApplicationJpaRepository extends JpaRepository<ApplicationEntity, Long> {
 
-    @Query("select a from ApplicationEntity a join fetch a.attachments where a.id in(?1)")
-    List<ApplicationEntity> findAllByIdIn(List<Long> applicationIds);
+    List<ApplicationEntity> findByIdIn(List<Long> applicationIds);
 
     void deleteByIdIn(List<Long> applicationIds);
 

diff --git a/...jobis/domain/application/presentation/dto/request/ChangeApplicationsStatusWebRequest.java b/...jobis/domain/application/presentation/dto/request/ChangeApplicationsStatusWebRequest.java
@@ -3,7 +3,6 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import team.retum.jobis.domain.application.model.ApplicationStatus;
-import team.retum.jobis.global.annotation.ValidListElements;
 
 import javax.validation.constraints.NotNull;
 import java.util.List;
@@ -12,8 +11,8 @@
 @NoArgsConstructor
 public class ChangeApplicationsStatusWebRequest {
 
-    @ValidListElements
-    private List<Long> applicationIds;
+    @NotNull
+    private List<@NotNull Long> applicationIds;
 
     @NotNull
     private ApplicationStatus status;

diff --git a/...n/java/team/retum/jobis/domain/recruitment/persistence/RecruitmentPersistenceAdapter.java b/...n/java/team/retum/jobis/domain/recruitment/persistence/RecruitmentPersistenceAdapter.java
@@ -72,7 +72,8 @@ public List<RecruitmentVO> queryRecruitmentsByFilter(RecruitmentFilter filter) {
                                 recruitAreaEntity.hiredCount.sum(),
                                 requestedApplication.countDistinct(),
                                 approvedApplication.countDistinct(),
-                                bookmarkEntity.count()
+                                bookmarkEntity.count(),
+                                companyEntity.id
                         )
                 )
                 .from(recruitmentEntity)
@@ -137,6 +138,7 @@ public Long getRecruitmentCountByFilter(RecruitmentFilter filter) {
                 .select(recruitmentEntity.count())
                 .from(recruitmentEntity)
                 .join(recruitmentEntity.company, companyEntity)
+                .join(recruitmentEntity.recruitAreas, recruitAreaEntity)
                 .where(
                         eqYear(filter.getYear()),
                         betweenRecruitDate(filter.getStartDate(), filter.getEndDate()),

diff --git a/...va/team/retum/jobis/domain/recruitment/persistence/repository/vo/QueryRecruitmentsVO.java b/...va/team/retum/jobis/domain/recruitment/persistence/repository/vo/QueryRecruitmentsVO.java
@@ -16,9 +16,9 @@ public QueryRecruitmentsVO(Long recruitmentId, RecruitStatus recruitStatus, Loca
                                LocalDate endDate, String companyName, CompanyType companyType,
                                Integer trainPay, boolean militarySupport, String companyLogoUrl,
                                String jobCodes, Integer totalHiring, Long requestedApplicationCount,
-                               Long approvedApplicationCount, Long isBookmarked) {
+                               Long approvedApplicationCount, Long isBookmarked, Long companyId) {
         super(recruitmentId, recruitStatus, startDate, endDate, companyName,
                 companyType, trainPay, militarySupport, companyLogoUrl, jobCodes,
-                totalHiring, requestedApplicationCount, approvedApplicationCount, isBookmarked);
+                totalHiring, requestedApplicationCount, approvedApplicationCount, isBookmarked, companyId);
     }
 }