fix: member publicId 모두 변경 (#113)

SangkiHan · web-flow · commit a565bd79de98 · 2025-02-07T21:49:13.000+09:00
diff --git a/src/main/java/org/myteam/server/news/newsComment/dto/repository/NewsCommentMemberDto.java b/src/main/java/org/myteam/server/news/newsComment/dto/repository/NewsCommentMemberDto.java
@@ -8,11 +8,11 @@
 @Getter
 @NoArgsConstructor
 public class NewsCommentMemberDto {
-	private UUID memberPublicId;
+	private UUID publicId;
 	private String nickName;
 
-	public NewsCommentMemberDto(UUID memberPublicID, String nickName) {
-		this.memberPublicId = memberPublicID;
+	public NewsCommentMemberDto(UUID publicId, String nickName) {
+		this.publicId = publicId;
 		this.nickName = nickName;
 	}
 }
diff --git a/src/main/java/org/myteam/server/news/newsCount/service/NewsCountService.java b/src/main/java/org/myteam/server/news/newsCount/service/NewsCountService.java
@@ -1,5 +1,7 @@
 package org.myteam.server.news.newsCount.service;
 
+import java.util.UUID;
+
 import org.myteam.server.member.service.SecurityReadService;
 import org.myteam.server.news.newsCount.dto.service.response.NewsRecommendResponse;
 import org.myteam.server.news.newsCountMember.service.NewsCountMemberReadService;
@@ -20,7 +22,7 @@ public class NewsCountService {
 	private final NewsCountMemberService newsCountMemberService;
 
 	public NewsRecommendResponse recommendNews(Long newsId) {
-		Long memberId = securityReadService.getMember().getId();
+		UUID memberId = securityReadService.getMember().getPublicId();
 		newsCountMemberReadService.confirmExistMember(newsId, memberId);
 
 		newsCountMemberService.save(newsId);
diff --git a/src/main/java/org/myteam/server/news/newsCountMember/dto/service/response/NewsCountMemberDeleteResponse.java b/src/main/java/org/myteam/server/news/newsCountMember/dto/service/response/NewsCountMemberDeleteResponse.java
@@ -1,5 +1,7 @@
 package org.myteam.server.news.newsCountMember.dto.service.response;
 
+import java.util.UUID;
+
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -9,15 +11,15 @@
 public class NewsCountMemberDeleteResponse {
 
 	private Long newsId;
-	private Long memberId;
+	private UUID memberId;
 
 	@Builder
-	public NewsCountMemberDeleteResponse(Long newsId, Long memberId) {
+	public NewsCountMemberDeleteResponse(Long newsId, UUID memberId) {
 		this.newsId = newsId;
 		this.memberId = memberId;
 	}
 
-	public static NewsCountMemberDeleteResponse createResponse(Long newsId, Long memberId) {
+	public static NewsCountMemberDeleteResponse createResponse(Long newsId, UUID memberId) {
 		return NewsCountMemberDeleteResponse.builder()
 			.newsId(newsId)
 			.memberId(memberId)
diff --git a/src/main/java/org/myteam/server/news/newsCountMember/dto/service/response/NewsCountMemberResponse.java b/src/main/java/org/myteam/server/news/newsCountMember/dto/service/response/NewsCountMemberResponse.java
@@ -1,5 +1,7 @@
 package org.myteam.server.news.newsCountMember.dto.service.response;
 
+import java.util.UUID;
+
 import org.myteam.server.news.newsCountMember.domain.NewsCountMember;
 
 import lombok.Builder;
@@ -12,10 +14,10 @@ public class NewsCountMemberResponse {
 
 	private Long newsCountMemberId;
 	private Long newsId;
-	private Long memberId;
+	private UUID memberId;
 
 	@Builder
-	public NewsCountMemberResponse(Long newsCountMemberId, Long newsId, Long memberId) {
+	public NewsCountMemberResponse(Long newsCountMemberId, Long newsId, UUID memberId) {
 		this.newsCountMemberId = newsCountMemberId;
 		this.newsId = newsId;
 		this.memberId = memberId;
@@ -25,7 +27,7 @@ public static NewsCountMemberResponse createResponse(NewsCountMember newsCountMe
 		return NewsCountMemberResponse.builder()
 			.newsCountMemberId(newsCountMember.getId())
 			.newsId(newsCountMember.getNews().getId())
-			.memberId(newsCountMember.getMember().getId())
+			.memberId(newsCountMember.getMember().getPublicId())
 			.build();
 	}
 }
diff --git a/src/main/java/org/myteam/server/news/newsCountMember/repository/NewsCountMemberRepository.java b/src/main/java/org/myteam/server/news/newsCountMember/repository/NewsCountMemberRepository.java
@@ -1,6 +1,7 @@
 package org.myteam.server.news.newsCountMember.repository;
 
 import java.util.Optional;
+import java.util.UUID;
 
 import org.myteam.server.news.newsCountMember.domain.NewsCountMember;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -9,8 +10,8 @@
 @Repository
 public interface NewsCountMemberRepository extends JpaRepository<NewsCountMember, Long> {
 
-	Optional<NewsCountMember> findByNewsIdAndMemberId(Long newsId, Long memberId);
+	Optional<NewsCountMember> findByNewsIdAndMemberPublicId(Long newsId, UUID memberId);
 
-	void deleteByNewsIdAndMemberId(Long newsId, Long memberId);
+	void deleteByNewsIdAndMemberPublicId(Long newsId, UUID memberId);
 
 }
diff --git a/src/main/java/org/myteam/server/news/newsCountMember/service/NewsCountMemberReadService.java b/src/main/java/org/myteam/server/news/newsCountMember/service/NewsCountMemberReadService.java
@@ -1,5 +1,7 @@
 package org.myteam.server.news.newsCountMember.service;
 
+import java.util.UUID;
+
 import org.myteam.server.global.exception.ErrorCode;
 import org.myteam.server.global.exception.PlayHiveException;
 import org.myteam.server.news.newsCountMember.repository.NewsCountMemberRepository;
@@ -15,8 +17,8 @@ public class NewsCountMemberReadService {
 
 	private final NewsCountMemberRepository newsCountMemberRepository;
 
-	public void confirmExistMember(Long newsId, Long memberId) {
-		newsCountMemberRepository.findByNewsIdAndMemberId(newsId, memberId)
+	public void confirmExistMember(Long newsId, UUID memberId) {
+		newsCountMemberRepository.findByNewsIdAndMemberPublicId(newsId, memberId)
 			.ifPresent(member -> {
 				throw new PlayHiveException(ErrorCode.ALREADY_MEMBER_RECOMMEND_NEWS);
 			});
diff --git a/src/main/java/org/myteam/server/news/newsCountMember/service/NewsCountMemberService.java b/src/main/java/org/myteam/server/news/newsCountMember/service/NewsCountMemberService.java
@@ -34,8 +34,8 @@ public NewsCountMemberDeleteResponse deleteByNewsIdMemberId(Long newsId) {
 		Member member = securityReadService.getMember();
 		News news = newsReadService.findById(newsId);
 
-		newsCountMemberRepository.deleteByNewsIdAndMemberId(news.getId(), member.getId());
-		return NewsCountMemberDeleteResponse.createResponse(news.getId(), member.getId());
+		newsCountMemberRepository.deleteByNewsIdAndMemberPublicId(news.getId(), member.getPublicId());
+		return NewsCountMemberDeleteResponse.createResponse(news.getId(), member.getPublicId());
 	}
 
 }
diff --git a/src/main/java/org/myteam/server/news/newsReply/dto/repository/NewsReplyDto.java b/src/main/java/org/myteam/server/news/newsReply/dto/repository/NewsReplyDto.java
@@ -11,16 +11,16 @@ public class NewsReplyDto {
 
 	private Long newsReplyId;
 	private Long newsCommentId;
-	private NewsReplyMemberDto memberDto;
+	private NewsReplyMemberDto member;
 	private String comment;
 	private String ip;
 	private LocalDateTime createTime;
 
-	public NewsReplyDto(Long newsReplyId, Long newsCommentId, NewsReplyMemberDto memberDto, String comment,
+	public NewsReplyDto(Long newsReplyId, Long newsCommentId, NewsReplyMemberDto member, String comment,
 		String ip, LocalDateTime createTime) {
 		this.newsReplyId = newsReplyId;
 		this.newsCommentId = newsCommentId;
-		this.memberDto = memberDto;
+		this.member = member;
 		this.comment = comment;
 		this.ip = ip;
 		this.createTime = createTime;
diff --git a/src/main/java/org/myteam/server/news/newsReply/dto/repository/NewsReplyMemberDto.java b/src/main/java/org/myteam/server/news/newsReply/dto/repository/NewsReplyMemberDto.java
@@ -8,11 +8,11 @@
 @Getter
 @NoArgsConstructor
 public class NewsReplyMemberDto {
-	private UUID memberPublicId;
+	private UUID publicId;
 	private String nickName;
 
-	public NewsReplyMemberDto(UUID memberPublicId, String nickName) {
-		this.memberPublicId = memberPublicId;
+	public NewsReplyMemberDto(UUID publicId, String nickName) {
+		this.publicId = publicId;
 		this.nickName = nickName;
 	}
 }
diff --git a/src/test/java/org/myteam/server/news/newsComment/service/NewsCommentReadServiceTest.java b/src/test/java/org/myteam/server/news/newsComment/service/NewsCommentReadServiceTest.java
@@ -37,7 +37,7 @@ void findByIdTest() {
 		NewsComment findNewsComment = newsCommentReadService.findById(newsComment.getId());
 
 		assertThat(findNewsComment)
-			.extracting("id", "news.id", "member.id", "comment")
+			.extracting("id", "news.id", "member.publicId", "comment")
 			.contains(newsComment.getId(), news.getId(), member.getPublicId(), "뉴스 댓글 테스트");
 	}
 
@@ -78,7 +78,7 @@ void findByNewsIdTest() {
 					1, 1, 2L
 				),
 			() -> assertThat(newsCommentList)
-				.extracting("newsCommentId", "newsId", "memberDto.id", "memberDto.nickName", "comment")
+				.extracting("newsCommentId", "newsId", "memberDto.publicId", "memberDto.nickName", "comment")
 				.contains(
 					Tuple.tuple(newsComment1.getId(), newsComment1.getNews().getId(), newsComment1.getMember().getPublicId(),
 						"test",
diff --git a/src/test/java/org/myteam/server/news/newsComment/service/NewsCommentServiceTest.java b/src/test/java/org/myteam/server/news/newsComment/service/NewsCommentServiceTest.java
@@ -38,7 +38,7 @@ void saveTest() {
 
 		assertAll(
 			() -> assertThat(newsCommentRepository.findById(newsCommentResponse.getNewsCommentId()).get())
-				.extracting("id", "news.id", "member.id", "comment", "ip")
+				.extracting("id", "news.id", "member.publicId", "comment", "ip")
 				.contains(newsCommentResponse.getNewsCommentId(), news.getId(), member.getPublicId(), "댓글 테스트", "1.1.1.1"),
 			() -> assertThat(newsCountRepository.findById(news.getId()).get().getCommentCount()).isEqualTo(11)
 		);
@@ -60,7 +60,7 @@ void updateTest() {
 		Long updatedCommentId = newsCommentService.update(newsCommentUpdateServiceRequest);
 
 		assertThat(newsCommentRepository.findById(updatedCommentId).get())
-			.extracting("id", "news.id", "member.id", "comment", "ip")
+			.extracting("id", "news.id", "member.publicId", "comment", "ip")
 			.contains(newsComment.getId(), news.getId(), member.getPublicId(), "뉴스 댓글 수정 테스트", "1.1.1.1");
 	}
 
diff --git a/src/test/java/org/myteam/server/news/newsCount/service/NewsCountServiceTest.java b/src/test/java/org/myteam/server/news/newsCount/service/NewsCountServiceTest.java
@@ -43,9 +43,9 @@ void recommendNewsTest() {
 		// then
 		assertAll(
 			() -> assertThat(newsCountRepository.findById(news.getId()).get().getRecommendCount()).isEqualTo(11),
-			() -> assertThat(newsCountMemberRepository.findByNewsIdAndMemberId(news.getId(), member.getId()).get())
-				.extracting("news.id", "member.id")
-				.contains(news.getId(), member.getId())
+			() -> assertThat(newsCountMemberRepository.findByNewsIdAndMemberPublicId(news.getId(), member.getPublicId()).get())
+				.extracting("news.id", "member.publicId")
+				.contains(news.getId(), member.getPublicId())
 		);
 	}
 
diff --git a/src/test/java/org/myteam/server/news/newsCountMember/NewsCountMemberReadServiceTest.java b/src/test/java/org/myteam/server/news/newsCountMember/NewsCountMemberReadServiceTest.java
@@ -26,7 +26,7 @@ void confirmExistMemberTest() {
 
 		createNewsCountMember(member, news);
 
-		assertThatThrownBy(() -> newsCountMemberReadService.confirmExistMember(news.getId(), member.getId()))
+		assertThatThrownBy(() -> newsCountMemberReadService.confirmExistMember(news.getId(), member.getPublicId()))
 			.isInstanceOf(PlayHiveException.class)
 			.hasMessage(ErrorCode.ALREADY_MEMBER_RECOMMEND_NEWS.getMsg());
 
diff --git a/src/test/java/org/myteam/server/news/newsCountMember/NewsCountMemberServiceTest.java b/src/test/java/org/myteam/server/news/newsCountMember/NewsCountMemberServiceTest.java
@@ -27,9 +27,9 @@ void saveTest() {
 
 		newsCountMemberService.save(news.getId());
 
-		assertThat(newsCountMemberRepository.findByNewsIdAndMemberId(news.getId(), member.getId()).get())
-			.extracting("news.id", "member.id")
-			.contains(news.getId(), member.getId());
+		assertThat(newsCountMemberRepository.findByNewsIdAndMemberPublicId(news.getId(), member.getPublicId()).get())
+			.extracting("news.id", "member.publicId")
+			.contains(news.getId(), member.getPublicId());
 	}
 
 	@DisplayName("사용자 추천 데이터를 삭제한다.")
diff --git a/src/test/java/org/myteam/server/news/newsReply/service/NewsReplyReadServiceTest.java b/src/test/java/org/myteam/server/news/newsReply/service/NewsReplyReadServiceTest.java
@@ -40,7 +40,7 @@ void findByIdTest() {
 		NewsReply findNewsReply = newsReplyReadService.findById(newsReply.getId());
 
 		assertThat(findNewsReply)
-			.extracting("id", "newsComment.id", "member.id", "comment")
+			.extracting("id", "newsComment.id", "member.publicId", "comment")
 			.contains(newsReply.getId(), newsComment.getId(), member.getPublicId(), "뉴스 대댓글 테스트");
 	}
 
@@ -84,7 +84,7 @@ void findByNewsIdTest() {
 					1, 2, 3L
 				),
 			() -> assertThat(newsReplyList)
-				.extracting("newsReplyId", "newsCommentId", "memberDto.id", "memberDto.nickName", "comment")
+				.extracting("newsReplyId", "newsCommentId", "member.publicId", "member.nickName", "comment")
 				.contains(
 					Tuple.tuple(newsReply1.getId(), newsReply1.getNewsComment().getId(), newsReply1.getMember().getPublicId(),
 						"test",
diff --git a/src/test/java/org/myteam/server/news/newsReply/service/NewsReplyServiceTest.java b/src/test/java/org/myteam/server/news/newsReply/service/NewsReplyServiceTest.java
@@ -40,7 +40,7 @@ void saveTest() {
 		NewsReplyResponse newsReplyResponse = newsReplyService.save(newsReplySaveServiceRequest);
 
 		assertThat(newsReplyRepository.findById(newsReplyResponse.getNewsReplyId()).get())
-			.extracting("id", "newsComment.id", "member.id", "comment", "ip")
+			.extracting("id", "newsComment.id", "member.publicId", "comment", "ip")
 			.contains(newsReplyResponse.getNewsReplyId(), newsComment.getId(), member.getPublicId(), "대댓글 테스트", "1.1.1.1");
 	}
 
@@ -60,7 +60,7 @@ void updateTest() {
 		Long updatedReplyId = newsReplyService.update(newsReplyUpdateServiceRequest);
 
 		assertThat(newsReplyRepository.findById(updatedReplyId).get())
-			.extracting("id", "newsComment.id", "member.id", "comment", "ip")
+			.extracting("id", "newsComment.id", "member.publicId", "comment", "ip")
 			.contains(newsReply.getId(), newsComment.getId(), member.getPublicId(), "뉴스 대댓글 수정 테스트", "1.1.1.1");
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@`
`8`	`8`	`@Getter`
`9`	`9`	`@NoArgsConstructor`
`10`	`10`	`public class NewsCommentMemberDto {`
`11`		`- private UUID memberPublicId;`
	`11`	`+ private UUID publicId;`
`12`	`12`	`private String nickName;`
`13`	`13`
`14`		`- public NewsCommentMemberDto(UUID memberPublicID, String nickName) {`
`15`		`- this.memberPublicId = memberPublicID;`
	`14`	`+ public NewsCommentMemberDto(UUID publicId, String nickName) {`
	`15`	`+ this.publicId = publicId;`
`16`	`16`	`this.nickName = nickName;`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ public NewsCountMemberDeleteResponse deleteByNewsIdMemberId(Long newsId) {`
`34`	`34`	`Member member = securityReadService.getMember();`
`35`	`35`	`News news = newsReadService.findById(newsId);`
`36`	`36`
`37`		`- newsCountMemberRepository.deleteByNewsIdAndMemberId(news.getId(), member.getId());`
`38`		`- return NewsCountMemberDeleteResponse.createResponse(news.getId(), member.getId());`
	`37`	`+ newsCountMemberRepository.deleteByNewsIdAndMemberPublicId(news.getId(), member.getPublicId());`
	`38`	`+ return NewsCountMemberDeleteResponse.createResponse(news.getId(), member.getPublicId());`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`}`