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

Jump to bottom

최신 알림 존재 여부 및 읽기 기능 구현 #783

Merged
merged 13 commits into from
Oct 19, 2023
Merged

최신 알림 존재 여부 및 읽기 기능 구현 #783

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f371e6f
feat: (#774) Member 엔티티 alarmCheckedAt 필드 추가
jeomxon Oct 18, 2023
216401f
feat: (#774) 내 정보 조회를 할 때 최신 알림이 있는지 여부를 판단하여 반환하도록 추가
jeomxon Oct 18, 2023
1dc8ec2
feat: (#774) 최신 알림 읽기 기능 구현
jeomxon Oct 18, 2023
5ebd675
refactor: (#774) 게시글 내역 및 신고 조치에 대한 알림이 없는 경우에 대한 처리 추가
jeomxon Oct 18, 2023
4cb655b
test: (#774) Alarm, ReportActionAlarm 테스트 persister 추가
jeomxon Oct 18, 2023
f75e102
test: (#774) 최신 알림 읽기 기능 및 내 정보 조회 시 최신 알림 여부 반환하는 기능 검증 추가
jeomxon Oct 18, 2023
982f08c
refactor: (#774) 최신 알림 비교 로직 수정
jeomxon Oct 19, 2023
8421e31
test: (#774) 최신 알림 여부를 반환하는 검증 추가
jeomxon Oct 19, 2023
f4801f4
chore: (#774) 사소한 컨벤션 수정
jeomxon Oct 19, 2023
a2177b6
test: (#774) 모든 알림이 존재하지 않을 때 최신 알림 여부를 반환하는 검증 추가
jeomxon Oct 19, 2023
933b1e8
refactor: (#774) 인덱스를 위해 정렬조건을 createdAt에서 id로 변경
jeomxon Oct 19, 2023
1a814de
refactor: (#774) stream을 이용한 알림 내역 반환 로직 개선
jeomxon Oct 19, 2023
be74d45
Merge branch 'dev' into feat/#774
jeomxon Oct 19, 2023
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
8 changes: 4 additions & 4 deletions backend/src/main/java/com/votogether/domain/member/service/MemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ private LocalDateTime getLatestAlarmCreatedAt(
final Optional<Alarm> maybeAlarm,
final Optional<ReportActionAlarm> maybeReportActionAlarm
) {
if (maybeAlarm.isPresent()) {
return maybeAlarm.get().getCreatedAt();
}
if (maybeReportActionAlarm.isPresent()) {
if (maybeAlarm.isEmpty()) {
return maybeReportActionAlarm.get().getCreatedAt();
}
if (maybeReportActionAlarm.isEmpty()) {
return maybeAlarm.get().getCreatedAt();
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybeAlarm과 maybeReportActionAlarm이 둘 다 비어있으면

return maybeReportActionAlarm.get().getCreatedAt();

이 부분에서 예외가 터질 것 같아요.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

말씀해주신 부분은 public메서드에서 검증해주고 있습니다!

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

위에 메서드에서 진행하고 있었군요.

그러면 hasLatestAlarm, getLatestAlarmCreatedAt 메서드 포함해서

private boolean hasLatestAlarm(final Member member) {
    final Optional<Alarm> maybeAlarm = alarmRepository.findByMemberOrderByCreatedAtDesc(member);
    final Optional<ReportActionAlarm> maybeReportActionAlarm =
            reportActionAlarmRepository.findByMemberOrderByCreatedAtDesc(member);
    
    LocalDateTime latestAlarmCreatedAt = getLatestAlarmCreatedAt(maybeAlarm, maybeReportActionAlarm);
    return latestAlarmCreatedAt != null && member.hasLatestAlarmCompareTo(latestAlarmCreatedAt);
}

private LocalDateTime getLatestAlarmCreatedAt(
        final Optional<Alarm> maybeAlarm,
        final Optional<ReportActionAlarm> maybeReportActionAlarm
) {
    return Stream.of(maybeAlarm.map(Alarm::getCreatedAt), maybeReportActionAlarm.map(ReportActionAlarm::getCreatedAt))
            .filter(Optional::isPresent)
            .map(Optional::get)
            .max(LocalDateTime::compareTo)
            .orElse(null);
}

이런 식으로 바꿔보는 것은 어떨까요?? if문이 너무 많아서 stream으로 처리하게 해보았습니다.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

private boolean hasLatestAlarm(final Member member) {
    final Optional<Alarm> maybeAlarm = alarmRepository.findByMemberOrderByIdDesc(member);
    final Optional<ReportActionAlarm> maybeReportActionAlarm =
            reportActionAlarmRepository.findByMemberOrderByIdDesc(member);
    final List<Optional<LocalDateTime>> maybeCreatedAts = List.of(
            maybeAlarm.map(Alarm::getCreatedAt),
            maybeReportActionAlarm.map(ReportActionAlarm::getCreatedAt)
    );

    return getLatestAlarmCreatedAt(maybeCreatedAts, member);
}

private boolean getLatestAlarmCreatedAt(
        final List<Optional<LocalDateTime>> maybeCreatedAts,
        final Member member
) {
    return maybeCreatedAts.stream()
            .filter(Optional::isPresent)
            .map(Optional::get)
            .anyMatch(member::hasLatestAlarmCompareTo);
}

그렇게해서 만들어진 레전드 로직...

final Alarm alarm = maybeAlarm.get();
final ReportActionAlarm reportActionAlarm = maybeReportActionAlarm.get();
return alarm.getLatestAlarmCreatedAt(reportActionAlarm.getCreatedAt());
Expand Down