Merge pull request #498 from bounswe/fix/479-forum-missing-endpoints

Asaf31214 · web-flow · commit a7d02cf52af3 · 2025-12-11T14:53:54.000+03:00
fix: forum
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/controller/ForumController.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/controller/ForumController.java
@@ -59,6 +59,36 @@ public ResponseEntity<Void> deletePost(@PathVariable Long id, @AuthenticationPri
         return ResponseEntity.noContent().build();
     }
 
+    @PostMapping("/posts/{id}/upvote")
+    public ResponseEntity<Void> upvotePost(@PathVariable Long id, @AuthenticationPrincipal UserDetails userDetails) {
+        User user = getUser(userDetails);
+        forumService.upvotePost(id, user);
+        return ResponseEntity.ok().build();
+    }
+
+    @DeleteMapping("/posts/{id}/upvote")
+    public ResponseEntity<Void> removePostUpvote(@PathVariable Long id,
+            @AuthenticationPrincipal UserDetails userDetails) {
+        User user = getUser(userDetails);
+        forumService.removePostUpvote(id, user);
+        return ResponseEntity.ok().build();
+    }
+
+    @PostMapping("/posts/{id}/downvote")
+    public ResponseEntity<Void> downvotePost(@PathVariable Long id, @AuthenticationPrincipal UserDetails userDetails) {
+        User user = getUser(userDetails);
+        forumService.downvotePost(id, user);
+        return ResponseEntity.ok().build();
+    }
+
+    @DeleteMapping("/posts/{id}/downvote")
+    public ResponseEntity<Void> removePostDownvote(@PathVariable Long id,
+            @AuthenticationPrincipal UserDetails userDetails) {
+        User user = getUser(userDetails);
+        forumService.removePostDownvote(id, user);
+        return ResponseEntity.ok().build();
+    }
+
     @PostMapping("/posts/{id}/comments")
     public ResponseEntity<CommentResponse> createComment(@PathVariable Long id,
             @AuthenticationPrincipal UserDetails userDetails,
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/dto/PostResponse.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/dto/PostResponse.java
@@ -19,8 +19,12 @@ public class PostResponse {
     private Instant createdAt;
     private Instant updatedAt;
     private int commentCount;
+    private long upvoteCount;
+    private long downvoteCount;
+    private List<CommentResponse> comments;
 
-    public static PostResponse from(ForumPost post) {
+    public static PostResponse from(ForumPost post, long upvoteCount, long downvoteCount,
+            List<CommentResponse> comments) {
         return PostResponse.builder()
                 .id(post.getId())
                 .title(post.getTitle())
@@ -31,6 +35,9 @@ public static PostResponse from(ForumPost post) {
                 .createdAt(post.getCreatedAt())
                 .updatedAt(post.getUpdatedAt())
                 .commentCount(post.getComments() != null ? post.getComments().size() : 0)
+                .upvoteCount(upvoteCount)
+                .downvoteCount(downvoteCount)
+                .comments(comments)
                 .build();
     }
 }
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/model/ForumPost.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/model/ForumPost.java
@@ -43,6 +43,14 @@ public class ForumPost {
     @Builder.Default
     private List<ForumComment> comments = new ArrayList<>();
 
+    @OneToMany(mappedBy = "post", cascade = CascadeType.ALL, orphanRemoval = true)
+    @Builder.Default
+    private List<ForumPostUpvote> upvotes = new ArrayList<>();
+
+    @OneToMany(mappedBy = "post", cascade = CascadeType.ALL, orphanRemoval = true)
+    @Builder.Default
+    private List<ForumPostDownvote> downvotes = new ArrayList<>();
+
     @CreationTimestamp
     @Column(nullable = false, updatable = false)
     private Instant createdAt;
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/model/ForumPostDownvote.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/model/ForumPostDownvote.java
@@ -0,0 +1,36 @@
+package org.bounswe.jobboardbackend.forum.model;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.bounswe.jobboardbackend.auth.model.User;
+import org.hibernate.annotations.CreationTimestamp;
+
+import java.time.Instant;
+
+@Entity
+@Table(name = "forum_post_downvotes", uniqueConstraints = {
+        @UniqueConstraint(columnNames = { "user_id", "post_id" })
+})
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ForumPostDownvote {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "post_id", nullable = false)
+    private ForumPost post;
+
+    @CreationTimestamp
+    @Column(nullable = false, updatable = false)
+    private Instant createdAt;
+}
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/model/ForumPostUpvote.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/model/ForumPostUpvote.java
@@ -0,0 +1,36 @@
+package org.bounswe.jobboardbackend.forum.model;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.bounswe.jobboardbackend.auth.model.User;
+import org.hibernate.annotations.CreationTimestamp;
+
+import java.time.Instant;
+
+@Entity
+@Table(name = "forum_post_upvotes", uniqueConstraints = {
+        @UniqueConstraint(columnNames = { "user_id", "post_id" })
+})
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ForumPostUpvote {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "post_id", nullable = false)
+    private ForumPost post;
+
+    @CreationTimestamp
+    @Column(nullable = false, updatable = false)
+    private Instant createdAt;
+}
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/repository/ForumPostDownvoteRepository.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/repository/ForumPostDownvoteRepository.java
@@ -0,0 +1,12 @@
+package org.bounswe.jobboardbackend.forum.repository;
+
+import org.bounswe.jobboardbackend.forum.model.ForumPostDownvote;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface ForumPostDownvoteRepository extends JpaRepository<ForumPostDownvote, Long> {
+    Optional<ForumPostDownvote> findByUserIdAndPostId(Long userId, Long postId);
+
+    long countByPostId(Long postId);
+}
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/repository/ForumPostUpvoteRepository.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/repository/ForumPostUpvoteRepository.java
@@ -0,0 +1,12 @@
+package org.bounswe.jobboardbackend.forum.repository;
+
+import org.bounswe.jobboardbackend.forum.model.ForumPostUpvote;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface ForumPostUpvoteRepository extends JpaRepository<ForumPostUpvote, Long> {
+    Optional<ForumPostUpvote> findByUserIdAndPostId(Long userId, Long postId);
+
+    long countByPostId(Long postId);
+}
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/service/ForumService.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/forum/service/ForumService.java
@@ -10,10 +10,14 @@
 import org.bounswe.jobboardbackend.forum.model.ForumCommentDownvote;
 import org.bounswe.jobboardbackend.forum.model.ForumCommentUpvote;
 import org.bounswe.jobboardbackend.forum.model.ForumPost;
+import org.bounswe.jobboardbackend.forum.model.ForumPostDownvote;
+import org.bounswe.jobboardbackend.forum.model.ForumPostUpvote;
 import org.bounswe.jobboardbackend.forum.repository.ForumCommentDownvoteRepository;
 import org.bounswe.jobboardbackend.forum.repository.ForumCommentRepository;
 import org.bounswe.jobboardbackend.forum.repository.ForumCommentUpvoteRepository;
+import org.bounswe.jobboardbackend.forum.repository.ForumPostDownvoteRepository;
 import org.bounswe.jobboardbackend.forum.repository.ForumPostRepository;
+import org.bounswe.jobboardbackend.forum.repository.ForumPostUpvoteRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -29,6 +33,8 @@ public class ForumService {
     private final ForumCommentRepository commentRepository;
     private final ForumCommentUpvoteRepository upvoteRepository;
     private final ForumCommentDownvoteRepository downvoteRepository;
+    private final ForumPostUpvoteRepository postUpvoteRepository;
+    private final ForumPostDownvoteRepository postDownvoteRepository;
 
     @Transactional
     public PostResponse createPost(User author, CreatePostRequest request) {
@@ -40,21 +46,21 @@ public PostResponse createPost(User author, CreatePostRequest request) {
                 .build();
 
         ForumPost savedPost = postRepository.save(post);
-        return PostResponse.from(savedPost);
+        return toPostResponse(savedPost);
     }
 
     @Transactional(readOnly = true)
     public List<PostResponse> findAllPosts() {
         return postRepository.findAll().stream()
-                .map(PostResponse::from)
+                .map(this::toPostResponse)
                 .collect(Collectors.toList());
     }
 
     @Transactional(readOnly = true)
     public PostResponse findPostById(Long id) {
         ForumPost post = postRepository.findById(id)
                 .orElseThrow(() -> new HandleException(ErrorCode.NOT_FOUND, "Post not found"));
-        return PostResponse.from(post);
+        return toPostResponse(post);
     }
 
     @Transactional
@@ -77,7 +83,7 @@ public PostResponse updatePost(Long id, User user, UpdatePostRequest request) {
         }
 
         ForumPost updatedPost = postRepository.save(post);
-        return PostResponse.from(updatedPost);
+        return toPostResponse(updatedPost);
     }
 
     @Transactional
@@ -211,4 +217,63 @@ private CommentResponse toCommentResponse(ForumComment comment) {
         long downvotes = downvoteRepository.countByCommentId(comment.getId());
         return CommentResponse.from(comment, upvotes, downvotes);
     }
+
+    private PostResponse toPostResponse(ForumPost post) {
+        long upvotes = postUpvoteRepository.countByPostId(post.getId());
+        long downvotes = postDownvoteRepository.countByPostId(post.getId());
+        List<CommentResponse> comments = post.getComments().stream()
+                .map(this::toCommentResponse)
+                .collect(Collectors.toList());
+        return PostResponse.from(post, upvotes, downvotes, comments);
+    }
+
+    @Transactional
+    public void upvotePost(Long postId, User user) {
+        ForumPost post = postRepository.findById(postId)
+                .orElseThrow(() -> new HandleException(ErrorCode.NOT_FOUND, "Post not found"));
+
+        if (postUpvoteRepository.findByUserIdAndPostId(user.getId(), postId).isPresent()) {
+            return;
+        }
+
+        postDownvoteRepository.findByUserIdAndPostId(user.getId(), postId)
+                .ifPresent(postDownvoteRepository::delete);
+
+        ForumPostUpvote upvote = ForumPostUpvote.builder()
+                .user(user)
+                .post(post)
+                .build();
+        postUpvoteRepository.save(upvote);
+    }
+
+    @Transactional
+    public void removePostUpvote(Long postId, User user) {
+        postUpvoteRepository.findByUserIdAndPostId(user.getId(), postId)
+                .ifPresent(postUpvoteRepository::delete);
+    }
+
+    @Transactional
+    public void downvotePost(Long postId, User user) {
+        ForumPost post = postRepository.findById(postId)
+                .orElseThrow(() -> new HandleException(ErrorCode.NOT_FOUND, "Post not found"));
+
+        if (postDownvoteRepository.findByUserIdAndPostId(user.getId(), postId).isPresent()) {
+            return;
+        }
+
+        postUpvoteRepository.findByUserIdAndPostId(user.getId(), postId)
+                .ifPresent(postUpvoteRepository::delete);
+
+        ForumPostDownvote downvote = ForumPostDownvote.builder()
+                .user(user)
+                .post(post)
+                .build();
+        postDownvoteRepository.save(downvote);
+    }
+
+    @Transactional
+    public void removePostDownvote(Long postId, User user) {
+        postDownvoteRepository.findByUserIdAndPostId(user.getId(), postId)
+                .ifPresent(postDownvoteRepository::delete);
+    }
 }
diff --git a/apps/jobboard-backend/src/test/java/org/bounswe/jobboardbackend/forum/service/ForumServiceTest.java b/apps/jobboard-backend/src/test/java/org/bounswe/jobboardbackend/forum/service/ForumServiceTest.java
@@ -12,7 +12,9 @@
 import org.bounswe.jobboardbackend.forum.repository.ForumCommentDownvoteRepository;
 import org.bounswe.jobboardbackend.forum.repository.ForumCommentRepository;
 import org.bounswe.jobboardbackend.forum.repository.ForumCommentUpvoteRepository;
+import org.bounswe.jobboardbackend.forum.repository.ForumPostDownvoteRepository;
 import org.bounswe.jobboardbackend.forum.repository.ForumPostRepository;
+import org.bounswe.jobboardbackend.forum.repository.ForumPostUpvoteRepository;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -43,6 +45,12 @@ class ForumServiceTest {
     @Mock
     private ForumCommentDownvoteRepository downvoteRepository;
 
+    @Mock
+    private ForumPostUpvoteRepository postUpvoteRepository;
+
+    @Mock
+    private ForumPostDownvoteRepository postDownvoteRepository;
+
     @InjectMocks
     private ForumService forumService;
 
