Merge branch 'develop' of https://github.com/TeamMody/mody-server into develop

Author: seoshinehyo

src/main/java/com/example/mody/domain/post/dto/response/PostImageResponse.java

@@ -9,7 +9,7 @@
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 public class PostImageResponse {
     private String s3Url;
-    public static PostImageResponse of(PostImage postImage){
+    public static PostImageResponse from(PostImage postImage){
         return new PostImageResponse(postImage.getUrl());
     }
 }

src/main/java/com/example/mody/domain/post/dto/response/PostResponse.java

@@ -13,6 +13,7 @@ public class PostResponse {
     private Long postId;
     private Long writerId;
     private String writerNickName;
+    private Boolean isMine;
     private String content;
     private Boolean isPublic;
     private Integer likeCount;
@@ -23,6 +24,7 @@ public class PostResponse {
     public PostResponse(Long postId,
                         Long writerId,
                         String nickName,
+                        Boolean isMine,
                         String content,
                         Boolean isPublic,
                         Integer likeCount,
@@ -32,13 +34,14 @@ public PostResponse(Long postId,
         this.postId = postId;
         this.writerId = writerId;
         this.writerNickName = nickName;
+        this.isMine = isMine;
         this.content = content;
         this.isPublic = isPublic;
         this.likeCount = likeCount;
         this.isLiked = isLiked;
         this.bodyType = bodyType;
         this.files = files.stream()
-                .map(PostImageResponse::of)
+                .map(PostImageResponse::from)
                 .toList();
     }
 }

src/main/java/com/example/mody/domain/post/entity/Post.java

@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.*;
 import org.hibernate.annotations.DynamicUpdate;
 
 import com.example.mody.domain.bodytype.entity.BodyType;
@@ -23,9 +24,6 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
 
 @Entity(name = "post")
 @Getter
@@ -62,14 +60,15 @@ public class Post extends BaseEntity {
 	private String content;
 
 	@Column(nullable = false)
-	private Integer likeCount;
+	private Integer likeCount = 0;
 
 	@Column(nullable = false)
 	private Boolean isPublic;
 
 	@Column(nullable = false)
-	private Integer reportCount;
+	private Integer reportCount = 0;
 
+	@Builder
 	public Post(Member member, BodyType bodyType, String content, Boolean isPublic) {
 		this.member = member;
 		this.bodyType = bodyType;
@@ -78,6 +77,7 @@ public Post(Member member, BodyType bodyType, String content, Boolean isPublic)
 		this.likeCount = 0;
 		this.reportCount = 0;
 		this.images = new ArrayList<>();
+		this.likes = new ArrayList<>();
 	}
 
 	public void decreaseLikeCount() {

src/main/java/com/example/mody/domain/post/entity/PostImage.java

@@ -23,6 +23,11 @@ public class PostImage extends BaseEntity {
     @Column(nullable = false)
     private String url;
 
+    /**
+     * 필드 개수가 적고, 필드들이 필수값이므로 빌더 패턴을 사용하지 않고 생성자를 사용함
+     * @param post
+     * @param s3Url
+     */
     public PostImage(Post post, String s3Url){
         this.post = post;
         this.url = s3Url;

src/main/java/com/example/mody/domain/post/repository/PostCustomRepositoryImpl.java

@@ -93,6 +93,7 @@ public PostListResponse getPostList(Optional<Post> cursorPost, Integer size, Mem
                                 qPost.id,
                                 qMember.id,
                                 qMember.nickname,
+                                qMember.eq(member),
                                 qPost.content,
                                 qPost.isPublic,
                                 qPost.likeCount,
@@ -142,6 +143,7 @@ public LikedPostsResponse getLikedPosts(Long cursor, Integer size, Member member
                                 qPost.id,
                                 qMember.id,
                                 qMember.nickname,
+                                qMember.eq(member),
                                 qPost.content,
                                 qPost.isPublic,
                                 qPost.likeCount,
@@ -192,6 +194,7 @@ public PostListResponse getMyPosts(Long cursor, Integer size, Member member) {
                                 qPost.id,
                                 qMember.id,
                                 qMember.nickname,
+                                qMember.eq(member),
                                 qPost.content,
                                 qPost.isPublic,
                                 qPost.likeCount,

src/main/java/com/example/mody/domain/post/service/PostCommandServiceImpl.java

@@ -16,6 +16,7 @@
 import com.example.mody.global.common.exception.RestApiException;
 import com.example.mody.global.common.exception.code.status.S3ErrorStatus;
 import org.springframework.http.HttpMethod;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -66,10 +67,12 @@ public void createPost(PostCreateRequest postCreateRequest, Member member) {
 
 		BodyType bodyType = optionalBodyType.orElseThrow(() -> new BodyTypeException(MEMBER_BODY_TYPE_NOT_FOUND));
 
-		Post post = new Post(member,
-			bodyType,
-			postCreateRequest.getContent(),
-			postCreateRequest.getIsPublic());
+		Post post = Post.builder()
+				.member(member)
+				.bodyType(bodyType)
+				.content(postCreateRequest.getContent())
+				.isPublic(postCreateRequest.getIsPublic())
+				.build();
 
 		postCreateRequest.getS3Urls().forEach(s3Url -> {
 			validateS3Url(s3Url); // 유효한 S3 url인지 검증

src/main/java/com/example/mody/domain/post/service/PostQueryServiceImpl.java

@@ -96,7 +96,7 @@ public PostResponse getPost(Member member, Long postId){
 
         Optional<MemberPostLike> existingLike = postLikeRepository.findByPostAndMember(post, member);
 
-        PostResponse postResponse = new PostResponse(post.getId(), post.getMember().getId(),post.getMember().getNickname(), post.getContent(), post.getIsPublic(), post.getLikeCount(), existingLike.isPresent() ,post.getBodyType().getName(), post.getImages());
+        PostResponse postResponse = new PostResponse(post.getId(), post.getMember().getId(),post.getMember().getNickname(),post.getMember().equals(member), post.getContent(), post.getIsPublic(), post.getLikeCount(), existingLike.isPresent() ,post.getBodyType().getName(), post.getImages());
 
         return postResponse;
     }