Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

@Entity
@Getter
@Setter
@Builder
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor(access = AccessLevel.PROTECTED)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

@Entity
@Getter
@Setter
@Builder
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor(access = AccessLevel.PROTECTED)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,7 @@ public List<NotificationRes> 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 -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ public List<ApplicationInfoRes> searchApplications(ManagerPrincipal managerPrinc
@Transactional(readOnly = true)
public ApplicationSummaryRes getUserByApplications(User user) {
// ์‚ฌ์šฉ์ž๊ฐ€ ์‹ ์ฒญํ•œ ํ”„๋กœ๊ทธ๋žจ ๋ชฉ๋ก ์กฐํšŒ
List<ProgramApply> applies = programApplyRepository.findByUser(user);
List<ProgramApply> applies = programApplyRepository.findByUser(user).stream()
.filter(apply -> apply.getStatus() != ApplicationStatus.REJECTED)
.toList();

// ๊ฐ ProgramApply์—์„œ Program ๊บผ๋‚ด์˜ค๊ธฐ
List<Program> programs = applies.stream()
Expand Down