Remove warning

ls1intum · Dec 23, 2024 · 74a3d4d · 74a3d4d
1 parent 97c0636
commit 74a3d4d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 28 deletions.
diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/AnswerPost.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/AnswerPost.java
@@ -14,7 +14,6 @@
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.annotations.SQLRestriction;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -39,13 +38,6 @@ public class AnswerPost extends Posting {
     @OneToMany(mappedBy = "answerPost", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.EAGER)
     private Set<Reaction> reactions = new HashSet<>();
 
-    /***
-     * The value 1 represents an answer post, given by the enum {{@link PostingType}}
-     */
-    @OneToMany(mappedBy = "postId", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
-    @SQLRestriction("post_type = 1")
-    private Set<SavedPost> savedPosts = new HashSet<>();
-
     @ManyToOne
     @JsonIncludeProperties({ "id", "exercise", "lecture", "course", "courseWideContext", "conversation", "author" })
     private Post post;
@@ -90,11 +82,6 @@ public void setPost(Post post) {
         this.post = post;
     }
 
-    @JsonIgnore
-    public Set<SavedPost> getSavedPosts() {
-        return savedPosts;
-    }
-
     @JsonProperty("isSaved")
     public boolean getIsSaved() {
         return isSaved;

diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java b/src/main/java/de/tum/cit/aet/artemis/communication/domain/Post.java
@@ -21,7 +21,6 @@
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.annotations.SQLRestriction;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -57,13 +56,6 @@ public class Post extends Posting {
     @OneToMany(mappedBy = "post", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.EAGER)
     private Set<AnswerPost> answers = new HashSet<>();
 
-    /***
-     * The value 0 represents a post, given by the enum {{@link PostingType}}
-     */
-    @OneToMany(mappedBy = "postId", cascade = CascadeType.REMOVE, orphanRemoval = true, fetch = FetchType.LAZY)
-    @SQLRestriction("post_type = 0")
-    private Set<SavedPost> savedPosts = new HashSet<>();
-
     @ElementCollection(fetch = FetchType.EAGER)
     @CollectionTable(name = "post_tag", joinColumns = @JoinColumn(name = "post_id"))
     @Column(name = "text")
@@ -235,11 +227,6 @@ public void setVoteCount(Integer voteCount) {
         this.voteCount = voteCount != null ? voteCount : 0;
     }
 
-    @JsonIgnore
-    public Set<SavedPost> getSavedPosts() {
-        return savedPosts;
-    }
-
     @JsonProperty("isSaved")
     public boolean getIsSaved() {
         return isSaved;

diff --git a/...n/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java b/...n/java/de/tum/cit/aet/artemis/communication/repository/ConversationMessageRepository.java
@@ -114,7 +114,6 @@ private PageImpl<Post> findPostsWithSpecification(Pageable pageable, Specificati
                 LEFT JOIN FETCH p.conversation
                 LEFT JOIN FETCH p.reactions
                 LEFT JOIN FETCH p.tags
-                LEFT JOIN FETCH p.savedPosts
                 LEFT JOIN FETCH p.answers a
                     LEFT JOIN FETCH a.reactions
                     LEFT JOIN FETCH a.post

diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/repository/SavedPostRepository.java b/src/main/java/de/tum/cit/aet/artemis/communication/repository/SavedPostRepository.java
@@ -46,6 +46,16 @@ public interface SavedPostRepository extends ArtemisJpaRepository<SavedPost, Lon
      */
     SavedPost findSavedPostByUserIdAndPostIdAndPostType(Long userId, Long postId, PostingType postType);
 
+    /***
+     * Get all saved posts by connected post/answer post id and posting type. Not cached.
+     *
+     * @param postId   of the bookmark
+     * @param postType of the bookmark
+     *
+     * @return List of all saved posts connected to the corresponding entity.
+     */
+    List<SavedPost> findSavedPostByPostIdAndPostType(Long postId, PostingType postType);
+
     /***
      * Query all post ids that a user has saved by a certain posting type. Cached by user id and post type.
      *

diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/AnswerMessageService.java
@@ -12,6 +12,7 @@
 
 import de.tum.cit.aet.artemis.communication.domain.AnswerPost;
 import de.tum.cit.aet.artemis.communication.domain.Post;
+import de.tum.cit.aet.artemis.communication.domain.PostingType;
 import de.tum.cit.aet.artemis.communication.domain.conversation.Channel;
 import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation;
 import de.tum.cit.aet.artemis.communication.domain.notification.SingleUserNotification;
@@ -209,6 +210,10 @@ public void deleteAnswerMessageById(Long courseId, Long answerMessageId) {
         answerPostRepository.deleteById(answerMessageId);
         preparePostForBroadcast(updatedMessage);
 
+        // Delete all connected saved posts
+        var savedPosts = savedPostRepository.findSavedPostByPostIdAndPostType(answerMessageId, PostingType.ANSWER);
+        savedPostRepository.deleteAll(savedPosts);
+
         broadcastForPost(new PostDTO(updatedMessage, MetisCrudAction.UPDATE), course.getId(), null, null);
     }
 

diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/ConversationMessagingService.java
@@ -27,6 +27,7 @@
 import de.tum.cit.aet.artemis.communication.domain.DisplayPriority;
 import de.tum.cit.aet.artemis.communication.domain.NotificationType;
 import de.tum.cit.aet.artemis.communication.domain.Post;
+import de.tum.cit.aet.artemis.communication.domain.PostingType;
 import de.tum.cit.aet.artemis.communication.domain.conversation.Channel;
 import de.tum.cit.aet.artemis.communication.domain.conversation.Conversation;
 import de.tum.cit.aet.artemis.communication.domain.conversation.GroupChat;
@@ -371,6 +372,10 @@ public void deleteMessageById(Long courseId, Long postId) {
         conversationParticipantRepository.decrementUnreadMessagesCountOfParticipants(conversation.getId(), user.getId());
         conversation = conversationService.getConversationById(conversation.getId());
 
+        // Delete all connected saved posts
+        var savedPosts = savedPostRepository.findSavedPostByPostIdAndPostType(postId, PostingType.POST);
+        savedPostRepository.deleteAll(savedPosts);
+
         conversationService.notifyAllConversationMembersAboutUpdate(conversation);
         preparePostForBroadcast(post);
         broadcastForPost(new PostDTO(post, MetisCrudAction.DELETE), course.getId(), null, null);

diff --git a/src/main/java/de/tum/cit/aet/artemis/communication/service/SavedPostScheduleService.java b/src/main/java/de/tum/cit/aet/artemis/communication/service/SavedPostScheduleService.java
@@ -45,7 +45,7 @@ public void cleanupArchivedSavedPosts() {
     /**
      * Cleans up all saved posts where the post entity does not exist anymore
      */
-    @Scheduled(cron = "0 0 0 * * *")
+    @Scheduled(cron = "0 5 0 * * *")
     public void cleanupOrphanedSavedPosts() {
         List<SavedPost> orphanedPosts = savedPostRepository.findOrphanedPostReferences();
         if (!orphanedPosts.isEmpty()) {