From da91d4074d1a9b763b8dac96bb076dc029949402 Mon Sep 17 00:00:00 2001
From: Andreas Svanberg <andreass@dsv.su.se>
Date: Tue, 21 Jan 2025 11:18:00 +0100
Subject: [PATCH] Replace direct repository access with a service
---
.../se/su/dsv/scipro/finalseminar/OppositionReportPage.java | 4 ++--
view/src/test/java/se/su/dsv/scipro/SciProTest.java | 3 ---
.../dsv/scipro/finalseminar/OppositionReportPageTest.java | 6 +++---
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.java
index fc35785ba1..743e8aaee5 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.java
@@ -24,7 +24,7 @@ public class OppositionReportPage extends AbstractProjectDetailsPage implements
public static final String FILL_OUT_REPORT = "fillOutReport";
@Inject
- private FinalSeminarOppositionRepo finalSeminarOppositionRepo;
+ private FinalSeminarOppositionService finalSeminarOppositionService;
@Inject
private OppositionReportService oppositionReportService;
@@ -35,7 +35,7 @@ public class OppositionReportPage extends AbstractProjectDetailsPage implements
throw new RestartResponseException(ProjectDetailsPage.class, pp);
}
- final FinalSeminarOpposition opposition = finalSeminarOppositionRepo.findOne(pp.get("oid").toLong());
+ final FinalSeminarOpposition opposition = finalSeminarOppositionService.findOne(pp.get("oid").toLong());
if (opposition == null) {
throw new RestartResponseException(ProjectDetailsPage.class, pp);
diff --git a/view/src/test/java/se/su/dsv/scipro/SciProTest.java b/view/src/test/java/se/su/dsv/scipro/SciProTest.java
index 768b84e0df..12c77ff7cc 100755
--- a/view/src/test/java/se/su/dsv/scipro/SciProTest.java
+++ b/view/src/test/java/se/su/dsv/scipro/SciProTest.java
@@ -321,9 +321,6 @@ public abstract class SciProTest {
@Mock
protected FinalSeminarUploadController finalSeminarUploadController;
- @Mock
- protected FinalSeminarOppositionRepo finalSeminarOppositionRepo;
-
@Mock
protected PlagiarismControl plagiarismControl;
diff --git a/view/src/test/java/se/su/dsv/scipro/finalseminar/OppositionReportPageTest.java b/view/src/test/java/se/su/dsv/scipro/finalseminar/OppositionReportPageTest.java
index 6e9d239fa4..05b2d9a1f5 100644
--- a/view/src/test/java/se/su/dsv/scipro/finalseminar/OppositionReportPageTest.java
+++ b/view/src/test/java/se/su/dsv/scipro/finalseminar/OppositionReportPageTest.java
@@ -104,14 +104,14 @@ public class OppositionReportPageTest extends SciProTest {
public void disable_form_if_opposition_does_not_belong_to_logged_in_user() {
mockReport(bachelor);
long oppositionId = 4L;
- Mockito.when(finalSeminarOppositionRepo.findOne(oppositionId)).thenReturn(finalSeminarOpposition);
+ Mockito.when(finalSeminarOppositionService.findOne(oppositionId)).thenReturn(finalSeminarOpposition);
startPage(oppositionId);
tester.assertDisabled(FILL_OUT_REPORT);
}
@Test
public void redirect_if_no_opposition_is_found_from_id() {
- Mockito.when(finalSeminarOppositionRepo.findOne(ArgumentMatchers.anyLong())).thenReturn(null);
+ Mockito.when(finalSeminarOppositionService.findOne(ArgumentMatchers.anyLong())).thenReturn(null);
startPage(1L);
tester.assertRenderedPage(ProjectDetailsPage.class);
}
@@ -156,7 +156,7 @@ public class OppositionReportPageTest extends SciProTest {
private void startOppositionPage() {
long oppositionId = 4L;
setLoggedInAs(user);
- Mockito.when(finalSeminarOppositionRepo.findOne(oppositionId)).thenReturn(finalSeminarOpposition);
+ Mockito.when(finalSeminarOppositionService.findOne(oppositionId)).thenReturn(finalSeminarOpposition);
startPage(oppositionId);
}