Backend test upgrades

backend/app/build.gradle

@@ -21,7 +21,6 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	runtimeOnly 'org.postgresql:postgresql'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.security:spring-security-config'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
@@ -44,6 +43,9 @@ dependencies {
 	implementation "org.springframework.boot:spring-boot-devtools"
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
+	testImplementation 'org.mockito:mockito-junit-jupiter:4.0.0'
+	implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
+	testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
 }
 
 // tasks.named('test',Test) {
@@ -52,14 +54,14 @@ dependencies {
 
 //     testLogging {
 //         events "passed"
+
 //     }
 // }
 
 task unitTests (type: Test){
 
 	exclude '**/docker'
 
-
 	useJUnitPlatform()
        maxHeapSize = '1G'
 
@@ -69,3 +71,15 @@ task unitTests (type: Test){
 
 }
 
+task allTest (type: Test) {
+
+	include '**'
+	useJUnitPlatform()
+	maxHeapSize = '1G'
+
+
+	testLogging {
+		events "passed"
+	}
+}
+

backend/app/src/main/java/com/ugent/pidgeon/GlobalErrorHandler.java

@@ -31,6 +31,7 @@ private void logError(Exception ex) {
     logger.log(Level.SEVERE, ex.getMessage(), ex);
   }
 
+  /* Gets thrown when a invalid json is sent */
   @ExceptionHandler(HttpMessageNotReadableException.class)
   public ResponseEntity<ApiErrorReponse> handleHttpMessageNotReadableException(HttpServletRequest request, Exception ex) {
     logError(ex);
@@ -40,15 +41,17 @@ public ResponseEntity<ApiErrorReponse> handleHttpMessageNotReadableException(Htt
         "Unable to process the request due to invalid or missing data. Please ensure the request body is properly formatted and all required fields are provided.", path));
   }
 
-  @ExceptionHandler(NoResourceFoundException.class)
-  public ResponseEntity<ApiErrorReponse> handleHttpMessageNotFoundException(HttpServletRequest request, Exception ex) {
+  /* Gets thrown when endpoint doesn't exist */
+  @ExceptionHandler(NoHandlerFoundException.class)
+  public ResponseEntity<ApiErrorReponse> handleNoHandlerFoundException(HttpServletRequest request, Exception ex) {
     logError(ex);
     String path = request.getRequestURI();
     HttpStatus status = HttpStatus.NOT_FOUND;
     return ResponseEntity.status(status).body(new ApiErrorReponse(OffsetDateTime.now(), status.value(), status.getReasonPhrase(),
-        "Endpoint doesn't exist", path));
+        "Resource/endpoint doesn't exist", path));
   }
 
+  /* Gets thrown when the method is not allowed */
   @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
   public ResponseEntity<ApiErrorReponse> handleMethodNotSupportedException(HttpServletRequest request, Exception ex) {
     logError(ex);
@@ -58,6 +61,7 @@ public ResponseEntity<ApiErrorReponse> handleMethodNotSupportedException(HttpSer
         "Method not supported", path));
   }
 
+  /* Gets thrown when u path variable is of the wrong type */
   @ExceptionHandler(MethodArgumentTypeMismatchException.class)
   public ResponseEntity<ApiErrorReponse> handleMethodArgumentTypeMismatchException(HttpServletRequest request, Exception ex) {
     logError(ex);
@@ -67,6 +71,7 @@ public ResponseEntity<ApiErrorReponse> handleMethodArgumentTypeMismatchException
         "Invalid url argument type", path));
   }
 
+  /* Gets thrown when an unexpected error occurs */
   @ExceptionHandler(Exception.class)
   public ResponseEntity<ApiErrorReponse> handleException(HttpServletRequest request, Exception ex) {
     logError(ex);

backend/app/src/main/java/com/ugent/pidgeon/auth/RolesInterceptor.java

@@ -64,7 +64,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
                     userEntity = new UserEntity(auth.getUser().firstName,auth.getUser().lastName, auth.getEmail(), UserRole.student, auth.getOid());
                     OffsetDateTime now = OffsetDateTime.now();
                     userEntity.setCreatedAt(now);
-                    userRepository.save(userEntity);
+                    userEntity = userRepository.save(userEntity);
                     System.out.println("User created with id: " + userEntity.getId());
 
                 }

backend/app/src/main/java/com/ugent/pidgeon/controllers/ApiRoutes.java

@@ -3,7 +3,6 @@
 public final class ApiRoutes {
     public static final String USERS_BASE_PATH = "/api/users";
     public static final String COURSE_BASE_PATH = "/api/courses";
-    public static final String DEADLINE_BASE_PATH = "/api/deadlines";
     public static final String PROJECT_BASE_PATH = "/api/projects";
 
     public static final String LOGGEDIN_USER_PATH = "/api/user";
@@ -14,10 +13,4 @@ public final class ApiRoutes {
     public static final String GROUP_MEMBER_BASE_PATH = GROUP_BASE_PATH + "/{groupid}/members";
     public static final String GROUP_FEEDBACK_PATH = PROJECT_BASE_PATH + "/{projectid}/groups/{groupid}/score";
     public static final String CLUSTER_BASE_PATH = "/api/clusters";
-
-    public static final String USER_AUTH_PATH = "/api/auth";
-
-    public static final String GROUP_SCORE_PATH = GROUP_BASE_PATH + "/{groupid}/score";
-
-
 }

backend/app/src/main/java/com/ugent/pidgeon/controllers/ClusterController.java

@@ -174,7 +174,7 @@ public ResponseEntity<?> doGroupClusterUpdate(GroupClusterEntity clusterEntity,
         }
         clusterEntity.setMaxSize(clusterJson.getCapacity());
         clusterEntity.setName(clusterJson.getName());
-        groupClusterRepository.save(clusterEntity);
+        clusterEntity = groupClusterRepository.save(clusterEntity);
         return ResponseEntity.ok(entityToJsonConverter.clusterEntityToClusterJson(clusterEntity));
     }
 
@@ -183,7 +183,7 @@ public ResponseEntity<?> doGroupClusterUpdate(GroupClusterEntity clusterEntity,
      *
      * @param clusterid  identifier of a cluster
      * @param auth authentication object of the requesting user
-     * @param clusterFillJson ClusterFillJson object containing a map of all groups and their
+     * @param clusterFillMap Map object containing a map of all groups and their
      *                        members of that cluster
      * @return ResponseEntity<?>
      * @HttpMethod PUT
@@ -226,7 +226,7 @@ public ResponseEntity<?> fillCluster(@PathVariable("clusterid") Long clusterid,
 
             groupCluster.setGroupAmount(clusterFillJson.getClusterGroupMembers().size());
             groupClusterRepository.save(groupCluster);
-            return ResponseEntity.status(HttpStatus.OK).body("Filled group cluster successfully");
+            return ResponseEntity.status(HttpStatus.OK).body(entityToJsonConverter.clusterEntityToClusterJson(groupCluster));
         } catch (Exception e) {
             Logger.getGlobal().severe(e.getMessage());
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Something went wrong");

backend/app/src/main/java/com/ugent/pidgeon/controllers/CourseController.java

@@ -9,6 +9,7 @@
 import com.ugent.pidgeon.postgre.models.types.UserRole;
 import com.ugent.pidgeon.postgre.repository.*;
 import com.ugent.pidgeon.util.*;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -59,14 +60,14 @@ public class CourseController {
     public ResponseEntity<?> getUserCourses(Auth auth, @RequestParam(value = "archived", required = false) Boolean archived) {
         long userID = auth.getUserEntity().getId();
         try {
-            Logger.getGlobal().info("Archived: " + archived);
             List<UserRepository.CourseIdWithRelation> userCourses = new ArrayList<>();
             if (archived == null || !archived) {
                 userCourses.addAll(userRepository.findCourseIdsByUserId(userID));
             }
             if (archived == null || archived) {
                 userCourses.addAll(userRepository.findArchivedCoursesByUserId(userID));
             }
+
             // Retrieve course entities based on user courses
             List<CourseWithRelationJson> courseJSONObjects = userCourses.stream()
                     .map(courseWithRelation -> {
@@ -79,7 +80,10 @@ public ResponseEntity<?> getUserCourses(Auth auth, @RequestParam(value = "archiv
                     )
                     .filter(Objects::nonNull)
                     .toList();
+            for (CourseWithRelationJson courseJson: courseJSONObjects) {
+                Logger.getGlobal().info("UserCourses: " + courseJson);
 
+            }
             // Return the JSON string in ResponseEntity
             return ResponseEntity.ok(courseJSONObjects);
         } catch (Exception e) {
@@ -117,7 +121,7 @@ public ResponseEntity<?> createCourse(@RequestBody CourseJson courseJson, Auth a
             courseEntity.setCreatedAt(currentTimestamp);
             courseEntity.setJoinKey(UUID.randomUUID().toString());
             // Save course
-            courseRepository.save(courseEntity);
+            courseEntity = courseRepository.save(courseEntity);
 
             // Add user as course creator
             CourseUserEntity courseUserEntity = new CourseUserEntity(courseEntity.getId(), userId, CourseRelation.creator);
@@ -147,7 +151,7 @@ private ResponseEntity<?> doCourseUpdate(CourseEntity courseEntity, CourseJson c
         if (courseJson.getArchived() != null) {
             courseEntity.setArchivedAt(courseJson.getArchived() ? OffsetDateTime.now() : null);
         }
-        courseRepository.save(courseEntity);
+        courseEntity = courseRepository.save(courseEntity);
         return ResponseEntity.ok(entityToJsonConverter.courseEntityToCourseWithInfo(courseEntity, courseUtil.getJoinLink(courseEntity.getJoinKey(), "" + courseEntity.getId()), false));
     }
 
@@ -192,10 +196,6 @@ public ResponseEntity<?> patchCourse(@RequestBody CourseJson courseJson, @PathVa
                 return ResponseEntity.status(checkResult.getStatus()).body(checkResult.getMessage());
             }
 
-            if (courseJson.getName() == null && courseJson.getDescription() == null && courseJson.getYear() == null) {
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Name, description or year is required");
-            }
-
             CourseEntity courseEntity = checkResult.getData();
             if (courseJson.getName() == null) {
                 courseJson.setName(courseEntity.getName());
@@ -281,9 +281,9 @@ public ResponseEntity<?> deleteCourse(@PathVariable long courseId, Auth auth) {
                 }
             }
 
-
+            Iterable<CourseUserEntity> courseUsers = courseUserRepository.findAllUsersByCourseId(courseId);
             // Delete all courseusers linked to the course
-            courseUserRepository.deleteAll(courseUserRepository.findAllUsersByCourseId(courseId));
+            courseUserRepository.deleteAll(courseUsers);
 
             // Delete the course
             courseRepository.deleteById(courseId);
@@ -390,7 +390,7 @@ public ResponseEntity<?> joinCourse(Auth auth, @PathVariable Long courseId, @Pat
      */
     @GetMapping(ApiRoutes.COURSE_BASE_PATH + "/{courseId}/join/{courseKey}")
     @Roles({UserRole.student, UserRole.teacher})
-    public ResponseEntity<?> getCourseJoinKey(Auth auth, @PathVariable Long courseId, @PathVariable String courseKey) {
+    public ResponseEntity<?> getCourseJoinInformation(Auth auth, @PathVariable Long courseId, @PathVariable String courseKey) {
         return getJoinLinkGetResponseEntity(courseId, courseKey, auth.getUserEntity());
     }
 
@@ -424,7 +424,7 @@ public ResponseEntity<?> joinCourse(Auth auth, @PathVariable Long courseId) {
      */
     @GetMapping(ApiRoutes.COURSE_BASE_PATH + "/{courseId}/join")
     @Roles({UserRole.student, UserRole.teacher})
-    public ResponseEntity<?> getCourseJoinKey(Auth auth, @PathVariable Long courseId) {
+    public ResponseEntity<?> getCourseJoinInformation(Auth auth, @PathVariable Long courseId) {
         return getJoinLinkGetResponseEntity(courseId, null, auth.getUserEntity());
     }
 
@@ -445,20 +445,7 @@ public ResponseEntity<?> leaveCourse(@PathVariable long courseId, Auth auth) {
         try {
             long userId = auth.getUserEntity().getId();
             CheckResult<CourseRelation> checkResult = courseUtil.canLeaveCourse(courseId, auth.getUserEntity());
-            if (!checkResult.getStatus().equals(HttpStatus.OK)) {
-                return ResponseEntity.status(checkResult.getStatus()).body(checkResult.getMessage());
-            }
-            CourseRelation userRelation = checkResult.getData();
-
-            // Delete the user from the course
-            courseUserRepository.deleteById(new CourseUserId(courseId, userId));
-            if (userRelation.equals(CourseRelation.enrolled)) {
-                if (!commonDatabaseActions.removeIndividualClusterGroup(courseId, userId)) {
-                    return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Failed to remove user from individual group, contact admin.");
-                }
-            }
-
-            return ResponseEntity.ok().build();
+            return doRemoveFromCourse(courseId, userId, checkResult);
         } catch (Exception e) {
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
         }
@@ -480,6 +467,14 @@ public ResponseEntity<?> leaveCourse(@PathVariable long courseId, Auth auth) {
     @Roles({UserRole.teacher, UserRole.admin, UserRole.student})
     public ResponseEntity<?> removeCourseMember(Auth auth, @PathVariable Long courseId, @PathVariable Long userId) {
         CheckResult<CourseRelation> checkResult = courseUtil.canDeleteUser(courseId, userId, auth.getUserEntity());
+        return doRemoveFromCourse(courseId, userId, checkResult);
+    }
+
+    @NotNull
+    private ResponseEntity<?> doRemoveFromCourse(
+        Long courseId,
+        Long userId,
+        CheckResult<CourseRelation> checkResult) {
         if (!checkResult.getStatus().equals(HttpStatus.OK)) {
             return ResponseEntity.status(checkResult.getStatus()).body(checkResult.getMessage());
         }
@@ -562,7 +557,9 @@ public ResponseEntity<?> updateCourseMember(Auth auth, @PathVariable Long course
             if (user == null) {
                 return ResponseEntity.status(HttpStatus.NOT_FOUND).body("User not found");
             }
-            commonDatabaseActions.createNewIndividualClusterGroup(courseId, user);
+            if (!commonDatabaseActions.createNewIndividualClusterGroup(courseId, user)) {
+                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Failed to add user to individual group, contact admin.");
+            }
         } else if (courseUserEntity.getRelation().equals(CourseRelation.enrolled)){
             if (!commonDatabaseActions.removeIndividualClusterGroup(courseId, requestwithid.getUserId())) {
                 return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Failed to remove user from individual group, contact admin.");
@@ -697,9 +694,12 @@ public ResponseEntity<?> copyCourse(@PathVariable long courseId, Auth auth) {
             CourseEntity course = checkResult.getData().getFirst();
 
             CheckResult<CourseEntity> copyCheckRes = commonDatabaseActions.copyCourse(course, auth.getUserEntity().getId());
+            if (copyCheckRes.getStatus() != HttpStatus.OK) {
+                return ResponseEntity.status(copyCheckRes.getStatus()).body(copyCheckRes.getMessage());
+            }
             CourseEntity newCourse = copyCheckRes.getData();
 
-            return ResponseEntity.ok(entityToJsonConverter.courseEntityToCourseWithInfo(newCourse, courseUtil.getJoinLink(newCourse.getJoinKey(), "" + newCourse.getId()), false));
+            return ResponseEntity.status(HttpStatus.CREATED).body(entityToJsonConverter.courseEntityToCourseWithInfo(newCourse, courseUtil.getJoinLink(newCourse.getJoinKey(), "" + newCourse.getId()), false));
         } catch (Exception e) {
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
         }

backend/app/src/main/java/com/ugent/pidgeon/controllers/GroupController.java

@@ -136,7 +136,9 @@ public ResponseEntity<?> deleteGroup(@PathVariable("groupid") Long groupid, Auth
             return ResponseEntity.status(checkResult.getStatus()).body(checkResult.getMessage());
         }
 
-        commonDatabaseActions.removeGroup(groupid);
+        if (!commonDatabaseActions.removeGroup(groupid)) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Error deleting group");
+        }
         // Return 204
         return ResponseEntity.status(HttpStatus.NO_CONTENT).body("Group deleted");
     }

backend/app/src/main/java/com/ugent/pidgeon/controllers/GroupFeedbackController.java

@@ -36,12 +36,12 @@ public class GroupFeedbackController {
     private GroupUtil groupUtil;
     @Autowired
     private EntityToJsonConverter entityToJsonConverter;
-  @Autowired
-  private ProjectRepository projectRepository;
-  @Autowired
-  private GroupRepository groupRepository;
-  @Autowired
-  private CourseUtil courseUtil;
+    @Autowired
+    private ProjectRepository projectRepository;
+    @Autowired
+    private GroupRepository groupRepository;
+    @Autowired
+    private CourseUtil courseUtil;
 
     /**
      * Function to update the score of a group
@@ -222,19 +222,19 @@ public ResponseEntity<?> getCourseGrades(@PathVariable("courseId") long courseId
 
         List<GroupFeedbackJsonWithProject> grades = new ArrayList<>();
         for (ProjectEntity project : projects) {
-            Long GroupId = groupRepository.groupIdByProjectAndUser(project.getId(), user.getId());
-            if (GroupId == null) { // Student not yet in a group for this project
+            Long groupId = groupRepository.groupIdByProjectAndUser(project.getId(), user.getId());
+            if (groupId == null) { // Student not yet in a group for this project
               grades.add(entityToJsonConverter.groupFeedbackEntityToJsonWithProject(null, project));
-            }
-            CheckResult<GroupFeedbackEntity> checkResult = groupFeedbackUtil.getGroupFeedbackIfExists(GroupId, project.getId());
-            if (checkResult.getStatus() != HttpStatus.OK) {
-                grades.add(entityToJsonConverter.groupFeedbackEntityToJsonWithProject(null, project));
             } else {
+              CheckResult<GroupFeedbackEntity> checkResult = groupFeedbackUtil.getGroupFeedbackIfExists(groupId, project.getId());
+              if (checkResult.getStatus() != HttpStatus.OK) {
+                grades.add(entityToJsonConverter.groupFeedbackEntityToJsonWithProject(null, project));
+              } else {
                 GroupFeedbackEntity groupFeedbackEntity = checkResult.getData();
                 grades.add(entityToJsonConverter.groupFeedbackEntityToJsonWithProject(groupFeedbackEntity, project));
+              }
             }
         }
-
         return ResponseEntity.ok(grades);
     }
 

backend/app/src/main/java/com/ugent/pidgeon/controllers/ProjectController.java

@@ -82,7 +82,7 @@ public ResponseEntity<?> getProjects(Auth auth) {
       }
     }
 
-    return ResponseEntity.ok().body(new userProjectsJson(enrolledProjects, adminProjects));
+    return ResponseEntity.ok().body(new UserProjectsJson(enrolledProjects, adminProjects));
   }