[feat #91] 알림 목록/읽기 API

src/main/java/com/dnd/gongmuin/answer/service/AnswerService.java

@@ -1,5 +1,7 @@
 package com.dnd.gongmuin.answer.service;
 
+import static com.dnd.gongmuin.notification.domain.NotificationType.*;
+
 import org.springframework.data.domain.Slice;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -16,6 +18,7 @@
 import com.dnd.gongmuin.common.exception.runtime.ValidationException;
 import com.dnd.gongmuin.credit_history.service.CreditHistoryService;
 import com.dnd.gongmuin.member.domain.Member;
+import com.dnd.gongmuin.notification.service.NotificationService;
 import com.dnd.gongmuin.question_post.domain.QuestionPost;
 import com.dnd.gongmuin.question_post.exception.QuestionPostErrorCode;
 import com.dnd.gongmuin.question_post.repository.QuestionPostRepository;
@@ -29,6 +32,7 @@ public class AnswerService {
 	private final QuestionPostRepository questionPostRepository;
 	private final AnswerRepository answerRepository;
 	private final CreditHistoryService creditHistoryService;
+	private final NotificationService notificationService;
 
 	private static void validateIfQuestioner(Member member, QuestionPost questionPost) {
 		if (!questionPost.isQuestioner(member.getId())) {
@@ -45,7 +49,12 @@ public AnswerDetailResponse registerAnswer(
 		QuestionPost questionPost = findQuestionPostById(questionPostId);
 		Answer answer = AnswerMapper.toAnswer(questionPostId, questionPost.isQuestioner(member.getId()), request,
 			member);
-		return AnswerMapper.toAnswerDetailResponse(answerRepository.save(answer));
+		Answer savedAnswer = answerRepository.save(answer);
+
+		notificationService.saveNotificationFromTarget(
+			ANSWER, questionPost.getId(), member.getId(), questionPost.getMember()
+		);
+		return AnswerMapper.toAnswerDetailResponse(savedAnswer);
 	}
 
 	@Transactional(readOnly = true)
@@ -66,6 +75,9 @@ public AnswerDetailResponse chooseAnswer(
 		QuestionPost questionPost = findQuestionPostById(answer.getQuestionPostId());
 		validateIfQuestioner(member, questionPost);
 		chooseAnswer(questionPost, answer);
+		notificationService.saveNotificationFromTarget(
+			CHOSEN, questionPost.getId(), member.getId(), answer.getMember()
+		);
 
 		return AnswerMapper.toAnswerDetailResponse(answer);
 	}

src/main/java/com/dnd/gongmuin/member/repository/MemberCustomImpl.java

@@ -43,8 +43,8 @@ public Slice<QuestionPostsResponse> getQuestionPostsByMember(Member member, Page
 		List<QuestionPostsResponse> content = queryFactory
 			.select(new QQuestionPostsResponse(
 				qp,
-				saved.count.coalesce(0).as("savedTotalCount"),
-				recommend.count.coalesce(0).as("recommendTotalCount")
+				saved.count.coalesce(0).as("bookmarkCount"),
+				recommend.count.coalesce(0).as("recommendCount")
 			))
 			.from(qp)
 			.leftJoin(saved)
@@ -75,8 +75,8 @@ public Slice<AnsweredQuestionPostsResponse> getAnsweredQuestionPostsByMember(
 			queryFactory
 				.select(new QAnsweredQuestionPostsResponse(
 					qp,
-					saved.count.coalesce(0).as("savedTotalCount"),
-					recommend.count.coalesce(0).as("recommendTotalCount"),
+					saved.count.coalesce(0).as("bookmarkCount"),
+					recommend.count.coalesce(0).as("recommendCount"),
 					aw1
 				))
 				.from(qp)
@@ -119,8 +119,8 @@ public Slice<BookmarksResponse> getBookmarksByMember(Member member, Pageable pag
 		List<BookmarksResponse> content = queryFactory
 			.select(new QBookmarksResponse(
 				qp,
-				saved.count.coalesce(0).as("savedTotalCount"),
-				recommend.count.coalesce(0).as("recommendTotalCount")
+				saved.count.coalesce(0).as("bookmarkCount"),
+				recommend.count.coalesce(0).as("recommendCount")
 			))
 			.from(qp)
 			.join(ir)

src/main/java/com/dnd/gongmuin/notification/controller/NotificationController.java

@@ -0,0 +1,51 @@
+package com.dnd.gongmuin.notification.controller;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.dnd.gongmuin.common.dto.PageResponse;
+import com.dnd.gongmuin.member.domain.Member;
+import com.dnd.gongmuin.notification.dto.request.readNotificationRequest;
+import com.dnd.gongmuin.notification.dto.response.NotificationsResponse;
+import com.dnd.gongmuin.notification.dto.response.readNotificationResponse;
+import com.dnd.gongmuin.notification.service.NotificationService;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+
+@Tag(name = "알림 API", description = "알림 API")
+@RestController
+@RequiredArgsConstructor
+public class NotificationController {
+
+	private final NotificationService notificationService;
+
+	@GetMapping("/api/notifications")
+	public ResponseEntity<PageResponse<NotificationsResponse>> getNotificationsByMember(
+		@RequestParam("type") String type,
+		@AuthenticationPrincipal Member member,
+		Pageable pageable) {
+
+		PageResponse<NotificationsResponse> response =
+			notificationService.getNotificationsByMember(type, member, pageable);
+
+		return ResponseEntity.ok(response);
+	}
+
+	@PatchMapping("/api/notification/read")
+	public ResponseEntity<readNotificationResponse> readNotification(
+		@RequestBody @Valid readNotificationRequest request,
+		@AuthenticationPrincipal Member member
+	) {
+		readNotificationResponse response = notificationService.readNotification(request, member);
+
+		return ResponseEntity.ok(response);
+	}
+}

src/main/java/com/dnd/gongmuin/notification/domain/Notification.java

@@ -2,6 +2,7 @@
 
 import static jakarta.persistence.ConstraintMode.*;
 import static jakarta.persistence.FetchType.*;
+import static lombok.AccessLevel.*;
 
 import com.dnd.gongmuin.common.entity.TimeBaseEntity;
 import com.dnd.gongmuin.member.domain.Member;
@@ -38,20 +39,47 @@ public class Notification extends TimeBaseEntity {
 	@Column(name = "is_read", nullable = false)
 	private Boolean isRead;
 
-	@Column(name = "target_url")
-	private String targetUrl;
+	@Column(name = "target_id")
+	private Long targetId;
+
+	@Column(name = "trigger_member_id")
+	private Long triggerMemberId;
 
 	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "member_id",
 		nullable = false,
 		foreignKey = @ForeignKey(NO_CONSTRAINT))
 	private Member member;
 
-	@Builder
-	public Notification(NotificationType type, Boolean isRead, String targetUrl, Member member) {
+	@Builder(access = PRIVATE)
+	private Notification(
+		NotificationType type,
+		Boolean isRead,
+		Long targetId,
+		Long triggerMemberId,
+		Member member) {
 		this.type = type;
 		this.isRead = isRead;
-		this.targetUrl = targetUrl;
+		this.targetId = targetId;
+		this.triggerMemberId = triggerMemberId;
 		this.member = member;
 	}
+
+	public static Notification of(
+		NotificationType type,
+		Long targetId,
+		Long triggerMemberId,
+		Member member) {
+		return Notification.builder()
+			.type(type)
+			.isRead(false)
+			.targetId(targetId)
+			.triggerMemberId(triggerMemberId)
+			.member(member)
+			.build();
+	}
+
+	public void updateIsReadTrue() {
+		this.isRead = Boolean.TRUE;
+	}
 }

src/main/java/com/dnd/gongmuin/notification/domain/NotificationType.java

@@ -2,24 +2,27 @@
 
 import java.util.Arrays;
 
+import com.dnd.gongmuin.common.exception.runtime.NotFoundException;
+import com.dnd.gongmuin.notification.exception.NotificationErrorCode;
+
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 @Getter
 @RequiredArgsConstructor
 public enum NotificationType {
 
-	ANSWER("댓글"),
+	ANSWER("답변"),
 	CHOSEN("채택"),
 	CHAT("채팅");
 
 	private final String label;
 
-	public static NotificationType of(String input) {
+	public static NotificationType from(String input) {
 		return Arrays.stream(values())
 			.filter(type -> type.isEqual(input))
 			.findAny()
-			.orElseThrow(IllegalArgumentException::new);
+			.orElseThrow(() -> new NotFoundException(NotificationErrorCode.NOT_FOUND_NOTIFICATION_TYPE));
 	}
 
 	private boolean isEqual(String input) {

src/main/java/com/dnd/gongmuin/notification/dto/NotificationMapper.java

@@ -0,0 +1,18 @@
+package com.dnd.gongmuin.notification.dto;
+
+import com.dnd.gongmuin.notification.domain.Notification;
+import com.dnd.gongmuin.notification.dto.response.readNotificationResponse;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class NotificationMapper {
+
+	public static readNotificationResponse toIsReadNotificationResponse(Notification notification) {
+		return new readNotificationResponse(
+			notification.getId(),
+			notification.getIsRead()
+		);
+	}
+}

src/main/java/com/dnd/gongmuin/notification/dto/request/readNotificationRequest.java

@@ -0,0 +1,10 @@
+package com.dnd.gongmuin.notification.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+
+public record readNotificationRequest(
+
+	@NotNull(message = "알림 ID 값은 필수 값 입니다.")
+	Long notificationId
+) {
+}

src/main/java/com/dnd/gongmuin/notification/dto/response/NotificationsResponse.java

@@ -0,0 +1,42 @@
+package com.dnd.gongmuin.notification.dto.response;
+
+import com.dnd.gongmuin.member.domain.Member;
+import com.dnd.gongmuin.notification.domain.Notification;
+import com.querydsl.core.annotations.QueryProjection;
+
+public record NotificationsResponse(
+
+	Long notificationId,
+
+	String type,
+
+	Boolean isRead,
+
+	Long targetId,
+
+	Long triggerMemberId,
+
+	String triggerMemberNickName,
+
+	Long targetMemberId,
+
+	String NotificationCreatedAt
+) {
+
+	@QueryProjection
+	public NotificationsResponse(
+		Notification notification,
+		Member triggerMember
+	) {
+		this(
+			notification.getId(),
+			notification.getType().getLabel(),
+			notification.getIsRead(),
+			notification.getTargetId(),
+			triggerMember.getId(),
+			triggerMember.getNickname(),
+			notification.getMember().getId(),
+			notification.getCreatedAt().toString()
+		);
+	}
+}

src/main/java/com/dnd/gongmuin/notification/dto/response/readNotificationResponse.java

@@ -0,0 +1,7 @@
+package com.dnd.gongmuin.notification.dto.response;
+
+public record readNotificationResponse(
+	Long notificationId,
+	Boolean isRead
+) {
+}

src/main/java/com/dnd/gongmuin/notification/exception/NotificationErrorCode.java

@@ -0,0 +1,21 @@
+package com.dnd.gongmuin.notification.exception;
+
+import com.dnd.gongmuin.common.exception.ErrorCode;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum NotificationErrorCode implements ErrorCode {
+
+	NOT_FOUND_NOTIFICATION_TYPE("알맞은 알림 타입을 찾을 수 없습니다.", "NOTIFICATION_001"),
+	SAVE_NOTIFICATION_FAILED("알림 저장을 실패했습니다.", "NOTIFICATION_002"),
+	NOTIFICATIONS_BY_MEMBER_FAILED("알림 목록을 불러오는데 실패했습니다.", "NOTIFICATION_003"),
+	NOT_FOUND_NOTIFICATION("해당 알림을 찾을 수 없습니다", "NOTIFICATION_004"),
+	CHANGE_IS_READ_NOTIFICATION_FAILED("해당 알림의 읽음 여부 변경을 실패했습니다.", "NOTIFICATION_005"),
+	INVALID_NOTIFICATION_OWNER("해당 알림의 주인이 아닙니다.", "NOTIFICATION_006");
+
+	private final String message;
+	private final String code;
+}

src/main/java/com/dnd/gongmuin/notification/repository/NotificationCustom.java

@@ -0,0 +1,13 @@
+package com.dnd.gongmuin.notification.repository;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+
+import com.dnd.gongmuin.member.domain.Member;
+import com.dnd.gongmuin.notification.dto.response.NotificationsResponse;
+
+public interface NotificationCustom {
+
+	Slice<NotificationsResponse> getNotificationsByMember(String type, Member member, Pageable pageable);
+
+}