From 74cee39f1aa2043b9335a1680a8823d264e2c506 Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Mon, 20 Jun 2022 23:50:39 +0200
Subject: [PATCH] [AB-12] fixing not ignoring ignored starboard posts in
 starstats fixes #12

---
 .../repository/StarboardPostReactionRepository.java         | 3 ++-
 .../starboard/repository/StarboardPostRepository.java       | 2 +-
 .../abstracto/starboard/service/StarboardServiceBean.java   | 6 +++++-
 .../management/StarboardPostManagementServiceBean.java      | 2 +-
 .../management/StarboardPostManagementServiceBeanTest.java  | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/repository/StarboardPostReactionRepository.java b/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/repository/StarboardPostReactionRepository.java
index 40f49026f..1d51cd1d2 100644
--- a/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/repository/StarboardPostReactionRepository.java
+++ b/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/repository/StarboardPostReactionRepository.java
@@ -30,7 +30,8 @@ public interface StarboardPostReactionRepository extends JpaRepository<Starboard
     @Query(value = "SELECT COUNT(*) \n" +
             "FROM starboard_post_reaction r \n" +
             "INNER JOIN starboard_post p ON p.id = r.post_id\n" +
-            "WHERE p.server_id = :serverId\n"
+            "WHERE p.server_id = :serverId\n" +
+            "AND p.ignored = false"
             , nativeQuery = true)
     Integer getReactionCountByServer(Long serverId);
 
diff --git a/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/repository/StarboardPostRepository.java b/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/repository/StarboardPostRepository.java
index 794075bd0..3466b7727 100644
--- a/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/repository/StarboardPostRepository.java
+++ b/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/repository/StarboardPostRepository.java
@@ -18,7 +18,7 @@ public interface StarboardPostRepository extends JpaRepository<StarboardPost, Lo
 
     List<StarboardPost> findByServer_Id(Long serverId);
 
-    Long countByServer_Id(Long serverId);
+    Long countByServer_IdAndIgnoredIsFalse(Long serverId);
 
     @Query(value = "SELECT p.id, COUNT(*) AS starCount \n" +
             " FROM starboard_post p \n" +
diff --git a/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/service/StarboardServiceBean.java b/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/service/StarboardServiceBean.java
index d3181d4c3..3cc1967ab 100644
--- a/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/service/StarboardServiceBean.java
+++ b/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/service/StarboardServiceBean.java
@@ -218,7 +218,11 @@ public class StarboardServiceBean implements StarboardService {
         allFutures.addAll(topStarReceiverFutures);
         return FutureUtils.toSingleFuture(allFutures).thenApply(aVoid -> {
             List<StarboardPost> starboardPosts = starboardPostManagementService.retrieveTopPosts(serverId, count);
-            List<StarStatsPost> starStatsPosts = starboardPosts.stream().map(this::fromStarboardPost).sorted(Comparator.comparingLong(StarStatsPost::getStarCount).reversed()).collect(Collectors.toList());
+            List<StarStatsPost> starStatsPosts = starboardPosts
+                    .stream()
+                    .map(this::fromStarboardPost)
+                    .sorted(Comparator.comparingLong(StarStatsPost::getStarCount).reversed())
+                    .collect(Collectors.toList());
             Long postCount = starboardPostManagementService.getPostCount(serverId);
             Integer reactionCount = starboardPostReactorManagementService.getStarCount(serverId);
             List<String> emotes = new ArrayList<>();
diff --git a/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/service/management/StarboardPostManagementServiceBean.java b/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/service/management/StarboardPostManagementServiceBean.java
index cab01aef7..b256ec7e2 100644
--- a/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/service/management/StarboardPostManagementServiceBean.java
+++ b/abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/service/management/StarboardPostManagementServiceBean.java
@@ -85,7 +85,7 @@ public class StarboardPostManagementServiceBean implements StarboardPostManageme
 
     @Override
     public Long getPostCount(Long serverId) {
-        return repository.countByServer_Id(serverId);
+        return repository.countByServer_IdAndIgnoredIsFalse(serverId);
     }
 
     @Override
diff --git a/abstracto-application/abstracto-modules/starboard/starboard-impl/src/test/java/dev/sheldan/abstracto/starboard/service/management/StarboardPostManagementServiceBeanTest.java b/abstracto-application/abstracto-modules/starboard/starboard-impl/src/test/java/dev/sheldan/abstracto/starboard/service/management/StarboardPostManagementServiceBeanTest.java
index d04153360..81e23288d 100644
--- a/abstracto-application/abstracto-modules/starboard/starboard-impl/src/test/java/dev/sheldan/abstracto/starboard/service/management/StarboardPostManagementServiceBeanTest.java
+++ b/abstracto-application/abstracto-modules/starboard/starboard-impl/src/test/java/dev/sheldan/abstracto/starboard/service/management/StarboardPostManagementServiceBeanTest.java
@@ -206,7 +206,7 @@ public class StarboardPostManagementServiceBeanTest {
     @Test
     public void testRetrievePostCount() {
         Long expectedCount = 2L;
-        when(repository.countByServer_Id(SERVER_ID)).thenReturn(expectedCount);
+        when(repository.countByServer_IdAndIgnoredIsFalse(SERVER_ID)).thenReturn(expectedCount);
         Long retrievedPostCount = testUnit.getPostCount(SERVER_ID);
         Assert.assertEquals(expectedCount, retrievedPostCount);
     }