Skip to content

Commit a8347f4

Browse files
authored
Merge pull request #200 from CodIN-INU/develop
fix : 게시글 반환 시 자신의 게시글인지 확인하는 isMine 변수 추가
2 parents 9a188ff + 0bd3eb7 commit a8347f4

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/main/java/inu/codin/codin/domain/post/dto/response/PostDetailResponseDTO.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.fasterxml.jackson.annotation.JsonFormat;
44
import inu.codin.codin.domain.post.entity.PostCategory;
55
import inu.codin.codin.domain.post.entity.PostEntity;
6-
import inu.codin.codin.domain.report.dto.ReportInfo;
76
import io.swagger.v3.oas.annotations.media.Schema;
87
import jakarta.validation.constraints.NotBlank;
98
import jakarta.validation.constraints.NotNull;
@@ -91,11 +90,13 @@ public PostDetailResponseDTO(String userId, String _id, String title, String con
9190
public static class UserInfo {
9291
private final boolean isLike;
9392
private final boolean isScrap;
93+
private final boolean isMine;
9494

9595
@Builder
96-
public UserInfo(boolean isLike, boolean isScrap) {
96+
public UserInfo(boolean isLike, boolean isScrap, boolean isMine) {
9797
this.isLike = isLike;
9898
this.isScrap = isScrap;
99+
this.isMine = isMine;
99100
}
100101
}
101102

src/main/java/inu/codin/codin/domain/post/service/PostService.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ private PostDetailResponseDTO createPostDetailResponse(PostEntity post) {
168168

169169
ObjectId userId = SecurityUtils.getCurrentUserId();
170170

171-
UserInfo userInfo = getUserInfoAboutPost(userId, post.get_id());
171+
UserInfo userInfo = getUserInfoAboutPost(userId, post.getUserId(), post.get_id());
172172

173173
// 투표 게시물 처리
174174
if (post.getPostCategory() == PostCategory.POLL) {
@@ -272,10 +272,11 @@ public void deletePostImage(String postId, String imageUrl) {
272272
}
273273
}
274274

275-
public UserInfo getUserInfoAboutPost(ObjectId userId, ObjectId postId){
275+
public UserInfo getUserInfoAboutPost(ObjectId currentUserId, ObjectId postUserId, ObjectId postId){
276276
return UserInfo.builder()
277-
.isLike(likeService.isLiked(LikeType.POST, postId, userId))
278-
.isScrap(scrapService.isPostScraped(postId, userId))
277+
.isLike(likeService.isLiked(LikeType.POST, postId, currentUserId))
278+
.isScrap(scrapService.isPostScraped(postId, currentUserId))
279+
.isMine(postUserId.equals(currentUserId))
279280
.build();
280281
}
281282

0 commit comments

Comments
 (0)