Merge pull request #57 from KTB16Team/feature/56-refactor

refactor: 게시글마다 좋아요, 투표, 작성 여부를 표기하는 변수 추가
KTB16Team · Nov 5, 2024 · a523535 · a523535
2 parents 555da50 + 2209750
commit a523535
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 24 deletions.
diff --git a/backend/src/main/java/aimo/backend/common/mapper/PostMapper.java b/backend/src/main/java/aimo/backend/common/mapper/PostMapper.java
@@ -9,6 +9,8 @@
 import aimo.backend.domains.post.dto.response.FindPostAndCommentsByIdResponse.ParentCommentDto;
 import aimo.backend.domains.post.dto.response.FindPostsByPostTypeResponse;
 import aimo.backend.domains.post.entity.Post;
+import aimo.backend.domains.post.entity.Vote;
+import aimo.backend.domains.post.model.Side;
 
 public class PostMapper {
 
@@ -67,6 +69,13 @@ public static FindPostAndCommentsByIdResponse toFindPostAndCommentsByIdResponse(
 	) {
 		return new FindPostAndCommentsByIdResponse(
 			post.getMember() == member,
+			post.getPostLikes().stream()
+				.anyMatch(postLike -> postLike.getMember() == member),
+			post.getVotes().stream()
+				.filter(vote -> vote.getMember() == member)
+				.findFirst()
+				.map(Vote::getSide)
+				.orElse(Side.NONE),
 			post.getTitle(),
 			post.getMember().getNickname(),
 			post.getSummaryAi(),

diff --git a/backend/src/main/java/aimo/backend/domains/member/controller/MemberController.java b/backend/src/main/java/aimo/backend/domains/member/controller/MemberController.java
@@ -14,9 +14,9 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import aimo.backend.domains.member.dto.request.CreateProfileImageUrlRequest;
-import aimo.backend.domains.member.dto.request.DeleteRequest;
+import aimo.backend.domains.member.dto.request.DeleteMemberRequest;
 import aimo.backend.domains.member.dto.response.FindMyInfoResponse;
-import aimo.backend.domains.member.dto.request.LogOutRequest;
+import aimo.backend.domains.member.dto.request.LogoutRequest;
 import aimo.backend.domains.member.dto.response.NicknameExistsResponse;
 import aimo.backend.domains.member.dto.request.SendTemporaryPasswordRequest;
 import aimo.backend.domains.member.dto.request.SignUpRequest;
@@ -50,7 +50,7 @@ public ResponseEntity<DataResponse<Void>> logoutMember(HttpServletRequest reques
 		String accessToken = jwtTokenProvider.extractAccessToken(request).orElse(null);
 		String refreshToken = jwtTokenProvider.extractRefreshToken(request).orElse(null);
 		log.info("logout member access token: {} refresh token: {}", accessToken, refreshToken);
-		memberService.logoutMember(new LogOutRequest(accessToken, refreshToken));
+		memberService.logoutMember(new LogoutRequest(accessToken, refreshToken));
 
 		return ResponseEntity.status(HttpStatus.CREATED).body(DataResponse.created());
 	}
@@ -63,8 +63,8 @@ public ResponseEntity<DataResponse<Void>> signupMember(@RequestBody @Valid SignU
 	}
 
 	@DeleteMapping
-	public ResponseEntity<DataResponse<Void>> deleteMember(@RequestBody DeleteRequest deleteRequest) {
-		memberService.deleteMember(deleteRequest);
+	public ResponseEntity<DataResponse<Void>> deleteMember(@RequestBody DeleteMemberRequest deleteMemberRequest) {
+		memberService.deleteMember(deleteMemberRequest);
 
 		return ResponseEntity.status(HttpStatus.NO_CONTENT).body(DataResponse.noContent());
 	}

diff --git a/backend/src/main/java/aimo/backend/domains/member/dto/request/DeleteMemberRequest.java b/backend/src/main/java/aimo/backend/domains/member/dto/request/DeleteMemberRequest.java
@@ -0,0 +1,4 @@
+package aimo.backend.domains.member.dto.request;
+
+public record DeleteMemberRequest(String password) {
+}
diff --git a/backend/src/main/java/aimo/backend/domains/member/dto/request/DeleteRequest.java b/backend/src/main/java/aimo/backend/domains/member/dto/request/DeleteRequest.java
diff --git a/backend/src/main/java/aimo/backend/domains/member/dto/request/LogOutRequest.java b/backend/src/main/java/aimo/backend/domains/member/dto/request/LogOutRequest.java
@@ -1,6 +1,6 @@
 package aimo.backend.domains.member.dto.request;
 
-public record LogOutRequest(
+public record LogoutRequest(
 	String accessToken,
 	String refreshToken
 ) {

diff --git a/backend/src/main/java/aimo/backend/domains/member/dto/request/LogoutRequest.java b/backend/src/main/java/aimo/backend/domains/member/dto/request/LogoutRequest.java
@@ -0,0 +1,7 @@
+package aimo.backend.domains.member.dto.request;
+
+public record LogoutRequest(
+	String accessToken,
+	String refreshToken
+) {
+}
diff --git a/backend/src/main/java/aimo/backend/domains/member/service/MemberService.java b/backend/src/main/java/aimo/backend/domains/member/service/MemberService.java
@@ -2,9 +2,9 @@
 
 import aimo.backend.common.exception.ApiException;
 import aimo.backend.common.exception.ErrorCode;
-import aimo.backend.domains.member.dto.request.DeleteRequest;
+import aimo.backend.domains.member.dto.request.DeleteMemberRequest;
 import aimo.backend.domains.member.dto.response.FindMyInfoResponse;
-import aimo.backend.domains.member.dto.request.LogOutRequest;
+import aimo.backend.domains.member.dto.request.LogoutRequest;
 import aimo.backend.domains.member.dto.request.SendTemporaryPasswordRequest;
 import aimo.backend.domains.member.dto.request.SignUpRequest;
 import aimo.backend.domains.member.dto.request.UpdateNicknameRequest;
@@ -67,7 +67,7 @@ public void signUp(SignUpRequest signUpRequest) {
 
 	//로그아웃
 	@Transactional(rollbackFor = ApiException.class)
-	public void logoutMember(LogOutRequest logOutRequest) {
+	public void logoutMember(LogoutRequest logOutRequest) {
 		// 회원의 refreshToken 만료 처리
 		String accessToken = logOutRequest.accessToken(), refreshToken = logOutRequest.refreshToken();
 		RefreshToken expiredToken = new RefreshToken(accessToken, refreshToken);
@@ -77,10 +77,10 @@ public void logoutMember(LogOutRequest logOutRequest) {
 
 	// 회원 삭제
 	@Transactional(rollbackFor = ApiException.class)
-	public void deleteMember(DeleteRequest deleteRequest) {
+	public void deleteMember(DeleteMemberRequest deleteMemberRequest) {
 		Member member = memberLoader.getMember();
 
-		if (!isValid(deleteRequest.password(), member.getPassword())) {
+		if (!isValid(deleteMemberRequest.password(), member.getPassword())) {
 			throw ApiException.from(ErrorCode.INVALID_PASSWORD);
 		}
 

diff --git a/...src/main/java/aimo/backend/domains/post/dto/response/FindPostAndCommentsByIdResponse.java b/...src/main/java/aimo/backend/domains/post/dto/response/FindPostAndCommentsByIdResponse.java
@@ -5,6 +5,9 @@
 
 import aimo.backend.domains.comment.entity.ParentComment;
 import aimo.backend.domains.member.entity.Member;
+import aimo.backend.domains.post.model.Side;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,6 +16,9 @@
 @AllArgsConstructor
 public class FindPostAndCommentsByIdResponse {
 	private final Boolean isMine;
+	private final Boolean isLiked;
+	@Enumerated(EnumType.STRING)
+	private final Side side;
 	private final String title;
 	private final String nickname;
 	private final String content;
@@ -29,6 +35,7 @@ public class FindPostAndCommentsByIdResponse {
 	@AllArgsConstructor(access = AccessLevel.PRIVATE)
 	public static class ParentCommentDto {
 		private final Boolean isMine;
+		private final Boolean isLiked;
 		private final Long commentId;
 		private final String content;
 		private final String nickname;
@@ -39,14 +46,18 @@ public static class ParentCommentDto {
 		public static ParentCommentDto of(Member member, ParentComment parentComment) {
 			return new ParentCommentDto(
 				parentComment.getMember() == member,
+				parentComment.getParentCommentLikes().stream()
+					.anyMatch(like -> like.getMember() == member),
 				parentComment.getId(),
 				parentComment.getContent(),
 				parentComment.getNickname(),
 				parentComment.getLikesCount(),
 				parentComment.getCreatedAt(),
 				parentComment.getChildComments().stream()
 					.map(childComment -> new ChildCommentDto(
-						parentComment.getMember() == member,
+						childComment.getMember() == member,
+						childComment.getChildCommentLikes().stream()
+							.anyMatch(like -> like.getMember() == member),
 						childComment.getId(),
 						childComment.getContent(),
 						childComment.getNickname(),
@@ -62,6 +73,7 @@ public static ParentCommentDto of(Member member, ParentComment parentComment) {
 	@AllArgsConstructor
 	private static class ChildCommentDto {
 		private final Boolean isMine;
+		private final Boolean isLiked;
 		private final Long childCommentDd;
 		private final String content;
 		private final String nickname;

diff --git a/backend/src/main/java/aimo/backend/domains/post/model/Side.java b/backend/src/main/java/aimo/backend/domains/post/model/Side.java
@@ -3,8 +3,9 @@
 import lombok.Getter;
 
 public enum Side {
-	PLAINTIFF("원고"),
-	DEFENDANT("피고");
+	PLAINTIFF("plaintiff"),
+	DEFENDANT("defendant"),
+	NONE("none");
 
 	private final String value;
 

diff --git a/backend/src/main/java/aimo/backend/domains/privatePost/controller/PrivatePostController.java b/backend/src/main/java/aimo/backend/domains/privatePost/controller/PrivatePostController.java
@@ -59,9 +59,9 @@ public class PrivatePostController {
 	@PostMapping("/judgement")
 	public ResponseEntity<DataResponse<Void>> summaryAndJudgment(@Valid @RequestBody JudgementToAiRequest judgementToAiRequest) {
 
-		JudgementResponse summaryAndJudgementResponse = privatePostService.serveScriptToAi(judgementToAiRequest);
+		JudgementResponse judgementResponse = privatePostService.serveScriptToAi(judgementToAiRequest);
 
-		privatePostService.save(summaryAndJudgementResponse);
+		privatePostService.save(judgementResponse);
 
 		return ResponseEntity.status(HttpStatus.CREATED).body(DataResponse.created());
 	}
@@ -88,7 +88,6 @@ public ResponseEntity<DataResponse<SpeachToTextResponse>> speechToText(
 		return ResponseEntity.status(HttpStatus.CREATED).body(DataResponse.created(audioRecordService.speachToText(speachToTextRequest)));
 	}
 
-
 	@GetMapping("/audio/presigned")
 	public ResponseEntity<DataResponse<CreatePresignedUrlResponse>> getPresignedUrlTo(
 		@Valid @RequestBody CreatePresignedUrlRequest createPresignedUrlRequest) {

diff --git a/backend/src/main/java/aimo/backend/domains/privatePost/service/PrivatePostService.java b/backend/src/main/java/aimo/backend/domains/privatePost/service/PrivatePostService.java
@@ -20,7 +20,6 @@
 import aimo.backend.domains.privatePost.dto.response.PrivatePostResponse;
 import aimo.backend.domains.privatePost.dto.request.SummaryAndJudgementRequest;
 import aimo.backend.domains.privatePost.dto.response.JudgementFromAiResponse;
-import aimo.backend.domains.privatePost.dto.request.TextRecordRequest;
 import aimo.backend.domains.privatePost.entity.PrivatePost;
 import aimo.backend.domains.privatePost.repository.PrivatePostRepository;
 import aimo.backend.util.memberLoader.MemberLoader;
@@ -75,8 +74,8 @@ public JudgementResponse serveScriptToAi(JudgementToAiRequest judgementToAiReque
 	}
 
 	@Transactional(rollbackFor = ApiException.class)
-	public PrivatePost save(JudgementResponse summaryAndJudgementResponse) {
-		PrivatePost privatePost = PrivatePostMapper.toEntity(summaryAndJudgementResponse);
+	public PrivatePost save(JudgementResponse judgementResponse) {
+		PrivatePost privatePost = PrivatePostMapper.toEntity(judgementResponse);
 
 		if (!isValid(memberLoader.getMember().getId(), privatePost)) {
 			throw ApiException.from(PRIVATE_POST_CREATE_UNAUTHORIZED);