From 803b65107e92874750dc255e7d2f842e05c97807 Mon Sep 17 00:00:00 2001 From: Seong Jin Date: Wed, 26 Nov 2025 17:09:47 +0900 Subject: [PATCH 1/4] =?UTF-8?q?refact=20:=20=EB=B6=88=ED=95=84=EC=9A=94=20?= =?UTF-8?q?@Setter=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../silver_navi/domain/bookmark/entity/FacilityBookmark.java | 1 - .../silver_navi/domain/bookmark/entity/ProgramBookmark.java | 1 - .../_thon/silver_navi/domain/consult/entity/Consult.java | 1 - .../_thon/silver_navi/domain/consult/entity/GeneralConsult.java | 1 - .../org/likelion/_thon/silver_navi/domain/user/entity/User.java | 1 - 5 files changed, 5 deletions(-) diff --git a/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/FacilityBookmark.java b/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/FacilityBookmark.java index 346c08f..3ff1f18 100644 --- a/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/FacilityBookmark.java +++ b/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/FacilityBookmark.java @@ -8,7 +8,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/bookmark/entity/ProgramBookmark.java b/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/ProgramBookmark.java index dcf1762..aec5791 100644 --- a/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/ProgramBookmark.java +++ b/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/ProgramBookmark.java @@ -8,7 +8,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/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/user/entity/User.java b/src/main/java/org/likelion/_thon/silver_navi/domain/user/entity/User.java index 524a5f7..5f0a322 100644 --- a/src/main/java/org/likelion/_thon/silver_navi/domain/user/entity/User.java +++ b/src/main/java/org/likelion/_thon/silver_navi/domain/user/entity/User.java @@ -21,7 +21,6 @@ @Entity @Getter -@Setter @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor(access = AccessLevel.PROTECTED) From 590b3b45323f09089e3bcdeb0e800995e6b7b70f Mon Sep 17 00:00:00 2001 From: Seong Jin Date: Thu, 27 Nov 2025 11:32:37 +0900 Subject: [PATCH 2/4] =?UTF-8?q?refact=20:=20@setter=20=EB=B3=B5=EA=B5=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../silver_navi/domain/bookmark/entity/FacilityBookmark.java | 1 + .../silver_navi/domain/bookmark/entity/ProgramBookmark.java | 1 + .../org/likelion/_thon/silver_navi/domain/user/entity/User.java | 1 + 3 files changed, 3 insertions(+) diff --git a/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/FacilityBookmark.java b/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/FacilityBookmark.java index 3ff1f18..346c08f 100644 --- a/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/FacilityBookmark.java +++ b/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/FacilityBookmark.java @@ -8,6 +8,7 @@ @Entity @Getter +@Setter @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor(access = AccessLevel.PROTECTED) diff --git a/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/ProgramBookmark.java b/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/ProgramBookmark.java index aec5791..dcf1762 100644 --- a/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/ProgramBookmark.java +++ b/src/main/java/org/likelion/_thon/silver_navi/domain/bookmark/entity/ProgramBookmark.java @@ -8,6 +8,7 @@ @Entity @Getter +@Setter @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor(access = AccessLevel.PROTECTED) diff --git a/src/main/java/org/likelion/_thon/silver_navi/domain/user/entity/User.java b/src/main/java/org/likelion/_thon/silver_navi/domain/user/entity/User.java index 5f0a322..524a5f7 100644 --- a/src/main/java/org/likelion/_thon/silver_navi/domain/user/entity/User.java +++ b/src/main/java/org/likelion/_thon/silver_navi/domain/user/entity/User.java @@ -21,6 +21,7 @@ @Entity @Getter +@Setter @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor(access = AccessLevel.PROTECTED) From 5427f3a17b688bd1fb633cd9aaf101584148bb16 Mon Sep 17 00:00:00 2001 From: Seong Jin Date: Fri, 28 Nov 2025 00:35:09 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix=20:=20=EA=B1=B0=EB=B6=80=EC=82=AC?= =?UTF-8?q?=EC=9C=A0=20=EC=B6=94=EC=B6=9C=20pk=EC=82=AC=EC=9A=A9=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/notification/service/NotificationServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 -> { From afa58d95a20da510372f1aacee17bb3491c7cc8b Mon Sep 17 00:00:00 2001 From: Seong Jin Date: Fri, 28 Nov 2025 00:41:42 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix=20:=20=EA=B1=B0=EB=B6=80=20=EB=8B=B9?= =?UTF-8?q?=ED=95=9C=20=ED=94=84=EB=A1=9C=EA=B7=B8=EB=9E=A8=20=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=20=EB=82=B4=EC=9A=A9=20=EB=B0=98=ED=99=98X?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/program/service/ApplicationServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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()