fix issues with integration test

Author: R-Sandor

.gitignore

@@ -9,7 +9,8 @@ frontend/node_modules
 !**/src/test/**/build/
 data/screenshots
 data/typesense-data
-data/uploads
+# Allow for this director to be created
+data/uploads/profile-pictures/*.png
 
 ### STS ###
 .apt_generated

data/uploads/profile-pictures/placeholder.txt

@@ -0,0 +1 @@
+-- placeholder text. To prevent root from creating this via docker container.

server/src/main/java/dev/findfirst/users/controller/UserController.java

@@ -173,8 +173,9 @@ public ResponseEntity<String> refreshToken(
 
   @PostMapping("/profile-picture")
   public ResponseEntity<String> uploadProfilePicture(
-      @Valid @RequestParam("file") @FileSize MultipartFile file) {
-    log.debug("saving profile picture");
+      @Valid @RequestParam("file") @FileSize MultipartFile file) throws NoUserFoundException {
+    log.debug("Attempting to add user profile picture");
+    User user = userService.getUserById(uContext.getUserId()).orElseThrow(NoUserFoundException::new);
 
     // File type validation
     String contentType = file.getContentType();
@@ -184,13 +185,8 @@ public ResponseEntity<String> uploadProfilePicture(
     }
 
     try {
-      User user =
-          userService.getUserById(uContext.getUserId()).orElseThrow(NoUserFoundException::new);
       userService.changeUserPhoto(user, file);
-
       return ResponseEntity.ok("File uploaded successfully.");
-    } catch (NoUserFoundException e) {
-      return ResponseEntity.status(HttpStatus.NOT_FOUND).body("User not found.");
     } catch (Exception e) {
       log.debug(e.getMessage());
       return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Failed to upload file.");

server/src/main/java/dev/findfirst/users/service/UserManagementService.java

@@ -115,7 +115,7 @@ public void changeUserPhoto(User user, MultipartFile file)
 
   public void removeUserPhoto(User user) {
     String userPhoto = user.getUserPhoto();
-    if (userPhoto != null) {
+    if (userPhoto != null && !userPhoto.isBlank()) {
       log.debug("Existing User photo {}", userPhoto);
       File photoFile = new File(userPhoto);
       if (photoFile.exists()) {

server/src/test/java/dev/findfirst/users/controller/UserControllerTest.java

@@ -199,7 +199,6 @@ void refreshToken() {
   }
 
   @Test
-  @Disabled("The test uses basicAuth currently basicAuth is broken and only JWT is supported on request")
   void testUserProfile_PhotoTooLarg() {
     byte[] largeContent = new byte[3 * 1024 * 1024]; // 2 MB Max
     // Use MultipartBodyBuilder to build the multipart request
@@ -214,7 +213,6 @@ void testUserProfile_PhotoTooLarg() {
   }
 
   @Test
-  @Disabled("The test uses basicAuth currently basicAuth is broken and only JWT is supported on request")
   void testGetUserProfilePicture_NotFound() {
 
     byte[] largeContent = new byte[2 * 1024 * 1024]; // 2 MB Max
@@ -231,7 +229,6 @@ void testGetUserProfilePicture_NotFound() {
   }
 
   @Test
-  @Disabled("The test uses basicAuth currently basicAuth is broken and only JWT is supported on request")
   void testRemoveUserPhoto_Success() throws Exception {
     MultipartBodyBuilder bodyBuilder = new MultipartBodyBuilder();
     bodyBuilder.part("file", Files.readAllBytes(Path.of(testPicture + "/facebook.com.png")))