diff --git a/src/main/java/org/likelion/_thon/silver_navi/domain/consult/entity/Consult.java b/src/main/java/org/likelion/_thon/silver_navi/domain/consult/entity/Consult.java index 15ad11c..6860290 100644 --- a/src/main/java/org/likelion/_thon/silver_navi/domain/consult/entity/Consult.java +++ b/src/main/java/org/likelion/_thon/silver_navi/domain/consult/entity/Consult.java @@ -17,7 +17,6 @@ @Entity @Getter -@Setter @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor(access = AccessLevel.PROTECTED) diff --git a/src/main/java/org/likelion/_thon/silver_navi/domain/consult/entity/GeneralConsult.java b/src/main/java/org/likelion/_thon/silver_navi/domain/consult/entity/GeneralConsult.java index df5c174..ca48c22 100644 --- a/src/main/java/org/likelion/_thon/silver_navi/domain/consult/entity/GeneralConsult.java +++ b/src/main/java/org/likelion/_thon/silver_navi/domain/consult/entity/GeneralConsult.java @@ -16,7 +16,6 @@ @Entity @Getter -@Setter @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor(access = AccessLevel.PROTECTED) diff --git a/src/main/java/org/likelion/_thon/silver_navi/domain/notification/service/NotificationServiceImpl.java b/src/main/java/org/likelion/_thon/silver_navi/domain/notification/service/NotificationServiceImpl.java index 15ac12a..129e446 100644 --- a/src/main/java/org/likelion/_thon/silver_navi/domain/notification/service/NotificationServiceImpl.java +++ b/src/main/java/org/likelion/_thon/silver_navi/domain/notification/service/NotificationServiceImpl.java @@ -84,10 +84,7 @@ public List getList(User user) { // 거부된 경우 거부 사유 if (n.getStatus() == NotificationStatus.REJECTED) { - rejectReason = programApplyRepository.findByUserAndProgram(user, - programRepository.findById(n.getReferenceId()).orElse(null)) - .map(ProgramApply::getRejectReason) - .orElse(null); + rejectReason = apply.getRejectReason(); } } case CONSULT -> { diff --git a/src/main/java/org/likelion/_thon/silver_navi/domain/program/service/ApplicationServiceImpl.java b/src/main/java/org/likelion/_thon/silver_navi/domain/program/service/ApplicationServiceImpl.java index b58a636..2412571 100644 --- a/src/main/java/org/likelion/_thon/silver_navi/domain/program/service/ApplicationServiceImpl.java +++ b/src/main/java/org/likelion/_thon/silver_navi/domain/program/service/ApplicationServiceImpl.java @@ -120,7 +120,9 @@ public List searchApplications(ManagerPrincipal managerPrinc @Transactional(readOnly = true) public ApplicationSummaryRes getUserByApplications(User user) { // 사용자가 신청한 프로그램 목록 조회 - List applies = programApplyRepository.findByUser(user); + List applies = programApplyRepository.findByUser(user).stream() + .filter(apply -> apply.getStatus() != ApplicationStatus.REJECTED) + .toList(); // 각 ProgramApply에서 Program 꺼내오기 List programs = applies.stream()