Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: 알림 구현 리팩토링 #155

Merged
merged 1 commit into from
Oct 28, 2024
Merged

refactor: 알림 구현 리팩토링 #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/main/java/yerong/wedle/calendar/service/CalendarEventService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,13 @@ public List<CalendarEventResponse> convertToDto(CalendarEvent calendarEvent) {
.orElseThrow(MemberNotFoundException::new);


Notification notification = notificationRepository.findByEventAndMember(calendarEvent, member).orElseThrow(NotificationNotFoundException::new);;
boolean notificationActive = notification != null && notification.isActive();
Notification notification = notificationRepository.findByEventAndMember(calendarEvent, member);
boolean notificationActive;
if(notification != null) {
notificationActive = notification.isActive();
} else {
notificationActive = false;
}
Long notificationId = notification != null ? notification.getNotificationId() : null;

if (endDate == null) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/yerong/wedle/notification/repository/NotificationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public interface NotificationRepository extends JpaRepository<Notification, Long

List<Notification> findByNotificationDate(LocalDate notification);

Optional<Notification> findByEventAndMember(CalendarEvent calendarEvent, Member member);
Notification findByEventAndMember(CalendarEvent calendarEvent, Member member);

List<Notification> findByMember(Member member);
}
Loading