From d5bc04e90c477cc1a5a481f4246cd93974f040bf Mon Sep 17 00:00:00 2001
From: Tom Zhao <tom.zhao@dsv.su.se>
Date: Thu, 19 Dec 2024 12:14:06 +0100
Subject: [PATCH] 3492: Remove unused method hasUreadThreads in
ProjectForumService
---
.../su/dsv/scipro/forum/ProjectForumService.java | 2 --
.../scipro/forum/ProjectForumServiceImpl.java | 16 ++++------------
.../forum/ProjectForumServiceImplTest.java | 4 ++--
.../panels/SupervisorMyProjectsPanel.java | 1 -
4 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumService.java b/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumService.java
index 2217d9d345..a6ac11ebcd 100644
--- a/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumService.java
+++ b/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumService.java
@@ -23,7 +23,5 @@ public interface ProjectForumService {
// TODO: Get these away from here
List<Pair<ProjectThread, ForumPost>> latestPost(Project a, int amount);
- boolean hasUnreadThreads(Project project, User user);
-
long getUnreadThreadsCount(Project project, User user);
}
diff --git a/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java
index e2c0d252b4..4d72557225 100644
--- a/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java
@@ -3,7 +3,10 @@ package se.su.dsv.scipro.forum;
import com.google.common.eventbus.EventBus;
import jakarta.inject.Inject;
import jakarta.transaction.Transactional;
-import java.util.*;
+
+import java.util.List;
+import java.util.Set;
+
import se.su.dsv.scipro.file.FileSource;
import se.su.dsv.scipro.file.ProjectFileService;
import se.su.dsv.scipro.forum.dataobjects.ForumPost;
@@ -113,17 +116,6 @@ public class ProjectForumServiceImpl implements ProjectForumService {
return postRepository.latestPost(project, amount);
}
- @Override
- public boolean hasUnreadThreads(Project project, User user) {
- List<ProjectThread> threads = getThreads(project);
- for (ProjectThread thread : threads) {
- if (!basicForumService.isThreadRead(user, thread.getForumThread())) {
- return true;
- }
- }
- return false;
- }
-
@Override
public long getUnreadThreadsCount(Project project, User user) {
List<ProjectThread> threads = getThreads(project);
diff --git a/core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java
index 3f6a99dba8..321bc5b940 100644
--- a/core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java
@@ -105,9 +105,9 @@ public class ProjectForumServiceImplTest extends ForumModuleTest {
final ProjectThread thread = service.createThread(project, supervisor, "subject", "content", Set.of());
service.createReply(thread, author, "reply", Set.of());
- boolean hasUnreadThreads = service.hasUnreadThreads(project, supervisor);
+ long count = service.getUnreadThreadsCount(project, supervisor);
- assertTrue(hasUnreadThreads);
+ assertEquals(1, count);
}
private void assertNewForumThread(
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java
index 423967edff..cb76132906 100755
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java
@@ -39,7 +39,6 @@ import se.su.dsv.scipro.datatables.project.ProjectTitleColumn;
import se.su.dsv.scipro.forum.ProjectForumService;
import se.su.dsv.scipro.forum.pages.threaded.SupervisorThreadedForumPage;
import se.su.dsv.scipro.forum.panels.AbstractReadStatePanel;
-import se.su.dsv.scipro.forum.panels.NumberOfMessagesPanel;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.project.ProjectStatus;