epic: 뉴스 댓글 기능개발

.github/workflows/pr-merged.yml

@@ -2,9 +2,7 @@ name: Notify Slack on PR Closed for Dev Branch
 
 on:
   pull_request_target:
-    types:
-      - opened
-      - reopened
+    types: [closed]
 
 jobs:
   notify-slack:

src/main/java/org/myteam/server/global/exception/ErrorCode.java

@@ -20,6 +20,7 @@ public enum ErrorCode {
     INVALID_PARAMETER(HttpStatus.BAD_REQUEST, "Invalid parameter value"),
     EMPTY_COOKIE(HttpStatus.BAD_REQUEST, "Cookie value is empty"),
     INVALID_TYPE(HttpStatus.BAD_REQUEST, "Invalid type provided"),
+    MEMBER_NOT_EQUALS(HttpStatus.BAD_REQUEST, "Member Not Equals"),
 
     // 401 Unauthorized,
     UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "Unauthorized"),
@@ -48,6 +49,8 @@ public enum ErrorCode {
     BOARD_NOT_FOUND(HttpStatus.NOT_FOUND, "Board not found"),
     ROOM_NOT_FOUND(HttpStatus.NOT_FOUND, "Room not found"),
     BAN_NOT_FOUND(HttpStatus.NOT_FOUND, "Ban not found"),
+    NEWS_NOT_FOUND(HttpStatus.NOT_FOUND, "News not found"),
+    NEWS_COMMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "New Comment not found"),
 
     // 409 Conflict,
     USER_ALREADY_EXISTS(HttpStatus.CONFLICT, "User already exists"),

src/main/java/org/myteam/server/member/entity/Member.java

@@ -7,6 +7,8 @@
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.myteam.server.global.domain.Base;
+import org.myteam.server.global.exception.ErrorCode;
+import org.myteam.server.global.exception.PlayHiveException;
 import org.myteam.server.member.domain.MemberRole;
 import org.myteam.server.member.domain.MemberStatus;
 import org.myteam.server.member.domain.MemberType;
@@ -15,6 +17,7 @@
 import org.myteam.server.member.dto.PasswordChangeRequest;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
+import java.util.Objects;
 import java.util.UUID;
 
 import static org.myteam.server.member.domain.MemberRole.ADMIN;
@@ -120,4 +123,10 @@ public boolean validatePassword(String inputPassword, PasswordEncoder bCryptPass
         log.info("Is valid: {}", isValid);
         return isValid;
     }
-}
+
+    public void confirmMemberEquals(Member member) {
+        if(!Objects.equals(this.id, member.getId())) {
+            throw new PlayHiveException(ErrorCode.MEMBER_NOT_EQUALS);
+        }
+    }
+}

src/main/java/org/myteam/server/member/service/SecurityReadService.java

@@ -0,0 +1,31 @@
+package org.myteam.server.member.service;
+
+import org.myteam.server.global.exception.ErrorCode;
+import org.myteam.server.global.exception.PlayHiveException;
+import org.myteam.server.global.security.dto.CustomUserDetails;
+import org.myteam.server.member.entity.Member;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Service;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class SecurityReadService {
+
+	private final MemberReadService memberReadService;
+
+	public Member getMember() {
+		return memberReadService.findById(getAuthenticatedUser().getPublicId());
+	}
+
+	private CustomUserDetails getAuthenticatedUser() {
+		Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+		if (authentication != null && authentication.getPrincipal() instanceof CustomUserDetails) {
+			return (CustomUserDetails) authentication.getPrincipal();
+		}
+		throw new PlayHiveException(ErrorCode.UNAUTHORIZED);
+	}
+
+}

src/main/java/org/myteam/server/news/controller/NewsCommentController.java

@@ -0,0 +1,69 @@
+package org.myteam.server.news.controller;
+
+import static org.myteam.server.global.web.response.ResponseStatus.*;
+
+import org.myteam.server.global.web.response.ResponseDto;
+import org.myteam.server.news.dto.controller.request.NewsCommentRequest;
+import org.myteam.server.news.dto.controller.request.NewsCommentUpdateRequest;
+import org.myteam.server.news.dto.controller.request.NewsCommentSaveRequest;
+import org.myteam.server.news.dto.service.response.NewsCommentListResponse;
+import org.myteam.server.news.dto.service.response.NewsCommentResponse;
+import org.myteam.server.news.service.NewsCommentReadService;
+import org.myteam.server.news.service.NewsCommentService;
+import org.myteam.server.util.ClientUtils;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/news/comment")
+public class NewsCommentController {
+
+	private final NewsCommentService newsCommentService;
+	private final NewsCommentReadService newsCommentReadService;
+
+	@PostMapping
+	private ResponseEntity<ResponseDto<NewsCommentResponse>> save(@RequestBody @Valid NewsCommentSaveRequest newsSaveRequest, HttpServletRequest request) {
+		return ResponseEntity.ok(new ResponseDto<>(
+			SUCCESS.name(),
+			"뉴스 댓글 저장 성공",
+			newsCommentService.save(newsSaveRequest.toServiceRequest(ClientUtils.getRemoteIP(request)))));
+	}
+
+	@GetMapping
+	private ResponseEntity<ResponseDto<NewsCommentListResponse>> findByNewsId(
+		@RequestBody @Valid NewsCommentRequest newsCommentRequest) {
+		return ResponseEntity.ok(new ResponseDto<>(
+			SUCCESS.name(),
+			"뉴스 댓글 조회 성공",
+			newsCommentReadService.findByNewsId(newsCommentRequest.toServiceRequest())));
+	}
+
+	@PatchMapping
+	private ResponseEntity<ResponseDto<Long>> update(
+		@RequestBody @Valid NewsCommentUpdateRequest newsCommentUpdateRequest) {
+		return ResponseEntity.ok(new ResponseDto<>(
+			SUCCESS.name(),
+			"뉴스 댓글 수정 성공",
+			newsCommentService.update(newsCommentUpdateRequest.toServiceRequest())));
+	}
+
+	@DeleteMapping("/{newsCommentId}")
+	private ResponseEntity<ResponseDto<Long>> delete(@PathVariable Long newsCommentId) {
+		return ResponseEntity.ok(new ResponseDto<>(
+			SUCCESS.name(),
+			"뉴스 댓글 삭제 성공",
+			newsCommentService.delete(newsCommentId)));
+	}
+}

src/main/java/org/myteam/server/news/controller/NewsController.java

@@ -4,7 +4,7 @@
 
 import org.myteam.server.global.web.response.ResponseDto;
 import org.myteam.server.news.dto.controller.request.NewsRequest;
-import org.myteam.server.news.dto.controller.response.NewsListResponse;
+import org.myteam.server.news.dto.service.response.NewsListResponse;
 import org.myteam.server.news.service.NewsReadService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/org/myteam/server/news/domain/NewsComment.java

@@ -0,0 +1,61 @@
+package org.myteam.server.news.domain;
+
+import org.myteam.server.global.domain.Base;
+import org.myteam.server.member.entity.Member;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity(name = "p_news_comment")
+public class NewsComment extends Base {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	private News news;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	private Member member;
+
+	private String comment;
+
+	private String ip;
+
+	@Builder
+	public NewsComment(Long id, News news, Member member, String comment, String ip) {
+		this.id = id;
+		this.news = news;
+		this.member = member;
+		this.comment = comment;
+		this.ip = ip;
+	}
+
+	public void confirmMember(Member member) {
+		this.member.confirmMemberEquals(member);
+	}
+
+	public void updateComment(String comment) {
+		this.comment = comment;
+	}
+
+	public static NewsComment createNewsComment(News news, Member member, String comment, String ip) {
+		return NewsComment.builder()
+			.news(news)
+			.member(member)
+			.comment(comment)
+			.ip(ip)
+			.build();
+	}
+}

src/main/java/org/myteam/server/news/dto/controller/request/NewsCommentRequest.java

@@ -0,0 +1,32 @@
+package org.myteam.server.news.dto.controller.request;
+
+import org.myteam.server.global.page.request.PageInfoRequest;
+import org.myteam.server.news.dto.service.request.NewsCommentServiceRequest;
+
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class NewsCommentRequest extends PageInfoRequest {
+
+	@NotNull(message = "뉴스ID는 필수입니다.")
+	private Long newsId;
+
+	@Builder
+	public NewsCommentRequest(Long newsId, int page, int size) {
+		super(page, size);
+		this.newsId = newsId;
+	}
+
+	public NewsCommentServiceRequest toServiceRequest() {
+		return NewsCommentServiceRequest.builder()
+			.newsId(newsId)
+			.size(getSize())
+			.page(getPage())
+			.build();
+	}
+}

src/main/java/org/myteam/server/news/dto/controller/request/NewsCommentSaveRequest.java

@@ -0,0 +1,33 @@
+package org.myteam.server.news.dto.controller.request;
+
+import org.myteam.server.news.dto.service.request.NewsCommentSaveServiceRequest;
+
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class NewsCommentSaveRequest {
+
+	@NotNull(message = "뉴스ID는 필수입니다.")
+	private Long newsId;
+	@NotNull(message = "뉴스 댓글은 필수입니다.")
+	private String comment;
+
+	@Builder
+	public NewsCommentSaveRequest(Long newsId, String comment) {
+		this.newsId = newsId;
+		this.comment = comment;
+	}
+
+	public NewsCommentSaveServiceRequest toServiceRequest(String ip) {
+		return NewsCommentSaveServiceRequest.builder()
+			.newsId(newsId)
+			.comment(comment)
+			.ip(ip)
+			.build();
+	}
+}

src/main/java/org/myteam/server/news/dto/controller/request/NewsCommentUpdateRequest.java

@@ -0,0 +1,31 @@
+package org.myteam.server.news.dto.controller.request;
+
+import org.myteam.server.news.dto.service.request.NewsCommentUpdateServiceRequest;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class NewsCommentUpdateRequest {
+
+	@NotNull(message = "뉴스 댓글 ID는 필수입니다.")
+	private Long newsCommentId;
+	@NotNull(message = "뉴스 댓글 내용은 필수입니다.")
+	private String comment;
+
+	@Builder
+	public NewsCommentUpdateRequest(Long newsCommentId, String comment) {
+		this.newsCommentId = newsCommentId;
+		this.comment = comment;
+	}
+
+	public NewsCommentUpdateServiceRequest toServiceRequest() {
+		return NewsCommentUpdateServiceRequest.builder()
+			.newsCommentId(newsCommentId)
+			.comment(comment)
+			.build();
+	}
+}

src/main/java/org/myteam/server/news/dto/repository/NewsCommentDto.java

@@ -0,0 +1,23 @@
+package org.myteam.server.news.dto.repository;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class NewsCommentDto {
+
+	private Long newsCommentId;
+	private Long newsId;
+	private NewsCommentMemberDto memberDto;
+	private String comment;
+	private String ip;
+
+	public NewsCommentDto(Long newsCommentId, Long newsId, NewsCommentMemberDto memberDto, String comment, String ip) {
+		this.newsCommentId = newsCommentId;
+		this.newsId = newsId;
+		this.memberDto = memberDto;
+		this.comment = comment;
+		this.ip = ip;
+	}
+}

src/main/java/org/myteam/server/news/dto/repository/NewsCommentMemberDto.java

@@ -0,0 +1,16 @@
+package org.myteam.server.news.dto.repository;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class NewsCommentMemberDto {
+	private Long id;
+	private String nickName;
+
+	public NewsCommentMemberDto(Long id, String nickName) {
+		this.id = id;
+		this.nickName = nickName;
+	}
+}