알림 읽기 기능 구현

backend/src/main/java/com/votogether/domain/alarm/controller/AlarmCommandController.java → backend/src/main/java/com/votogether/domain/alarm/controller/AlarmQueryController.java

@@ -2,14 +2,16 @@
 
 import com.votogether.domain.alarm.dto.ReportActionAlarmResponse;
 import com.votogether.domain.alarm.dto.ReportActionResponse;
-import com.votogether.domain.alarm.service.AlarmService;
+import com.votogether.domain.alarm.dto.response.PostAlarmResponse;
+import com.votogether.domain.alarm.service.AlarmQueryService;
 import com.votogether.domain.member.entity.Member;
 import com.votogether.global.jwt.Auth;
 import jakarta.validation.constraints.PositiveOrZero;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -19,25 +21,33 @@
 @RequiredArgsConstructor
 @RequestMapping("/alarms")
 @RestController
-public class AlarmCommandController implements AlarmCommandControllerDocs {
+public class AlarmQueryController implements AlarmQueryControllerDocs {
 
- private final AlarmService alarmService;
+ private final AlarmQueryService alarmQueryService;
 
- @RequestMapping("/report")
+ @GetMapping("/content")
+ public ResponseEntity<List<PostAlarmResponse>> getPostAlarm(
+ @RequestParam @PositiveOrZero(message = "페이지는 0이상 정수만 가능합니다.") final int page
+ ) {
+ final List<PostAlarmResponse> postAlarmResponses = alarmQueryService.getPostAlarm(page);
+ return ResponseEntity.ok(postAlarmResponses);
+ }
+
+ @GetMapping("/report")
  public ResponseEntity<List<ReportActionAlarmResponse>> getReportActionAlarms(
  @RequestParam @PositiveOrZero(message = "페이지는 0이상 정수만 가능합니다.") final int page,
  @Auth final Member member
  ) {
- final List<ReportActionAlarmResponse> response = alarmService.getReportActionAlarms(member, page);
+ final List<ReportActionAlarmResponse> response = alarmQueryService.getReportActionAlarms(member, page);
  return ResponseEntity.ok(response);
  }
 
- @RequestMapping("/report/{id}")
+ @GetMapping("/report/{id}")
  public ResponseEntity<ReportActionResponse> getReportActionAlarm(
  @PathVariable("id") final Long reportActionAlarmId,
  @Auth final Member member
  ) {
- final ReportActionResponse response = alarmService.getReportActionAlarm(reportActionAlarmId, member);
+ final ReportActionResponse response = alarmQueryService.getReportActionAlarm(reportActionAlarmId, member);
  return ResponseEntity.ok(response);
  }
 

backend/src/main/java/com/votogether/domain/alarm/controller/AlarmQueryControllerDocs.java

@@ -1,8 +1,12 @@
 package com.votogether.domain.alarm.controller;
 
+import com.votogether.domain.alarm.dto.ReportActionAlarmResponse;
+import com.votogether.domain.alarm.dto.ReportActionResponse;
 import com.votogether.domain.alarm.dto.response.PostAlarmResponse;
+import com.votogether.domain.member.entity.Member;
 import com.votogether.global.exception.ExceptionResponse;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -12,10 +16,13 @@
 import java.util.List;
 import org.springframework.http.ResponseEntity;
 
-@Tag(name = "알림", description = "알림 API")
+@Tag(name = "알림 조회", description = "알림 조회 API")
 public interface AlarmQueryControllerDocs {
 
- @Operation(summary = "게시글 내역 알림 조회", description = "게시글 내역 알림을 조회한다.")
+ @Operation(
+ summary = "게시글 내역 알림 조회",
+ description = "게시글 내역 알림을 조회한다."
+ )
  @ApiResponses({
  @ApiResponse(
  responseCode = "200",
@@ -31,4 +38,31 @@ ResponseEntity<List<PostAlarmResponse>> getPostAlarm(
  @PositiveOrZero(message = "페이지는 0이상 정수만 가능합니다.") final int page
  );
 
+ @Operation(
+ summary = "신고조치알림 조회",
+ description = "신고조치알림목록을 조회한다."
+ )
+ @ApiResponse(
+ responseCode = "201",
+ description = "조회 성공"
+ )
+ ResponseEntity<List<ReportActionAlarmResponse>> getReportActionAlarms(
+ @Parameter(description = "현재 페이지 위치", example = "0")
+ @PositiveOrZero(message = "페이지는 0이상 정수만 가능합니다.") final int page,
+ final Member member
+ );
+
+ @Operation(
+ summary = "신고조치알림 상세 조회",
+ description = "신고조치알림를 상세 조회한다."
+ )
+ @ApiResponse(
+ responseCode = "201",
+ description = "조회 성공"
+ )
+ ResponseEntity<ReportActionResponse> getReportActionAlarm(
+ @Parameter(description = "신고조치알림 ID", example = "1") final Long reportActionAlarmId,
+ final Member member
+ );
+
 }

backend/src/main/java/com/votogether/domain/alarm/service/AlarmQueryService.java

@@ -1,14 +1,21 @@
 package com.votogether.domain.alarm.service;
 
+import com.votogether.domain.alarm.dto.ReportActionAlarmResponse;
+import com.votogether.domain.alarm.dto.ReportActionResponse;
 import com.votogether.domain.alarm.dto.response.PostAlarmResponse;
 import com.votogether.domain.alarm.entity.Alarm;
+import com.votogether.domain.alarm.entity.ReportActionAlarm;
 import com.votogether.domain.alarm.entity.vo.AlarmType;
+import com.votogether.domain.alarm.exception.ReportActionAlarmExceptionType;
 import com.votogether.domain.alarm.repository.AlarmRepository;
+import com.votogether.domain.alarm.repository.ReportActionAlarmRepository;
 import com.votogether.domain.member.entity.Member;
+import com.votogether.global.exception.NotFoundException;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -21,6 +28,7 @@ public class AlarmQueryService {
  private static final String NICKNAME_WHEN_POST_CLOSING = "";
 
  private final AlarmRepository alarmRepository;
+ private final ReportActionAlarmRepository reportActionAlarmRepository;
 
  public List<PostAlarmResponse> getPostAlarm(final int page) {
  final PageRequest pageRequest = PageRequest.of(page, BASIC_PAGE_SIZE);
@@ -46,4 +54,23 @@ private String makeNicknameBy(final Alarm alarm) {
  return member.getNickname();
  }
 
+ public List<ReportActionAlarmResponse> getReportActionAlarms(final Member member, final int page) {
+ final PageRequest pageRequest = PageRequest.of(page, BASIC_PAGE_SIZE,
+ Sort.by(Sort.Direction.DESC, "createdAt"));
+ final List<ReportActionAlarm> reportActionAlarms = reportActionAlarmRepository
+ .findByMember(member, pageRequest);
+
+ return reportActionAlarms.stream()
+ .map(ReportActionAlarmResponse::from)
+ .toList();
+ }
+
+ public ReportActionResponse getReportActionAlarm(final Long reportActionAlarmId, final Member member) {
+ final ReportActionAlarm reportActionAlarm = reportActionAlarmRepository
+ .findByIdAndMember(reportActionAlarmId, member)
+ .orElseThrow(() -> new NotFoundException(ReportActionAlarmExceptionType.NOT_FOUND));
+
+ return ReportActionResponse.from(reportActionAlarm);
+ }
+
 }