Dev to main

src/main/java/balancetalk/module/comment/application/CommentService.java

@@ -265,7 +265,8 @@ public List<CommentResponse> findBestComments(Long postId, String token) {
     public void reportComment(Long postId, Long commentId, ReportRequest reportRequest) {
         Comment comment = validateCommentId(commentId);
         Member member = getCurrentMember(memberRepository);
-        if (reportRepository.existsByReporter(member)) {
+        if (reportRepository.existsByReporterAndComment(member, comment)) {
+
             throw new BalanceTalkException(ALREADY_REPORTED_COMMENT);
         }
         if (comment.getMember().equals(member)) {

src/main/java/balancetalk/module/comment/dto/ReplyResponse.java

@@ -45,6 +45,9 @@ public class ReplyResponse {
     @Schema(description = "답글 수정 날짜")
     private LocalDateTime lastModifiedAt;
 
+    @Schema(description = "답글 작성자 ID")
+    private Long writerId;
+
     @Schema(description = "답글 작성자 프로필 사진 경로", example = "https://balance-talk-static-files4df23447-2355-45h2-8783-7f6gd2ceb848_프로필.jpg")
     private String profileImageUrl;
 
@@ -60,6 +63,7 @@ public static ReplyResponse fromEntity(Comment comment, Long balanceOptionId, bo
                 .myLike(myLike)
                 .createdAt(comment.getCreatedAt())
                 .lastModifiedAt(comment.getLastModifiedAt())
+                .writerId(comment.getMember().getId())
                 .profileImageUrl(getProfileImageUrl(comment.getMember()))
                 .build();
     }

src/main/java/balancetalk/module/member/dto/ProfileResponse.java

@@ -1,13 +1,14 @@
 package balancetalk.module.member.dto;
 
+import balancetalk.module.file.domain.File;
 import balancetalk.module.member.domain.Member;
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-
 import java.time.LocalDateTime;
+import java.util.Optional;
 
 @Data
 @Builder
@@ -33,8 +34,11 @@ public class ProfileResponse {
     private int level;
 
     public static ProfileResponse fromEntity(Member member) {
+        String profileImageUrl = Optional.ofNullable(member.getProfilePhoto())
+                .map(File::getUrl)
+                .orElse(null);
         return ProfileResponse.builder()
-                .profileImageUrl(member.getProfilePhoto().getUrl())
+                .profileImageUrl(profileImageUrl)
                 .nickname(member.getNickname())
                 .createdAt(member.getCreatedAt())
                 .postsCount(member.getPostCount())

src/main/java/balancetalk/module/member/presentation/MemberController.java

@@ -118,6 +118,7 @@ public String reissueAccessToken(HttpServletRequest request) {
 
     @ResponseStatus(HttpStatus.OK)
     @GetMapping("/{memberId}/profile")
+    @Operation(summary = "회원 프로필 조회", description = "회원 프로필을 조회한다.")
     public ProfileResponse memberProfile(@PathVariable("memberId") Long memberId) {
         return memberService.memberProfile(memberId);
     }

src/main/java/balancetalk/module/post/application/PostService.java

@@ -241,7 +241,7 @@ public void reportPost(Long postId, ReportRequest reportRequest) {
         Post post = postRepository.findById(postId)
                 .orElseThrow(() -> new BalanceTalkException(NOT_FOUND_POST));
         Member member = getCurrentMember(memberRepository);
-        if (reportRepository.existsByReporter(member)) {
+        if (reportRepository.existsByReporterAndPost(member, post)) {
             throw new BalanceTalkException(ALREADY_REPORTED_POST);
         }
         if (post.getMember().equals(member)) {

src/main/java/balancetalk/module/post/domain/Post.java

@@ -7,13 +7,17 @@
 import balancetalk.module.member.domain.Member;
 import balancetalk.module.report.domain.Report;
 import jakarta.persistence.*;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.PositiveOrZero;
+import jakarta.validation.constraints.Size;
 import lombok.*;
 import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.Formula;
+
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import org.hibernate.annotations.Formula;
 
 @Entity
 @Getter
@@ -33,7 +37,6 @@ public class Post extends BaseTimeEntity {
     private String title;
 
     @NotNull
-    @Future
     @Column(nullable = false)
     private LocalDateTime deadline;
 
@@ -94,7 +97,7 @@ public long commentsCount() {
         }
         return comments.size();
     }
-    
+
     @PrePersist
     public void init() {
         this.views = 0L;
@@ -116,4 +119,8 @@ public boolean hasDeadlineExpired() {
     public void increaseViews() {
         views++;
     }
+
+    public boolean isClosed() {
+        return LocalDateTime.now().isAfter(deadline);
+    }
 }

src/main/java/balancetalk/module/post/dto/PostResponse.java

@@ -1,14 +1,16 @@
 package balancetalk.module.post.dto;
 
-import balancetalk.module.ViewStatus;
 import balancetalk.module.file.domain.File;
 import balancetalk.module.member.domain.Member;
 import balancetalk.module.post.domain.BalanceOption;
 import balancetalk.module.post.domain.Post;
 import balancetalk.module.post.domain.PostCategory;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
 import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
@@ -30,6 +32,9 @@ public class PostResponse {
     @Schema(description = "투료 종료 기한", example = "2024/12/25 15:30:00")
     private LocalDateTime deadline;
 
+    @Schema(description = "마감 여부", example = "true")
+    private Boolean isClosed;
+
     @Schema(description = "게시글 조회수", example = "126")
     private long views;
 
@@ -86,6 +91,7 @@ public static PostResponse fromEntity(Post post, Member member, boolean myLike,
                 .id(post.getId())
                 .title(post.getTitle())
                 .deadline(post.getDeadline())
+                .isClosed(post.isClosed())
                 .views(post.getViews())
 //                .viewStatus(post.getViewStatus())
                 .likesCount(post.likesCount())
@@ -140,11 +146,11 @@ private static Long getSelectedOptionId(Post post, Member member) {
                 .orElse(null);
     }
 
-        private static int getTotalVotes (Post post){
-            return Optional.ofNullable(post.getOptions())
-                    .map(options -> options.stream()
-                            .mapToInt(option -> Optional.ofNullable(option.getVotes()).map(List::size).orElse(0))
-                            .sum())
-                    .orElse(0);
+    private static int getTotalVotes(Post post) {
+        return Optional.ofNullable(post.getOptions())
+                .map(options -> options.stream()
+                        .mapToInt(option -> Optional.ofNullable(option.getVotes()).map(List::size).orElse(0))
+                        .sum())
+                .orElse(0);
     }
 }

src/main/java/balancetalk/module/report/domain/ReportRepository.java

@@ -1,9 +1,13 @@
 package balancetalk.module.report.domain;
 
+import balancetalk.module.comment.domain.Comment;
 import balancetalk.module.member.domain.Member;
+import balancetalk.module.post.domain.Post;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ReportRepository extends JpaRepository<Report, Long> {
 
-    boolean existsByReporter(Member reporter);
+    boolean existsByReporterAndPost(Member reporter, Post post);
+
+    boolean existsByReporterAndComment(Member reporter, Comment comment);
 }