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

backend/src/main/java/com/votogether/domain/alarm/entity/Alarm.java

@@ -15,6 +15,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import java.time.LocalDateTime;
 import java.util.Objects;
 import lombok.AccessLevel;
 import lombok.Builder;
@@ -74,4 +75,11 @@ public void checkOwner(final Member member) {
  }
  }
 
+ public LocalDateTime getLatestAlarmCreatedAt(final LocalDateTime reportActionAlarmCreatedAt) {
+ if (this.getCreatedAt().isAfter(reportActionAlarmCreatedAt)) {
+ return this.getCreatedAt();
+ }
+ return reportActionAlarmCreatedAt;
+ }
+
 }

backend/src/main/java/com/votogether/domain/alarm/exception/AlarmExceptionType.java

@@ -6,7 +6,7 @@
 @Getter
 public enum AlarmExceptionType implements ExceptionType {
 
- NOT_FOUND_ACTION(1300, "신고조치알림이 존재하지 않습니다."),
+ NOT_FOUND_ACTION(1300, "신고 조치 알림이 존재하지 않습니다."),
  NOT_FOUND(1301, "알림이 존재하지 않습니다."),
  NOT_OWNER(1302, "알림을 읽을 대상이 아닙니다."),
  NOT_FOUND_ACTION_TYPE(1303, "등록되지 않은 알림 동작입니다."),

backend/src/main/java/com/votogether/domain/alarm/repository/AlarmRepository.java

@@ -3,6 +3,7 @@
 import com.votogether.domain.alarm.entity.Alarm;
 import com.votogether.domain.member.entity.Member;
 import java.util.List;
+import java.util.Optional;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -13,4 +14,6 @@ public interface AlarmRepository extends JpaRepository<Alarm, Long> {
 
  List<Alarm> findAllByMember(final Member member);
 
+ Optional<Alarm> findByMemberOrderByCreatedAtDesc(final Member member);
+
 }

backend/src/main/java/com/votogether/domain/alarm/repository/ReportActionAlarmRepository.java

@@ -13,4 +13,6 @@ public interface ReportActionAlarmRepository extends JpaRepository<ReportActionA
 
  Optional<ReportActionAlarm> findByIdAndMember(final Long Id, final Member member);
 
+ Optional<ReportActionAlarm> findByMemberOrderByCreatedAtDesc(final Member member);
+
 }

backend/src/main/java/com/votogether/domain/member/controller/MemberController.java

@@ -46,6 +46,12 @@ public ResponseEntity<Void> updateDetails(
  return ResponseEntity.ok().build();
  }
 
+ @PatchMapping("/me/check-alarm")
+ public ResponseEntity<Void> checkLatestAlarm(@Auth final Member member) {
+ memberService.checkLatestAlarm(member);
+ return ResponseEntity.ok().build();
+ }
+
  @DeleteMapping("/me/delete")
  public ResponseEntity<Void> deleteMember(@Auth final Member member) {
  memberService.deleteMember(member);

backend/src/main/java/com/votogether/domain/member/controller/MemberControllerDocs.java

@@ -5,6 +5,7 @@
 import com.votogether.domain.member.dto.response.MemberInfoResponse;
 import com.votogether.domain.member.entity.Member;
 import com.votogether.global.exception.ExceptionResponse;
+import com.votogether.global.jwt.Auth;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -17,7 +18,15 @@
 public interface MemberControllerDocs {
 
  @Operation(summary = "회원 정보 조회", description = "회원 정보를 조회한다.")
- @ApiResponse(responseCode = "200", description = "회원 정보 조회 성공")
+ @ApiResponses({
+ @ApiResponse(responseCode = "200", description = "회원 정보 조회 성공"),
+ @ApiResponse(
+ responseCode = "400",
+ description = "회원에 해당하는 통계 정보가 없는 경우",
+ content = @Content(schema = @Schema(implementation = ExceptionResponse.class)
+ )
+ )
+ })
  ResponseEntity<MemberInfoResponse> findMemberInfo(final Member member);
 
  @Operation(summary = "회원 닉네임 변경", description = "회원 닉네임을 변경한다.")
@@ -48,6 +57,10 @@ ResponseEntity<Void> updateDetails(
  final Member member
  );
 
+ @Operation(summary = "회원 최신 알림 확인", description = "회원의 최신 알림 읽은 시간을 수정한다.")
+ @ApiResponse(responseCode = "200", description = "최신 알림 읽기 성공")
+ ResponseEntity<Void> checkLatestAlarm(@Auth final Member member);
+
  @Operation(summary = "회원 탈퇴", description = "회원 탈퇴한다.")
  @ApiResponse(responseCode = "200", description = "회원 탈퇴 성공")
  ResponseEntity<Void> deleteMember(final Member member);

backend/src/main/java/com/votogether/domain/member/dto/response/MemberInfoResponse.java

@@ -15,13 +15,16 @@ public record MemberInfoResponse(
  @Schema(description = "출생년도", example = "2002")
  Integer birthYear,
 
- @Schema(description = "권한", example = "MEMBER")
- Roles roles,
-
  @Schema(description = "작성한 게시글 수", example = "5")
  long postCount,
 
  @Schema(description = "투표한 수", example = "10")
- long voteCount
+ long voteCount,
+
+ @Schema(description = "권한", example = "MEMBER")
+ Roles roles,
+
+ @Schema(description = "최신 알림 존재 여부", example = "false")
+ boolean hasLatestAlarm
 ) {
 }

backend/src/main/java/com/votogether/domain/member/entity/Member.java

@@ -59,21 +59,26 @@ public class Member extends BaseEntity {
  @Column(nullable = false, length = 20)
  private Roles roles;
 
+ @Column(columnDefinition = "datetime(6)", nullable = false)
+ private LocalDateTime alarmCheckedAt;
+
  @Builder
  private Member(
  final String nickname,
  final Gender gender,
  final Integer birthYear,
  final SocialType socialType,
  final String socialId,
- final Roles roles
+ final Roles roles,
+ final LocalDateTime alarmCheckedAt
  ) {
  this.nickname = new Nickname(nickname);
  this.gender = gender;
  this.birthYear = birthYear;
  this.socialType = socialType;
  this.socialId = socialId;
  this.roles = roles;
+ this.alarmCheckedAt = alarmCheckedAt;
  }
 
  public static Member from(final KakaoMemberResponse response) {
@@ -82,6 +87,7 @@ public static Member from(final KakaoMemberResponse response) {
  .socialType(SocialType.KAKAO)
  .socialId(String.valueOf(response.id()))
  .roles(Roles.MEMBER)
+ .alarmCheckedAt(LocalDateTime.now())
  .build();
  }
 
@@ -117,6 +123,14 @@ public boolean hasEssentialInfo() {
  return (this.gender != null && this.birthYear != null);
  }
 
+ public boolean hasLatestAlarmCompareTo(final LocalDateTime latestAlarmCreatedAt) {
+ return alarmCheckedAt.isBefore(latestAlarmCreatedAt);
+ }
+
+ public void checkAlarm() {
+ alarmCheckedAt = LocalDateTime.now();
+ }
+
  public String getNickname() {
  return this.nickname.getValue();
  }

backend/src/main/java/com/votogether/domain/member/service/MemberService.java

@@ -1,7 +1,9 @@
 package com.votogether.domain.member.service;
 
 import com.votogether.domain.alarm.entity.Alarm;
+import com.votogether.domain.alarm.entity.ReportActionAlarm;
 import com.votogether.domain.alarm.repository.AlarmRepository;
+import com.votogether.domain.alarm.repository.ReportActionAlarmRepository;
 import com.votogether.domain.member.dto.request.MemberDetailRequest;
 import com.votogether.domain.member.dto.response.MemberInfoResponse;
 import com.votogether.domain.member.entity.Member;
@@ -23,6 +25,7 @@
 import com.votogether.domain.vote.repository.VoteRepository;
 import com.votogether.global.exception.BadRequestException;
 import com.votogether.global.exception.NotFoundException;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
@@ -43,6 +46,7 @@ public class MemberService {
  private final ReportRepository reportRepository;
  private final CommentRepository commentRepository;
  private final AlarmRepository alarmRepository;
+ private final ReportActionAlarmRepository reportActionAlarmRepository;
 
  @Transactional
  public Member register(final Member member) {
@@ -73,17 +77,46 @@ public Member findById(final Long memberId) {
  public MemberInfoResponse findMemberInfo(final Member member) {
  final MemberMetric memberMetric = memberMetricRepository.findByMember(member)
  .orElseThrow(() -> new NotFoundException(MemberExceptionType.NOT_FOUND_METRIC));
+ final boolean hasLatestAlarm = hasLatestAlarm(member);
 
  return new MemberInfoResponse(
  member.getNickname(),
  member.getGender(),
  member.getBirthYear(),
- member.getRoles(),
  memberMetric.getPostCount(),
- memberMetric.getVoteCount()
+ memberMetric.getVoteCount(),
+ member.getRoles(),
+ hasLatestAlarm
  );
  }
 
+ private boolean hasLatestAlarm(final Member member) {
+ final Optional<Alarm> maybeAlarm = alarmRepository.findByMemberOrderByCreatedAtDesc(member);
+ final Optional<ReportActionAlarm> maybeReportActionAlarm =
+ reportActionAlarmRepository.findByMemberOrderByCreatedAtDesc(member);
+
+ if (maybeAlarm.isEmpty() && maybeReportActionAlarm.isEmpty()) {
+ return false;
+ }
+ final LocalDateTime latestAlarmCreatedAt = getLatestAlarmCreatedAt(maybeAlarm, maybeReportActionAlarm);
+ return member.hasLatestAlarmCompareTo(latestAlarmCreatedAt);
+ }
+
+ private LocalDateTime getLatestAlarmCreatedAt(
+ final Optional<Alarm> maybeAlarm,
+ final Optional<ReportActionAlarm> maybeReportActionAlarm
+ ) {
+ if (maybeAlarm.isPresent()) {
+ return maybeAlarm.get().getCreatedAt();
+ }
+ if (maybeReportActionAlarm.isPresent()) {
+ return maybeReportActionAlarm.get().getCreatedAt();
+ }
+ final Alarm alarm = maybeAlarm.get();
+ final ReportActionAlarm reportActionAlarm = maybeReportActionAlarm.get();
+ return alarm.getLatestAlarmCreatedAt(reportActionAlarm.getCreatedAt());
+ }
+
  @Transactional
  public void changeNickname(final Member member, final String nickname) {
  validateExistentNickname(nickname);
@@ -112,6 +145,11 @@ private void validateExistentDetails(final Member member) {
  }
  }
 
+ @Transactional
+ public void checkLatestAlarm(final Member member) {
+ member.checkAlarm();
+ }
+
  @Transactional
  public void deleteMember(final Member member) {
  final List<Post> posts = deletePosts(member);

backend/src/test/java/com/votogether/domain/alarm/entity/AlarmTest.java

@@ -7,6 +7,7 @@
 import com.votogether.domain.member.entity.Member;
 import com.votogether.global.exception.BadRequestException;
 import com.votogether.test.fixtures.MemberFixtures;
+import java.time.LocalDateTime;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -54,4 +55,26 @@ void checkOwner() {
  .hasMessage("알림을 읽을 대상이 아닙니다.");
  }
 
+ @Test
+ @DisplayName("알림이 생성된 시각과 인자로 받은 시각을 비교하여 최신 시각을 반환한다.")
+ void getLatestAlarmCreatedAt() {
+ // given
+ Member member = MemberFixtures.MALE_30.get();
+ Alarm alarm = Alarm.builder()
+ .member(member)
+ .alarmType(AlarmType.COMMENT)
+ .targetId(1L)
+ .detail("detail")
+ .isChecked(false)
+ .build();
+ ReflectionTestUtils.setField(alarm, "createdAt", LocalDateTime.of(2023, 10, 18, 12, 0));
+ LocalDateTime now = LocalDateTime.now();
+
+ // when
+ LocalDateTime latestAlarmCreatedAt = alarm.getLatestAlarmCreatedAt(now);
+
+ // then
+ assertThat(latestAlarmCreatedAt).isEqualTo(now);
+ }
+
 }

backend/src/test/java/com/votogether/domain/member/controller/MemberControllerTest.java

@@ -55,9 +55,10 @@ void findMemberInfo() throws Exception {
  "저문",
  Gender.MALE,
  1988,
- Roles.MEMBER,
  0,
- 0
+ 0,
+ Roles.MEMBER,
+ false
  );
 
  given(tokenProcessor.resolveToken(anyString())).willReturn("token");
@@ -219,6 +220,26 @@ void invalidNullOfBirthYear(Integer birthYear) throws Exception {
 
  }
 
+ @Test
+ @DisplayName("최신 알림 읽기에 성공하면 200을 반환한다.")
+ void checkLatestAlarm() throws Exception {
+ // given
+ TokenPayload tokenPayload = new TokenPayload(1L, 1L, 1L);
+ given(tokenProcessor.resolveToken(anyString())).willReturn("token");
+ given(tokenProcessor.parseToken(anyString())).willReturn(tokenPayload);
+ given(memberService.findById(anyLong())).willReturn(MemberFixtures.FEMALE_20.get());
+
+ willDoNothing().given(memberService).checkLatestAlarm(any(Member.class));
+
+ // when, then
+ RestAssuredMockMvc
+ .given().log().all()
+ .headers(HttpHeaders.AUTHORIZATION, "Bearer token")
+ .when().patch("/members/me/check-alarm")
+ .then().log().all()
+ .statusCode(HttpStatus.OK.value());
+ }
+
  @Test
  @DisplayName("회원 탈퇴에 성공하면 204를 반환한다.")
  void deleteMember() throws Exception {

backend/src/test/java/com/votogether/domain/member/entity/MemberTest.java

@@ -6,6 +6,7 @@
 import com.votogether.domain.member.entity.vo.Gender;
 import com.votogether.domain.member.entity.vo.SocialType;
 import com.votogether.global.exception.BadRequestException;
+import com.votogether.test.fixtures.MemberFixtures;
 import java.time.LocalDateTime;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -112,4 +113,52 @@ void notAllowedChangeToInitialNicknamePrefix() {
 
  }
 
+ @Test
+ @DisplayName("회원은 알림을 확인하면 이전에 저장되어있던 시간과는 다르다.")
+ void checkAlarm() {
+ // given
+ Member member = MemberFixtures.MALE_20.get();
+ LocalDateTime beforeAlarmCheckedAt = member.getAlarmCheckedAt();
+
+ // when
+ member.checkAlarm();
+
+ // then
+ LocalDateTime afterAlarmCheckedAt = member.getAlarmCheckedAt();
+ assertThat(beforeAlarmCheckedAt).isNotEqualTo(afterAlarmCheckedAt);
+ }
+
+ @Nested
+ @DisplayName("회원의 최신 알림 읽은 시각이 인자로 받은 시각보다")
+ class HasLatestAlarmCompareTo {
+
+ @Test
+ @DisplayName("이전이면 true를 반환한다.")
+ void returnsTrue() {
+ // given
+ Member member = MemberFixtures.MALE_20.get();
+
+ // when
+ boolean hasLatestAlarm = member.hasLatestAlarmCompareTo(LocalDateTime.now());
+
+ // then
+ assertThat(hasLatestAlarm).isTrue();
+ }
+
+ @Test
+ @DisplayName("이후이면 false를 반환한다.")
+ void returnsFalse() {
+ // given
+ Member member = MemberFixtures.MALE_20.get();
+ LocalDateTime beforeTime = LocalDateTime.of(2023, 10, 18, 12, 0);
+
+ // when
+ boolean hasLatestAlarm = member.hasLatestAlarmCompareTo(beforeTime);
+
+ // then
+ assertThat(hasLatestAlarm).isFalse();
+ }
+
+ }
+
 }