From fabb6225a2e7122bd59ad54b2f7d4952b0b6a93d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B8=B8=EA=B7=BC=EC=9A=B0?= Date: Thu, 18 Apr 2024 10:25:23 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20::=20(#643)=20?= =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spi/CommandApplicationPort.java | 10 ++-- .../application/spi/QueryApplicationPort.java | 23 ++++---- .../ChangeApplicationsStatusUseCase.java | 4 +- .../usecase/ChangeFieldTrainDateUseCase.java | 2 +- .../CompanyQueryApplicationsUseCase.java | 2 +- .../usecase/CreateApplicationUseCase.java | 6 +-- .../usecase/DeleteApplicationUseCase.java | 5 +- .../usecase/QueryMyApplicationsUseCase.java | 2 +- ...QueryPassedApplicationStudentsUseCase.java | 2 +- .../usecase/QueryRejectionReasonUseCase.java | 3 +- .../application/usecase/ReapplyUseCase.java | 5 +- .../usecase/RejectApplicationUseCase.java | 5 +- .../TeacherQueryApplicationsUseCase.java | 4 +- .../ApplicationPersistenceAdapter.java | 52 ++++++++++--------- 14 files changed, 61 insertions(+), 64 deletions(-) diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/CommandApplicationPort.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/CommandApplicationPort.java index e44964eb1..c874dcb91 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/CommandApplicationPort.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/CommandApplicationPort.java @@ -8,17 +8,17 @@ public interface CommandApplicationPort { - Application saveApplication(Application application); + Application save(Application application); - void deleteApplicationByIds(List applicationIds); + void deleteByIds(List applicationIds); - void deleteApplication(Application application); + void delete(Application application); - void changeApplicationStatus(ApplicationStatus status, List applicationIds); + void updateApplicationStatus(ApplicationStatus status, List applicationIds); void updateFieldTrainDate(LocalDate startDate, LocalDate endDate, List applicationIds); - void saveAllApplications(List applications); + void saveAll(List applications); void deleteAllAttachmentByApplicationId(Long applicationId); } diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java index fcd5f4303..91b20adf7 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java @@ -9,29 +9,28 @@ import team.retum.jobis.domain.application.spi.vo.PassedApplicationStudentsVO; import java.util.List; -import java.util.Optional; public interface QueryApplicationPort { - List queryApplicationByConditions(ApplicationFilter applicationFilter); + List getByConditions(ApplicationFilter applicationFilter); - Long queryApplicationCountByCondition(ApplicationStatus applicationStatus, String studentName); + Long getCountByCondition(ApplicationStatus applicationStatus, String studentName); - List queryApplicationsFieldTraineesByCompanyId(Long companyId); + List getApplicationsFieldTraineesByCompanyId(Long companyId); - List queryPassedApplicationStudentsByCompanyId(Long companyId); + List getPassedApplicationStudentsByCompanyId(Long companyId); - List queryApplicationsByIds(List applicationIds); + List getByIds(List applicationIds); - List queryApplicationDetailsByIds(List applicationIds); + List getDetailsByIds(List applicationIds); - Optional queryApplicationById(Long applicationId); + Application getByIdOrThrow(Long applicationId); - Optional queryApplicationByIdAndApplicationStatus(Long applicationId, ApplicationStatus applicationStatus); + Application getByIdAndApplicationStatusOrThrow(Long applicationId, ApplicationStatus applicationStatus); - Optional queryApplicationByCompanyIdAndStudentId(Long applicationId, Long studentId); + Application getByCompanyIdAndStudentIdOrThrow(Long applicationId, Long studentId); - boolean existsApplicationByStudentIdAndApplicationStatusIn(Long studentId, List applicationStatuses); + boolean existsByStudentIdAndApplicationStatusIn(Long studentId, List applicationStatuses); - boolean existsApplicationByStudentIdAndRecruitmentId(Long studentId, Long recruitmentId); + boolean existsByStudentIdAndRecruitmentId(Long studentId, Long recruitmentId); } diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java index 64155f083..9347c1c0d 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java @@ -21,13 +21,13 @@ public class ChangeApplicationsStatusUseCase { private final PublishEventPort publishEventPort; public void execute(List applicationIds, ApplicationStatus status) { - List applications = queryApplicationPort.queryApplicationsByIds(applicationIds); + List applications = queryApplicationPort.getByIds(applicationIds); if (applicationIds.size() != applications.size()) { throw ApplicationNotFoundException.EXCEPTION; } - commandApplicationPort.changeApplicationStatus(status, applicationIds); + commandApplicationPort.updateApplicationStatus(status, applicationIds); publishEventPort.publishEvent(new ApplicationsStatusChangedEvent(applications, status)); } } diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java index d410a7f07..8347c6328 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java @@ -18,7 +18,7 @@ public class ChangeFieldTrainDateUseCase { private final CommandApplicationPort commandApplicationPort; public void execute(ChangeFieldTrainDateRequest request) { - List applications = queryApplicationPort.queryApplicationsByIds(request.applicationIds()); + List applications = queryApplicationPort.getByIds(request.applicationIds()); applications.forEach( application -> Application.checkApplicationStatus( diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/CompanyQueryApplicationsUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/CompanyQueryApplicationsUseCase.java index a66869a07..a4e6c2f24 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/CompanyQueryApplicationsUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/CompanyQueryApplicationsUseCase.java @@ -32,7 +32,7 @@ public CompanyQueryApplicationsResponse execute() { .applicationStatus(ApplicationStatus.SEND) .build(); - List applicationVOs = queryApplicationPort.queryApplicationByConditions(applicationFilter); + List applicationVOs = queryApplicationPort.getByConditions(applicationFilter); return CompanyQueryApplicationsResponse.of(applicationVOs); } diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/CreateApplicationUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/CreateApplicationUseCase.java index e78f20ccd..d50267d58 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/CreateApplicationUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/CreateApplicationUseCase.java @@ -34,7 +34,7 @@ public void execute(Long recruitmentId, List attachmentReques checkApplicationAlreadyApply(student.getId(), recruitment.getId()); List attachments = ApplicationAttachment.from(attachmentRequests); - commandApplicationPort.saveApplication( + commandApplicationPort.save( Application.builder() .studentId(student.getId()) .recruitmentId(recruitment.getId()) @@ -45,7 +45,7 @@ public void execute(Long recruitmentId, List attachmentReques } private void checkApplicationDuplicated(Long studentId) { - if (queryApplicationPort.existsApplicationByStudentIdAndApplicationStatusIn( + if (queryApplicationPort.existsByStudentIdAndApplicationStatusIn( studentId, ApplicationStatus.DUPLICATE_CHECK )) { @@ -54,7 +54,7 @@ private void checkApplicationDuplicated(Long studentId) { } private void checkApplicationAlreadyApply(Long studentId, Long recruitmentId) { - if (queryApplicationPort.existsApplicationByStudentIdAndRecruitmentId(studentId, recruitmentId)) { + if (queryApplicationPort.existsByStudentIdAndRecruitmentId(studentId, recruitmentId)) { throw ApplicationAlreadyExistsException.EXCEPTION; } } diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/DeleteApplicationUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/DeleteApplicationUseCase.java index cfc34e404..c0315e32f 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/DeleteApplicationUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/DeleteApplicationUseCase.java @@ -19,11 +19,10 @@ public class DeleteApplicationUseCase { public void execute(Long applicationId) { Student student = securityPort.getCurrentStudent(); - Application application = queryApplicationPort.queryApplicationById(applicationId) - .orElseThrow(() -> ApplicationNotFoundException.EXCEPTION); + Application application = queryApplicationPort.getByIdOrThrow(applicationId); application.checkIsDeletable(student); - commandApplicationPort.deleteApplication(application); + commandApplicationPort.delete(application); } } diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryMyApplicationsUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryMyApplicationsUseCase.java index 667dbe03f..9e9509338 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryMyApplicationsUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryMyApplicationsUseCase.java @@ -27,7 +27,7 @@ public QueryMyApplicationsResponse execute() { .year(Year.now()) .build(); - List applicationVOs = queryApplicationPort.queryApplicationByConditions(applicationFilter); + List applicationVOs = queryApplicationPort.getByConditions(applicationFilter); return QueryMyApplicationsResponse.from(applicationVOs); } diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryPassedApplicationStudentsUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryPassedApplicationStudentsUseCase.java index 17382deb3..c204bec93 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryPassedApplicationStudentsUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryPassedApplicationStudentsUseCase.java @@ -13,7 +13,7 @@ public class QueryPassedApplicationStudentsUseCase { public QueryPassedApplicationStudentsResponse execute(Long companyId) { return new QueryPassedApplicationStudentsResponse( - queryApplicationPort.queryPassedApplicationStudentsByCompanyId(companyId).stream() + queryApplicationPort.getPassedApplicationStudentsByCompanyId(companyId).stream() .map(QueryPassedApplicationStudentsResponse::from) .toList() ); diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryRejectionReasonUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryRejectionReasonUseCase.java index 877849805..697415e63 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryRejectionReasonUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryRejectionReasonUseCase.java @@ -15,8 +15,7 @@ public class QueryRejectionReasonUseCase { private final QueryApplicationPort queryApplicationPort; public QueryRejectionReasonResponse execute(Long applicationId) { - Application application = queryApplicationPort.queryApplicationByIdAndApplicationStatus(applicationId, ApplicationStatus.REJECTED) - .orElseThrow(() -> ApplicationNotFoundException.EXCEPTION); + Application application = queryApplicationPort.getByIdAndApplicationStatusOrThrow(applicationId, ApplicationStatus.REJECTED); return new QueryRejectionReasonResponse(application.getRejectionReason()); } diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ReapplyUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ReapplyUseCase.java index b667ef7be..602772762 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ReapplyUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ReapplyUseCase.java @@ -20,8 +20,7 @@ public class ReapplyUseCase { private final CommandApplicationPort commandApplicationPort; public void execute(Long applicationId, List attachmentRequests) { - Application application = queryApplicationPort.queryApplicationById(applicationId) - .orElseThrow(() -> ApplicationNotFoundException.EXCEPTION); + Application application = queryApplicationPort.getByIdOrThrow(applicationId); Application.checkApplicationStatus( application.getApplicationStatus(), @@ -29,7 +28,7 @@ public void execute(Long applicationId, List attachmentReques ); commandApplicationPort.deleteAllAttachmentByApplicationId(applicationId); - commandApplicationPort.saveApplication( + commandApplicationPort.save( application.reapply(ApplicationAttachment.from(attachmentRequests)) ); } diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/RejectApplicationUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/RejectApplicationUseCase.java index 3439ffc58..7a3229ba6 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/RejectApplicationUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/RejectApplicationUseCase.java @@ -15,10 +15,9 @@ public class RejectApplicationUseCase { private final CommandApplicationPort commandApplicationPort; public void execute(Long applicationId, String rejectReason) { - Application application = queryApplicationPort.queryApplicationById(applicationId) - .orElseThrow(() -> ApplicationNotFoundException.EXCEPTION); + Application application = queryApplicationPort.getByIdOrThrow(applicationId); - commandApplicationPort.saveApplication( + commandApplicationPort.save( application.rejectApplication(rejectReason) ); } diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/TeacherQueryApplicationsUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/TeacherQueryApplicationsUseCase.java index bb09cb84d..0ef6b4d78 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/TeacherQueryApplicationsUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/TeacherQueryApplicationsUseCase.java @@ -32,7 +32,7 @@ public TeacherQueryApplicationsResponse execute( .year(year) .build(); - List applicationVOs = queryApplicationPort.queryApplicationByConditions(applicationFilter); + List applicationVOs = queryApplicationPort.getByConditions(applicationFilter); return TeacherQueryApplicationsResponse.of(applicationVOs); } @@ -40,7 +40,7 @@ public TeacherQueryApplicationsResponse execute( public TotalPageCountResponse getTotalPageCount(ApplicationStatus applicationStatus, String studentName) { return new TotalPageCountResponse( NumberUtil.getTotalPageCount( - queryApplicationPort.queryApplicationCountByCondition(applicationStatus, studentName), 11 + queryApplicationPort.getCountByCondition(applicationStatus, studentName), 11 ) ); } diff --git a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java index d4cf75554..8a5c9ce15 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java +++ b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java @@ -5,6 +5,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; import team.retum.jobis.domain.application.dto.ApplicationFilter; +import team.retum.jobis.domain.application.exception.ApplicationNotFoundException; import team.retum.jobis.domain.application.model.Application; import team.retum.jobis.domain.application.model.ApplicationAttachment; import team.retum.jobis.domain.application.model.ApplicationStatus; @@ -46,7 +47,7 @@ public class ApplicationPersistenceAdapter implements ApplicationPort { private final JPAQueryFactory queryFactory; @Override - public List queryApplicationByConditions(ApplicationFilter applicationFilter) { + public List getByConditions(ApplicationFilter applicationFilter) { return queryFactory .selectFrom(applicationEntity) .join(applicationEntity.student, studentEntity) @@ -107,7 +108,7 @@ public List queryApplicationByConditions(ApplicationFilter applic } @Override - public Long queryApplicationCountByCondition(ApplicationStatus applicationStatus, String studentName) { + public Long getCountByCondition(ApplicationStatus applicationStatus, String studentName) { return queryFactory .select(applicationEntity.count()) .from(applicationEntity) @@ -119,7 +120,7 @@ public Long queryApplicationCountByCondition(ApplicationStatus applicationStatus } @Override - public List queryApplicationsFieldTraineesByCompanyId(Long companyId) { + public List getApplicationsFieldTraineesByCompanyId(Long companyId) { return queryFactory .select( new QQueryFieldTraineesVO( @@ -144,7 +145,7 @@ public List queryApplicationsFieldTraineesByCompanyId(Long comp } @Override - public List queryPassedApplicationStudentsByCompanyId(Long companyId) { + public List getPassedApplicationStudentsByCompanyId(Long companyId) { return queryFactory .select( new QQueryPassedApplicationStudentsVO( @@ -169,26 +170,26 @@ public List queryPassedApplicationStudentsByCompany } @Override - public Application saveApplication(Application application) { + public Application save(Application application) { return applicationMapper.toDomain( applicationJpaRepository.save(applicationMapper.toEntity(application)) ); } @Override - public void deleteApplicationByIds(List applicationIds) { + public void deleteByIds(List applicationIds) { applicationJpaRepository.deleteByIdIn(applicationIds); } @Override - public List queryApplicationsByIds(List applicationIds) { + public List getByIds(List applicationIds) { return applicationJpaRepository.findByIdIn(applicationIds).stream() .map(applicationMapper::toDomain) .toList(); } @Override - public List queryApplicationDetailsByIds(List applicationIds) { + public List getDetailsByIds(List applicationIds) { return queryFactory .select( new QQueryApplicationDetailVO( @@ -210,45 +211,46 @@ public List queryApplicationDetailsByIds(List applica } @Override - public Optional queryApplicationById(Long applicationId) { + public Application getByIdOrThrow(Long applicationId) { return applicationJpaRepository.findByIdFetch(applicationId) - .map(applicationMapper::toDomain); + .map(applicationMapper::toDomain) + .orElseThrow(() -> ApplicationNotFoundException.EXCEPTION); } @Override - public Optional queryApplicationByIdAndApplicationStatus(Long applicationId, ApplicationStatus applicationStatus) { - return Optional.ofNullable( - queryFactory + public Application getByIdAndApplicationStatusOrThrow(Long applicationId, ApplicationStatus applicationStatus) { + return Optional.ofNullable(queryFactory .selectFrom(applicationEntity) .where( applicationEntity.id.eq(applicationId), applicationEntity.applicationStatus.eq(applicationStatus) ) - .fetchOne() - ).map(applicationMapper::toDomain); + .fetchOne()) + .map(applicationMapper::toDomain) + .orElseThrow(() -> ApplicationNotFoundException.EXCEPTION); } @Override - public Optional queryApplicationByCompanyIdAndStudentId(Long companyId, Long studentId) { - return Optional.ofNullable( - queryFactory + public Application getByCompanyIdAndStudentIdOrThrow(Long companyId, Long studentId) { + return Optional.ofNullable(queryFactory .selectFrom(applicationEntity) .join(applicationEntity.recruitment, recruitmentEntity) .on(recruitmentEntity.company.id.eq(companyId)) .where(applicationEntity.student.id.eq(studentId)) - .fetchFirst() - ).map(applicationMapper::toDomain); + .fetchFirst()) + .map(applicationMapper::toDomain) + .orElseThrow(() -> ApplicationNotFoundException.EXCEPTION); } @Override - public void deleteApplication(Application application) { + public void delete(Application application) { applicationJpaRepository.delete( applicationMapper.toEntity(application) ); } @Override - public void changeApplicationStatus(ApplicationStatus status, List applicationIds) { + public void updateApplicationStatus(ApplicationStatus status, List applicationIds) { queryFactory .update(applicationEntity) .set(applicationEntity.applicationStatus, status) @@ -268,7 +270,7 @@ public void updateFieldTrainDate(LocalDate startDate, LocalDate endDate, List applicationStatuses ) { @@ -283,7 +285,7 @@ public boolean existsApplicationByStudentIdAndApplicationStatusIn( } @Override - public boolean existsApplicationByStudentIdAndRecruitmentId(Long studentId, Long recruitmentId) { + public boolean existsByStudentIdAndRecruitmentId(Long studentId, Long recruitmentId) { return queryFactory .selectOne() .from(applicationEntity) @@ -294,7 +296,7 @@ public boolean existsApplicationByStudentIdAndRecruitmentId(Long studentId, Long } @Override - public void saveAllApplications(List applications) { + public void saveAll(List applications) { applicationJpaRepository.saveAll( applications.stream() .map(applicationMapper::toEntity) From fa77364bb041d03bdd551fd591f733184857292b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B8=B8=EA=B7=BC=EC=9A=B0?= Date: Thu, 18 Apr 2024 10:31:19 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20::=20(#643)=20useca?= =?UTF-8?q?se=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/acceptance/usecase/CancelFieldTraineesUseCase.java | 4 ++-- .../acceptance/usecase/RegisterEmploymentContractUseCase.java | 4 ++-- .../acceptance/usecase/RegisterFieldTraineeUseCase.java | 4 ++-- .../TeacherQueryFieldTraineesAndContractWorkersUseCase.java | 2 +- .../recruitment/usecase/QueryRecruitmentDetailUseCase.java | 2 +- .../jobis/domain/review/usecase/CreateReviewUseCase.java | 3 +-- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java index 49861996a..c9e8a4a70 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java @@ -18,7 +18,7 @@ public class CancelFieldTraineesUseCase { private final CommandApplicationPort commandApplicationPort; public void execute(List applicationIds) { - List applications = applicationRepository.queryApplicationsByIds(applicationIds); + List applications = applicationRepository.getByIds(applicationIds); if (applicationIds.size() != applications.size()) { throw ApplicationNotFoundException.EXCEPTION; @@ -31,7 +31,7 @@ public void execute(List applicationIds) { ) ); - commandApplicationPort.changeApplicationStatus( + commandApplicationPort.updateApplicationStatus( ApplicationStatus.PASS, applicationIds ); diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterEmploymentContractUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterEmploymentContractUseCase.java index d110703f6..5c3007766 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterEmploymentContractUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterEmploymentContractUseCase.java @@ -24,7 +24,7 @@ public class RegisterEmploymentContractUseCase { private final CommandApplicationPort commandApplicationPort; public void execute(List codeKeywords, List applicationIds) { - List applications = applicationRepository.queryApplicationDetailsByIds(applicationIds); + List applications = applicationRepository.getDetailsByIds(applicationIds); if (applications.size() != applicationIds.size()) { throw ApplicationNotFoundException.EXCEPTION; } @@ -49,7 +49,7 @@ public void execute(List codeKeywords, List applicationIds) { ).toList(); commandAcceptancePort.saveAll(acceptances); - commandApplicationPort.changeApplicationStatus( + commandApplicationPort.updateApplicationStatus( ApplicationStatus.ACCEPTANCE, applications.stream().map(ApplicationDetailVO::getId).toList() ); diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java index abaafdf45..5622e5ba5 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java @@ -18,7 +18,7 @@ public class RegisterFieldTraineeUseCase { private final QueryApplicationPort queryApplicationPort; public void execute(RegisterFieldTraineeRequest request) { - List applications = queryApplicationPort.queryApplicationsByIds(request.applicationIds()); + List applications = queryApplicationPort.getByIds(request.applicationIds()); if (request.applicationIds().size() != applications.size()) { throw ApplicationNotFoundException.EXCEPTION; } @@ -28,6 +28,6 @@ public void execute(RegisterFieldTraineeRequest request) { application.toFieldTrain(request.startDate(), request.endDate()) ).toList(); - commandApplicationPort.saveAllApplications(converted); + commandApplicationPort.saveAll(converted); } } diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/TeacherQueryFieldTraineesAndContractWorkersUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/TeacherQueryFieldTraineesAndContractWorkersUseCase.java index 298e77fb2..dd81ba007 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/TeacherQueryFieldTraineesAndContractWorkersUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/TeacherQueryFieldTraineesAndContractWorkersUseCase.java @@ -21,7 +21,7 @@ public class TeacherQueryFieldTraineesAndContractWorkersUseCase { private final QueryAcceptancePort queryAcceptancePort; public TeacherQueryFieldTraineesAndContractWorkersResponse execute(Long companyId) { - List fieldTrainees = queryApplicationPort.queryApplicationsFieldTraineesByCompanyId(companyId); + List fieldTrainees = queryApplicationPort.getApplicationsFieldTraineesByCompanyId(companyId); List acceptances = queryAcceptancePort.getByCompanyIdAndYear(companyId, Year.now().getValue()); return new TeacherQueryFieldTraineesAndContractWorkersResponse( diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/recruitment/usecase/QueryRecruitmentDetailUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/recruitment/usecase/QueryRecruitmentDetailUseCase.java index 4e5972e7e..c44578309 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/recruitment/usecase/QueryRecruitmentDetailUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/recruitment/usecase/QueryRecruitmentDetailUseCase.java @@ -46,7 +46,7 @@ public QueryRecruitmentDetailResponse execute(Long recruitId) { private Boolean getApplicable(boolean winterIntern, long recruitmentId) { if (APPLICABLE_AUTHORITIES.contains(securityPort.getCurrentUserAuthority())) { - if (queryApplicationPort.existsApplicationByStudentIdAndRecruitmentId( + if (queryApplicationPort.existsByStudentIdAndRecruitmentId( securityPort.getCurrentUserId(), recruitmentId) ) { return false; diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/review/usecase/CreateReviewUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/review/usecase/CreateReviewUseCase.java index 0662ef812..1dedafc0c 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/review/usecase/CreateReviewUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/review/usecase/CreateReviewUseCase.java @@ -33,8 +33,7 @@ public void execute(Long companyId, List qnAElements) { checkReviewExists(companyId, student.getId()); - queryApplicationPort.queryApplicationByCompanyIdAndStudentId(company.getId(), student.getId()) - .orElseThrow(() -> ApplicationNotFoundException.EXCEPTION) + queryApplicationPort.getByCompanyIdAndStudentIdOrThrow(company.getId(), student.getId()) .checkReviewAuthority(); Review review = reviewPort.save( From 41b6fe657d69ba8dee03ce25002075177d05a3fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B8=B8=EA=B7=BC=EC=9A=B0?= Date: Fri, 19 Apr 2024 12:11:37 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20::=20(#643)=20?= =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usecase/CancelFieldTraineesUseCase.java | 6 +----- .../usecase/RegisterFieldTraineeUseCase.java | 5 +---- ...ryFieldTraineesAndContractWorkersUseCase.java | 2 +- .../application/spi/QueryApplicationPort.java | 6 +++--- .../usecase/ChangeApplicationsStatusUseCase.java | 6 +----- .../usecase/ChangeFieldTrainDateUseCase.java | 2 +- .../QueryPassedApplicationStudentsUseCase.java | 2 +- .../ApplicationPersistenceAdapter.java | 16 ++++++++++++---- 8 files changed, 21 insertions(+), 24 deletions(-) diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java index c9e8a4a70..6de452f4d 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java @@ -18,11 +18,7 @@ public class CancelFieldTraineesUseCase { private final CommandApplicationPort commandApplicationPort; public void execute(List applicationIds) { - List applications = applicationRepository.getByIds(applicationIds); - - if (applicationIds.size() != applications.size()) { - throw ApplicationNotFoundException.EXCEPTION; - } + List applications = applicationRepository.getByIdsOrThrow(applicationIds); applications.forEach( application -> Application.checkApplicationStatus( diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java index 5622e5ba5..32520a23c 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java @@ -18,10 +18,7 @@ public class RegisterFieldTraineeUseCase { private final QueryApplicationPort queryApplicationPort; public void execute(RegisterFieldTraineeRequest request) { - List applications = queryApplicationPort.getByIds(request.applicationIds()); - if (request.applicationIds().size() != applications.size()) { - throw ApplicationNotFoundException.EXCEPTION; - } + List applications = queryApplicationPort.getByIdsOrThrow(request.applicationIds()); List converted = applications.stream() .map(application -> diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/TeacherQueryFieldTraineesAndContractWorkersUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/TeacherQueryFieldTraineesAndContractWorkersUseCase.java index dd81ba007..4e7ccdbce 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/TeacherQueryFieldTraineesAndContractWorkersUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/TeacherQueryFieldTraineesAndContractWorkersUseCase.java @@ -21,8 +21,8 @@ public class TeacherQueryFieldTraineesAndContractWorkersUseCase { private final QueryAcceptancePort queryAcceptancePort; public TeacherQueryFieldTraineesAndContractWorkersResponse execute(Long companyId) { - List fieldTrainees = queryApplicationPort.getApplicationsFieldTraineesByCompanyId(companyId); List acceptances = queryAcceptancePort.getByCompanyIdAndYear(companyId, Year.now().getValue()); + List fieldTrainees = queryApplicationPort.getFieldTraineesByCompanyId(companyId); return new TeacherQueryFieldTraineesAndContractWorkersResponse( TeacherQueryFieldTraineesResponse.from(fieldTrainees), diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java index 91b20adf7..6316c470a 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java @@ -16,11 +16,11 @@ public interface QueryApplicationPort { Long getCountByCondition(ApplicationStatus applicationStatus, String studentName); - List getApplicationsFieldTraineesByCompanyId(Long companyId); + List getFieldTraineesByCompanyId(Long companyId); - List getPassedApplicationStudentsByCompanyId(Long companyId); + List getPassedStudentsByCompanyId(Long companyId); - List getByIds(List applicationIds); + List getByIdsOrThrow(List applicationIds); List getDetailsByIds(List applicationIds); diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java index 9347c1c0d..b65b45e06 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java @@ -21,11 +21,7 @@ public class ChangeApplicationsStatusUseCase { private final PublishEventPort publishEventPort; public void execute(List applicationIds, ApplicationStatus status) { - List applications = queryApplicationPort.getByIds(applicationIds); - - if (applicationIds.size() != applications.size()) { - throw ApplicationNotFoundException.EXCEPTION; - } + List applications = queryApplicationPort.getByIdsOrThrow(applicationIds); commandApplicationPort.updateApplicationStatus(status, applicationIds); publishEventPort.publishEvent(new ApplicationsStatusChangedEvent(applications, status)); diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java index 8347c6328..8011f569c 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java @@ -18,7 +18,7 @@ public class ChangeFieldTrainDateUseCase { private final CommandApplicationPort commandApplicationPort; public void execute(ChangeFieldTrainDateRequest request) { - List applications = queryApplicationPort.getByIds(request.applicationIds()); + List applications = queryApplicationPort.getByIdsOrThrow(request.applicationIds()); applications.forEach( application -> Application.checkApplicationStatus( diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryPassedApplicationStudentsUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryPassedApplicationStudentsUseCase.java index c204bec93..4c00c9cd5 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryPassedApplicationStudentsUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryPassedApplicationStudentsUseCase.java @@ -13,7 +13,7 @@ public class QueryPassedApplicationStudentsUseCase { public QueryPassedApplicationStudentsResponse execute(Long companyId) { return new QueryPassedApplicationStudentsResponse( - queryApplicationPort.getPassedApplicationStudentsByCompanyId(companyId).stream() + queryApplicationPort.getPassedStudentsByCompanyId(companyId).stream() .map(QueryPassedApplicationStudentsResponse::from) .toList() ); diff --git a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java index 8a5c9ce15..416cac9bb 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java +++ b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java @@ -9,6 +9,7 @@ import team.retum.jobis.domain.application.model.Application; import team.retum.jobis.domain.application.model.ApplicationAttachment; import team.retum.jobis.domain.application.model.ApplicationStatus; +import team.retum.jobis.domain.application.persistence.entity.ApplicationEntity; import team.retum.jobis.domain.application.persistence.mapper.ApplicationMapper; import team.retum.jobis.domain.application.persistence.repository.ApplicationJpaRepository; import team.retum.jobis.domain.application.persistence.repository.vo.QQueryApplicationDetailVO; @@ -120,7 +121,7 @@ public Long getCountByCondition(ApplicationStatus applicationStatus, String stud } @Override - public List getApplicationsFieldTraineesByCompanyId(Long companyId) { + public List getFieldTraineesByCompanyId(Long companyId) { return queryFactory .select( new QQueryFieldTraineesVO( @@ -145,7 +146,7 @@ public List getApplicationsFieldTraineesByCompanyId(Long compan } @Override - public List getPassedApplicationStudentsByCompanyId(Long companyId) { + public List getPassedStudentsByCompanyId(Long companyId) { return queryFactory .select( new QQueryPassedApplicationStudentsVO( @@ -182,8 +183,15 @@ public void deleteByIds(List applicationIds) { } @Override - public List getByIds(List applicationIds) { - return applicationJpaRepository.findByIdIn(applicationIds).stream() + public List getByIdsOrThrow(List applicationIds) { + List applications = applicationJpaRepository.findByIdIn(applicationIds); + + if (applicationIds.size() != applications.size()) { + throw ApplicationNotFoundException.EXCEPTION; + } + + return applications + .stream() .map(applicationMapper::toDomain) .toList(); } From 519d68a14988e6a30924a8d87d93a291248f0efd Mon Sep 17 00:00:00 2001 From: gilgeunwoo Date: Sun, 21 Apr 2024 23:08:07 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20::=20(#643)=20getAl?= =?UTF-8?q?l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/acceptance/usecase/CancelFieldTraineesUseCase.java | 3 +-- .../acceptance/usecase/RegisterFieldTraineeUseCase.java | 3 +-- .../jobis/domain/application/spi/QueryApplicationPort.java | 4 ++-- .../application/usecase/ChangeApplicationsStatusUseCase.java | 3 +-- .../application/usecase/ChangeFieldTrainDateUseCase.java | 2 +- .../application/usecase/CompanyQueryApplicationsUseCase.java | 2 +- .../application/usecase/QueryMyApplicationsUseCase.java | 2 +- .../application/usecase/TeacherQueryApplicationsUseCase.java | 2 +- .../persistence/ApplicationPersistenceAdapter.java | 4 ++-- 9 files changed, 11 insertions(+), 14 deletions(-) diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java index 6de452f4d..8eabf2e35 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java @@ -2,7 +2,6 @@ import lombok.RequiredArgsConstructor; import team.retum.jobis.common.annotation.UseCase; -import team.retum.jobis.domain.application.exception.ApplicationNotFoundException; import team.retum.jobis.domain.application.model.Application; import team.retum.jobis.domain.application.model.ApplicationStatus; import team.retum.jobis.domain.application.spi.CommandApplicationPort; @@ -18,7 +17,7 @@ public class CancelFieldTraineesUseCase { private final CommandApplicationPort commandApplicationPort; public void execute(List applicationIds) { - List applications = applicationRepository.getByIdsOrThrow(applicationIds); + List applications = applicationRepository.getAllByIdsOrThrow(applicationIds); applications.forEach( application -> Application.checkApplicationStatus( diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java index 32520a23c..f86c8d972 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java @@ -3,7 +3,6 @@ import lombok.RequiredArgsConstructor; import team.retum.jobis.common.annotation.UseCase; import team.retum.jobis.domain.acceptance.dto.request.RegisterFieldTraineeRequest; -import team.retum.jobis.domain.application.exception.ApplicationNotFoundException; import team.retum.jobis.domain.application.model.Application; import team.retum.jobis.domain.application.spi.CommandApplicationPort; import team.retum.jobis.domain.application.spi.QueryApplicationPort; @@ -18,7 +17,7 @@ public class RegisterFieldTraineeUseCase { private final QueryApplicationPort queryApplicationPort; public void execute(RegisterFieldTraineeRequest request) { - List applications = queryApplicationPort.getByIdsOrThrow(request.applicationIds()); + List applications = queryApplicationPort.getAllByIdsOrThrow(request.applicationIds()); List converted = applications.stream() .map(application -> diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java index 6316c470a..66ab538ce 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java @@ -12,7 +12,7 @@ public interface QueryApplicationPort { - List getByConditions(ApplicationFilter applicationFilter); + List getAllByConditions(ApplicationFilter applicationFilter); Long getCountByCondition(ApplicationStatus applicationStatus, String studentName); @@ -20,7 +20,7 @@ public interface QueryApplicationPort { List getPassedStudentsByCompanyId(Long companyId); - List getByIdsOrThrow(List applicationIds); + List getAllByIdsOrThrow(List applicationIds); List getDetailsByIds(List applicationIds); diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java index b65b45e06..4ced13864 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java @@ -4,7 +4,6 @@ import team.retum.jobis.common.annotation.UseCase; import team.retum.jobis.common.spi.PublishEventPort; import team.retum.jobis.domain.application.event.ApplicationsStatusChangedEvent; -import team.retum.jobis.domain.application.exception.ApplicationNotFoundException; import team.retum.jobis.domain.application.model.Application; import team.retum.jobis.domain.application.model.ApplicationStatus; import team.retum.jobis.domain.application.spi.CommandApplicationPort; @@ -21,7 +20,7 @@ public class ChangeApplicationsStatusUseCase { private final PublishEventPort publishEventPort; public void execute(List applicationIds, ApplicationStatus status) { - List applications = queryApplicationPort.getByIdsOrThrow(applicationIds); + List applications = queryApplicationPort.getAllByIdsOrThrow(applicationIds); commandApplicationPort.updateApplicationStatus(status, applicationIds); publishEventPort.publishEvent(new ApplicationsStatusChangedEvent(applications, status)); diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java index 8011f569c..f47ff714b 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java @@ -18,7 +18,7 @@ public class ChangeFieldTrainDateUseCase { private final CommandApplicationPort commandApplicationPort; public void execute(ChangeFieldTrainDateRequest request) { - List applications = queryApplicationPort.getByIdsOrThrow(request.applicationIds()); + List applications = queryApplicationPort.getAllByIdsOrThrow(request.applicationIds()); applications.forEach( application -> Application.checkApplicationStatus( diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/CompanyQueryApplicationsUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/CompanyQueryApplicationsUseCase.java index a4e6c2f24..b6f409d04 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/CompanyQueryApplicationsUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/CompanyQueryApplicationsUseCase.java @@ -32,7 +32,7 @@ public CompanyQueryApplicationsResponse execute() { .applicationStatus(ApplicationStatus.SEND) .build(); - List applicationVOs = queryApplicationPort.getByConditions(applicationFilter); + List applicationVOs = queryApplicationPort.getAllByConditions(applicationFilter); return CompanyQueryApplicationsResponse.of(applicationVOs); } diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryMyApplicationsUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryMyApplicationsUseCase.java index 9e9509338..8b3576456 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryMyApplicationsUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryMyApplicationsUseCase.java @@ -27,7 +27,7 @@ public QueryMyApplicationsResponse execute() { .year(Year.now()) .build(); - List applicationVOs = queryApplicationPort.getByConditions(applicationFilter); + List applicationVOs = queryApplicationPort.getAllByConditions(applicationFilter); return QueryMyApplicationsResponse.from(applicationVOs); } diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/TeacherQueryApplicationsUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/TeacherQueryApplicationsUseCase.java index 0ef6b4d78..fcc68f1ac 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/TeacherQueryApplicationsUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/TeacherQueryApplicationsUseCase.java @@ -32,7 +32,7 @@ public TeacherQueryApplicationsResponse execute( .year(year) .build(); - List applicationVOs = queryApplicationPort.getByConditions(applicationFilter); + List applicationVOs = queryApplicationPort.getAllByConditions(applicationFilter); return TeacherQueryApplicationsResponse.of(applicationVOs); } diff --git a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java index 416cac9bb..9bd945b7f 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java +++ b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java @@ -48,7 +48,7 @@ public class ApplicationPersistenceAdapter implements ApplicationPort { private final JPAQueryFactory queryFactory; @Override - public List getByConditions(ApplicationFilter applicationFilter) { + public List getAllByConditions(ApplicationFilter applicationFilter) { return queryFactory .selectFrom(applicationEntity) .join(applicationEntity.student, studentEntity) @@ -183,7 +183,7 @@ public void deleteByIds(List applicationIds) { } @Override - public List getByIdsOrThrow(List applicationIds) { + public List getAllByIdsOrThrow(List applicationIds) { List applications = applicationJpaRepository.findByIdIn(applicationIds); if (applicationIds.size() != applications.size()) { From 2b7ad03ce5c451817de138c3ba3a42fd0a7193b7 Mon Sep 17 00:00:00 2001 From: gilgeunwoo Date: Sun, 21 Apr 2024 23:09:06 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20::=20(#643)=20idIn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/acceptance/usecase/CancelFieldTraineesUseCase.java | 2 +- .../domain/acceptance/usecase/RegisterFieldTraineeUseCase.java | 2 +- .../jobis/domain/application/spi/QueryApplicationPort.java | 2 +- .../application/usecase/ChangeApplicationsStatusUseCase.java | 2 +- .../domain/application/usecase/ChangeFieldTrainDateUseCase.java | 2 +- .../application/persistence/ApplicationPersistenceAdapter.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java index 8eabf2e35..f68a15572 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/CancelFieldTraineesUseCase.java @@ -17,7 +17,7 @@ public class CancelFieldTraineesUseCase { private final CommandApplicationPort commandApplicationPort; public void execute(List applicationIds) { - List applications = applicationRepository.getAllByIdsOrThrow(applicationIds); + List applications = applicationRepository.getAllByIdInOrThrow(applicationIds); applications.forEach( application -> Application.checkApplicationStatus( diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java index f86c8d972..98c55b860 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/acceptance/usecase/RegisterFieldTraineeUseCase.java @@ -17,7 +17,7 @@ public class RegisterFieldTraineeUseCase { private final QueryApplicationPort queryApplicationPort; public void execute(RegisterFieldTraineeRequest request) { - List applications = queryApplicationPort.getAllByIdsOrThrow(request.applicationIds()); + List applications = queryApplicationPort.getAllByIdInOrThrow(request.applicationIds()); List converted = applications.stream() .map(application -> diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java index 66ab538ce..242e8e234 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/spi/QueryApplicationPort.java @@ -20,7 +20,7 @@ public interface QueryApplicationPort { List getPassedStudentsByCompanyId(Long companyId); - List getAllByIdsOrThrow(List applicationIds); + List getAllByIdInOrThrow(List applicationIds); List getDetailsByIds(List applicationIds); diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java index 4ced13864..84f626556 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeApplicationsStatusUseCase.java @@ -20,7 +20,7 @@ public class ChangeApplicationsStatusUseCase { private final PublishEventPort publishEventPort; public void execute(List applicationIds, ApplicationStatus status) { - List applications = queryApplicationPort.getAllByIdsOrThrow(applicationIds); + List applications = queryApplicationPort.getAllByIdInOrThrow(applicationIds); commandApplicationPort.updateApplicationStatus(status, applicationIds); publishEventPort.publishEvent(new ApplicationsStatusChangedEvent(applications, status)); diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java index f47ff714b..0f39e3592 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ChangeFieldTrainDateUseCase.java @@ -18,7 +18,7 @@ public class ChangeFieldTrainDateUseCase { private final CommandApplicationPort commandApplicationPort; public void execute(ChangeFieldTrainDateRequest request) { - List applications = queryApplicationPort.getAllByIdsOrThrow(request.applicationIds()); + List applications = queryApplicationPort.getAllByIdInOrThrow(request.applicationIds()); applications.forEach( application -> Application.checkApplicationStatus( diff --git a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java index 9bd945b7f..244e1abec 100644 --- a/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java +++ b/jobis-infrastructure/src/main/java/team/retum/jobis/domain/application/persistence/ApplicationPersistenceAdapter.java @@ -183,7 +183,7 @@ public void deleteByIds(List applicationIds) { } @Override - public List getAllByIdsOrThrow(List applicationIds) { + public List getAllByIdInOrThrow(List applicationIds) { List applications = applicationJpaRepository.findByIdIn(applicationIds); if (applicationIds.size() != applications.size()) { From cba4f4128750337f3fa4c7f2b6972135da09fffa Mon Sep 17 00:00:00 2001 From: gilgeunwoo Date: Sun, 21 Apr 2024 23:34:38 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=A6=B7=20::=20(#643)=20unused=20impor?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/application/usecase/DeleteApplicationUseCase.java | 1 - .../domain/application/usecase/QueryRejectionReasonUseCase.java | 1 - .../retum/jobis/domain/application/usecase/ReapplyUseCase.java | 1 - .../domain/application/usecase/RejectApplicationUseCase.java | 1 - .../retum/jobis/domain/review/usecase/CreateReviewUseCase.java | 1 - 5 files changed, 5 deletions(-) diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/DeleteApplicationUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/DeleteApplicationUseCase.java index c0315e32f..d96fbaf11 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/DeleteApplicationUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/DeleteApplicationUseCase.java @@ -3,7 +3,6 @@ import lombok.RequiredArgsConstructor; import team.retum.jobis.common.annotation.UseCase; import team.retum.jobis.common.spi.SecurityPort; -import team.retum.jobis.domain.application.exception.ApplicationNotFoundException; import team.retum.jobis.domain.application.model.Application; import team.retum.jobis.domain.application.spi.CommandApplicationPort; import team.retum.jobis.domain.application.spi.QueryApplicationPort; diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryRejectionReasonUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryRejectionReasonUseCase.java index 697415e63..0122abd03 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryRejectionReasonUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/QueryRejectionReasonUseCase.java @@ -3,7 +3,6 @@ import lombok.RequiredArgsConstructor; import team.retum.jobis.common.annotation.ReadOnlyUseCase; import team.retum.jobis.domain.application.dto.response.QueryRejectionReasonResponse; -import team.retum.jobis.domain.application.exception.ApplicationNotFoundException; import team.retum.jobis.domain.application.model.Application; import team.retum.jobis.domain.application.model.ApplicationStatus; import team.retum.jobis.domain.application.spi.QueryApplicationPort; diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ReapplyUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ReapplyUseCase.java index 602772762..51984ef19 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ReapplyUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/ReapplyUseCase.java @@ -3,7 +3,6 @@ import lombok.RequiredArgsConstructor; import team.retum.jobis.common.annotation.UseCase; import team.retum.jobis.domain.application.dto.request.AttachmentRequest; -import team.retum.jobis.domain.application.exception.ApplicationNotFoundException; import team.retum.jobis.domain.application.model.Application; import team.retum.jobis.domain.application.model.ApplicationAttachment; import team.retum.jobis.domain.application.model.ApplicationStatus; diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/RejectApplicationUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/RejectApplicationUseCase.java index 7a3229ba6..e78b16046 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/RejectApplicationUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/application/usecase/RejectApplicationUseCase.java @@ -2,7 +2,6 @@ import lombok.RequiredArgsConstructor; import team.retum.jobis.common.annotation.UseCase; -import team.retum.jobis.domain.application.exception.ApplicationNotFoundException; import team.retum.jobis.domain.application.model.Application; import team.retum.jobis.domain.application.spi.CommandApplicationPort; import team.retum.jobis.domain.application.spi.QueryApplicationPort; diff --git a/jobis-application/src/main/java/team/retum/jobis/domain/review/usecase/CreateReviewUseCase.java b/jobis-application/src/main/java/team/retum/jobis/domain/review/usecase/CreateReviewUseCase.java index 1dedafc0c..ea16e54f2 100644 --- a/jobis-application/src/main/java/team/retum/jobis/domain/review/usecase/CreateReviewUseCase.java +++ b/jobis-application/src/main/java/team/retum/jobis/domain/review/usecase/CreateReviewUseCase.java @@ -3,7 +3,6 @@ import lombok.RequiredArgsConstructor; import team.retum.jobis.common.annotation.UseCase; import team.retum.jobis.common.spi.SecurityPort; -import team.retum.jobis.domain.application.exception.ApplicationNotFoundException; import team.retum.jobis.domain.application.spi.QueryApplicationPort; import team.retum.jobis.domain.company.exception.CompanyNotFoundException; import team.retum.jobis.domain.company.model.Company;