Fix for sturcturefeedback + admin submit after deadline

.gitignore

@@ -49,3 +49,4 @@ docker.env
 startBackend.sh
 
 /.env
+backend/web-bff/App/.env

backend/app/src/main/java/com/ugent/pidgeon/model/submissionTesting/SubmissionTemplateModel.java

@@ -151,16 +151,16 @@ public SubmissionResult checkSubmission(ZipFile file) throws IOException {
             boolean passed = (filesMissing.size() + filesUnrequested.size() + filesDenied.size()) == 0;
             String feedback = passed ? "File structure is correct" : "File structure failed to pass the template, because: \n ";
             if (!filesMissing.isEmpty()) {
-                feedback += " -The following files are required from the template and are not found in the project: \n    -";
-                feedback += String.join("\n    -", filesMissing);
+                feedback += "- The following files are required from the template and are not found in the project: \n    - ";
+                feedback += String.join("\n    - ", filesMissing);
             }
             if (!filesUnrequested.isEmpty()) {
-                feedback += "\n -The following files are not requested in the template: \n    -";
-                feedback += String.join("\n    -", filesUnrequested);
+                feedback += "\n - The following files are not requested in the template: \n    - ";
+                feedback += String.join("\n    - ", filesUnrequested);
             }
             if (!filesDenied.isEmpty()) {
-                feedback += "\n -The following files are not allowed in the project: \n    -";
-                feedback += String.join("\n    -", filesDenied);
+                feedback += "\n - The following files are not allowed in the project: \n    - ";
+                feedback += String.join("\n    - ", filesDenied);
             }
 
             return new SubmissionResult(passed, feedback);

backend/app/src/main/java/com/ugent/pidgeon/util/SubmissionUtil.java

@@ -105,7 +105,7 @@ public CheckResult<Long> checkOnSubmit(long projectId, UserEntity user) {
 
         OffsetDateTime time = OffsetDateTime.now();
         Logger.getGlobal().info("Time: " + time + " Deadline: " + project.getDeadline());
-        if (time.isAfter(project.getDeadline())) {
+        if (time.isAfter(project.getDeadline()) && groupId != null) {
             return new CheckResult<>(HttpStatus.FORBIDDEN, "Project deadline has passed", null);
         }
         return new CheckResult<>(HttpStatus.OK, "", groupId);

backend/app/src/test/java/com/ugent/pidgeon/controllers/GroupFeedbackControllerTest.java

@@ -281,7 +281,7 @@ public void testAddGroupScore() throws Exception {
     when(groupFeedbackUtil.checkGroupFeedbackUpdate(groupFeedbackEntity.getGroupId(), groupFeedbackEntity.getProjectId(), getMockUser(), HttpMethod.POST))
         .thenReturn(new CheckResult<>(HttpStatus.OK, "", null));
     when(groupFeedbackUtil.checkGroupFeedbackUpdateJson(argThat(
-        json -> json.getScore() == groupFeedbackEntity.getScore() && json.getFeedback().equals(groupFeedbackEntity.getFeedback())), eq(groupFeedbackEntity.getProjectId())))
+        json -> Objects.equals(json.getScore(), groupFeedbackEntity.getScore()) && json.getFeedback().equals(groupFeedbackEntity.getFeedback())), eq(groupFeedbackEntity.getProjectId())))
         .thenReturn(new CheckResult<>(HttpStatus.OK, "", null));
     when(groupFeedbackRepository.save(any())).thenReturn(groupFeedbackEntity);
     when(entityToJsonConverter.groupFeedbackEntityToJson(groupFeedbackEntity)).thenReturn(groupFeedbackJson);
@@ -292,7 +292,7 @@ public void testAddGroupScore() throws Exception {
         .andExpect(content().contentType(MediaType.APPLICATION_JSON))
         .andExpect(content().json(objectMapper.writeValueAsString(groupFeedbackJson)));
     verify(groupFeedbackRepository, times(1)).save(argThat(
-        groupFeedback -> groupFeedback.getScore() == groupFeedbackEntity.getScore() &&
+        groupFeedback -> Objects.equals(groupFeedback.getScore(), groupFeedbackEntity.getScore()) &&
         groupFeedback.getFeedback().equals(groupFeedbackEntity.getFeedback()) &&
         groupFeedback.getGroupId() == groupFeedbackEntity.getGroupId() &&
         groupFeedback.getProjectId() == groupFeedbackEntity.getProjectId()));

backend/app/src/test/java/com/ugent/pidgeon/util/SubmissionUtilTest.java

@@ -157,6 +157,11 @@ public void testCheckOnSubmit() {
     result = submissionUtil.checkOnSubmit(projectEntity.getId(), userEntity);
     assertEquals(HttpStatus.OK, result.getStatus());
     assertNull(result.getData());
+
+    /* Deadline passed when user is admin, should still be allowed */
+    projectEntity.setDeadline(OffsetDateTime.now().minusDays(1));
+    result = submissionUtil.checkOnSubmit(projectEntity.getId(), userEntity);
+    assertEquals(HttpStatus.OK, result.getStatus());
 
     /* User not part of group and not admin */
     when(projectUtil.isProjectAdmin(projectEntity.getId(), userEntity))
@@ -171,6 +176,7 @@ public void testCheckOnSubmit() {
     result = submissionUtil.checkOnSubmit(projectEntity.getId(), userEntity);
     assertEquals(HttpStatus.FORBIDDEN, result.getStatus());
 
+
     /* GroupCluster in archived course */
     when(groupClusterRepository.inArchivedCourse(groupEntity.getClusterId())).thenReturn(true);
     result = submissionUtil.checkOnSubmit(projectEntity.getId(), userEntity);