87: Improve code readability in DataInitializer & Reformat code

core/src/main/java/se/su/dsv/scipro/project/Project.java

@@ -23,7 +23,6 @@ import jakarta.persistence.MapKeyJoinColumn;
 import jakarta.persistence.PrePersist;
 import jakarta.persistence.PreUpdate;
 import jakarta.persistence.Table;
-
 import java.time.Instant;
 import java.time.LocalDate;
 import java.util.ArrayList;

core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerApproval.java

@@ -13,7 +13,6 @@ import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.OrderBy;
 import jakarta.persistence.Table;
-
 import java.time.Instant;
 import java.util.Collections;
 import java.util.Date;

core/src/test/java/se/su/dsv/scipro/project/split/SplitOrRestartProjectServiceIntegrationTest.java

@@ -12,7 +12,6 @@ import java.time.Year;
 import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.function.Function;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import se.su.dsv.scipro.file.FileUpload;

test-data/src/main/java/se/su/dsv/scipro/testdata/DataInitializer.java

@@ -2019,17 +2019,14 @@ public class DataInitializer implements Lifecycle, BaseData, Factory {
             MilestoneActivityTemplate.Type.STUDENT,
             "First meeting held",
             "First meeting with supervisor.",
-            milestonePhaseTemplate1,
-            null,
-            null
+            milestonePhaseTemplate1
         );
+
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
             "Project plan approved",
             "Project plan approved by supervisor.",
-            milestonePhaseTemplate1,
-            null,
-            null
+            milestonePhaseTemplate1
         );
 
         List<Event> events = eventService.findAll();
@@ -2039,7 +2036,6 @@ public class DataInitializer implements Lifecycle, BaseData, Factory {
             "Rough draft sent to reviewer for approval (Auto)",
             "Rough draft sent to the reviewer for the first time.",
             milestonePhaseTemplate2,
-            null,
             events.stream().filter(event -> event.getName().equals("RoughDraftApprovalRequested")).findFirst().get()
         );
 
@@ -2048,7 +2044,6 @@ public class DataInitializer implements Lifecycle, BaseData, Factory {
             "Rough draft approved by reviewer (Auto)",
             "Rough draft approved.",
             milestonePhaseTemplate2,
-            null,
             events.stream().filter(event -> event.getName().equals("Step.ROUGH_DRAFT_APPROVAL")).findFirst().get()
         );
 
@@ -2057,110 +2052,126 @@ public class DataInitializer implements Lifecycle, BaseData, Factory {
             "Peer review 1 (Auto)",
             "This is a recommendation of when to perform peer review 1.",
             milestonePhaseTemplate2,
-            MilestoneActivityTemplate.PEER_REVIEW_ONE,
-            null
+            MilestoneActivityTemplate.PEER_REVIEW_ONE
         );
 
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
             "Result and discussion completed and approved",
             "Result and discussion.",
-            milestonePhaseTemplate3,
-            null,
-            null
+            milestonePhaseTemplate3
         );
+
         createMileStone(
             MilestoneActivityTemplate.Type.STUDENT,
             "Peer review 2",
             "This is a recommendation of when to perform peer review 2.",
             milestonePhaseTemplate3,
-            MilestoneActivityTemplate.PEER_REVIEW_TWO,
-            null
+            MilestoneActivityTemplate.PEER_REVIEW_TWO
         );
 
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
             "Thesis approved for final seminar presentation",
             "Thesis approved for final seminar.",
-            milestonePhaseTemplate4,
-            null,
-            null
+            milestonePhaseTemplate4
         );
+
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
             "Final seminar created",
             "Creation of final seminar.",
             milestonePhaseTemplate4,
-            MilestoneActivityTemplate.CREATE_SEMINAR,
-            null
+            MilestoneActivityTemplate.CREATE_SEMINAR
         );
+
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
             "Final seminar thesis uploaded",
             "Final seminar thesis uploaded.",
             milestonePhaseTemplate4,
-            MilestoneActivityTemplate.THESIS_UPLOADED,
-            null
+            MilestoneActivityTemplate.THESIS_UPLOADED
         );
+
         createMileStone(
             MilestoneActivityTemplate.Type.STUDENT,
             "Perform an oral and written opposition",
             "Opposition.",
-            milestonePhaseTemplate4,
-            null,
-            null
+            milestonePhaseTemplate4
         );
+
         createMileStone(
             MilestoneActivityTemplate.Type.STUDENT,
             "Active participation in a final seminar",
             "Active participation.",
-            milestonePhaseTemplate4,
-            null,
-            null
+            milestonePhaseTemplate4
         );
+
         createMileStone(
             MilestoneActivityTemplate.Type.STUDENT,
             "Defend the thesis in a final seminar",
             "Defence of final thesis.",
-            milestonePhaseTemplate4,
-            null,
-            null
+            milestonePhaseTemplate4
         );
 
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
             "Revised final thesis of the submitted thesis",
             "Revised final thesis.",
-            milestonePhaseTemplate5,
-            null,
-            null
+            milestonePhaseTemplate5
         );
+
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
             "Originality report approved",
             "Originality report.",
-            milestonePhaseTemplate5,
-            null,
-            null
+            milestonePhaseTemplate5
         );
+
         createMileStone(
             MilestoneActivityTemplate.Type.PROJECT,
             "Supervisor and reviewer final grading report submitted",
             "Final grading report.",
-            milestonePhaseTemplate5,
-            null,
-            null
+            milestonePhaseTemplate5
         );
+
         createMileStone(
             MilestoneActivityTemplate.Type.STUDENT,
             "Grading completed",
             "Grading completed by examiner.",
-            milestonePhaseTemplate5,
-            null,
-            null
+            milestonePhaseTemplate5
         );
     }
 
+    private void createMileStone(
+        MilestoneActivityTemplate.Type type,
+        String title,
+        String description,
+        MilestonePhaseTemplate milestonePhaseTemplate
+    ) {
+        createMileStone(type, title, description, milestonePhaseTemplate, null, null);
+    }
+
+    private void createMileStone(
+        MilestoneActivityTemplate.Type type,
+        String title,
+        String description,
+        MilestonePhaseTemplate milestonePhaseTemplate,
+        Event event
+    ) {
+        createMileStone(type, title, description, milestonePhaseTemplate, null, event);
+    }
+
+    private void createMileStone(
+        MilestoneActivityTemplate.Type type,
+        String title,
+        String description,
+        MilestonePhaseTemplate milestonePhaseTemplate,
+        String code
+    ) {
+        createMileStone(type, title, description, milestonePhaseTemplate, code, null);
+    }
+
     private void createMileStone(
         MilestoneActivityTemplate.Type type,
         String title,