removed user hardcoding in image service and restructured code

Author: Aakkiieezz

profilePics/UserId-14.jpg

@@ -1,6 +1,5 @@
 package servie.track_servie.controller;
 
-import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -10,13 +9,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import servie.track_servie.repository.UserRepository;
 import servie.track_servie.service.UserService;
-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Map;
 
 @RestController
@@ -25,24 +19,14 @@ public class UserController
 {
 	@Autowired
 	private UserService userService;
-	@Autowired
-	private UserRepository userRepository;
-	private static final String profilePicsDirectory = "/home/aakkiieezz/Coding/track_servie/profilePics/";
 
 	@PostMapping(value = "/image/upload", produces = {MediaType.IMAGE_JPEG_VALUE, "application/json"})
-	public ResponseEntity<?> profileImgUpload(@RequestParam("file") MultipartFile file /*, @AuthenticationPrincipal UserDetails userDetails*/)
+	public ResponseEntity<?> profileImgUpload(@RequestParam("file") MultipartFile file)
 	{
-		File directory = new File(profilePicsDirectory);
-		if(!directory.exists())
-			directory.mkdir();
-		Integer userId = userRepository.findByUsername("Aakkiieezz").get().getId();
-		String newFileName = String.format("UserId-%s.%s", userId, FilenameUtils.getExtension(file.getOriginalFilename()));
-		Path fileNamePath = Paths.get(profilePicsDirectory, newFileName);
 		try
 		{
-			Files.write(fileNamePath, file.getBytes());
-			userService.profileImgUpload(fileNamePath);
-			return new ResponseEntity<>(Map.of("profileImgUrl", /*fileNamePath.toString()*/ "profilePics/"+newFileName), HttpStatus.OK);
+			String newFileName = userService.profileImgUpload(file);
+			return new ResponseEntity<>(Map.of("profileImgUrl", "profilePics/"+newFileName), HttpStatus.OK);
 		}
 		catch(IOException ex)
 		{
@@ -55,8 +39,7 @@ public ResponseEntity<?> profileImgDelete()
 	{
 		try
 		{
-			Integer userId = userRepository.findByUsername("Aakkiieezz").get().getId();
-			userService.profileImgDelete(userId);
+			userService.profileImgDelete();
 			return new ResponseEntity<>(HttpStatus.OK);
 		}
 		catch(Exception ex)

profilePics/UserId-1.png profilePics/UserId-15.jpg

@@ -37,6 +37,7 @@
 @Slf4j
 public class SeriesService
 {
+	@Autowired
 	private SeriesRepository seriesRepository;
 	@Autowired
 	private RestTemplate restTemplate;

profilePics/UserId-15.png

@@ -5,25 +5,40 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import lombok.extern.slf4j.Slf4j;
 import servie.track_servie.entity.User;
 import servie.track_servie.exceptions.ResourceNotFoundException;
 import servie.track_servie.repository.UserRepository;
 
 @Service
+@Slf4j
 public class UserService
 {
 	@Autowired
 	private UserRepository userRepository;
 	private static final String profilePicsDirectory = "/home/aakkiieezz/Coding/track_servie/profilePics/";
 
 	@Transactional
-	public void profileImgUpload(Path fileNamePath) throws IOException
+	public String profileImgUpload(MultipartFile file) throws IOException
 	{
-		User user = userRepository.findById(1).orElseThrow(() -> new RuntimeException("User not found"));
+		UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+		User user = userRepository.findByUsername(userDetails.getUsername()).orElseThrow(() -> new ResourceNotFoundException("User", "Username", userDetails.getUsername()));
+		File directory = new File(profilePicsDirectory);
+		if(!directory.exists())
+			directory.mkdir();
+		String newFileName = String.format("UserId-%s.%s", user.getId(), FilenameUtils.getExtension(file.getOriginalFilename()));
+		Path fileNamePath = Paths.get(profilePicsDirectory, newFileName);
+		Files.write(fileNamePath, file.getBytes());
 		File fileObject = fileNamePath.toFile();
 		byte[] imageData = new byte[(int) fileObject.length()];
 		try(InputStream inputStream = new FileInputStream(fileObject))
@@ -32,6 +47,7 @@ public void profileImgUpload(Path fileNamePath) throws IOException
 		}
 		user.setProfileImg(imageData);
 		userRepository.save(user);
+		return newFileName;
 	}
 
 	public String checkGenerateProfileUrlIfProfileImgExist(Integer userId)
@@ -53,17 +69,18 @@ public String checkGenerateProfileUrlIfProfileImgExist(Integer userId)
 		}
 		catch(IOException e)
 		{
-			System.err.println("Error while creating the file: "+e.getMessage());
+			log.error("Error while creating the file: "+e.getMessage());
 		}
 		return null;
 	}
 
-	public void profileImgDelete(Integer userId)
+	public void profileImgDelete()
 	{
-		User user = userRepository.findById(userId).orElseThrow(() -> new ResourceNotFoundException("User", "Id", userId.toString()));
+		UserDetails userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+		User user = userRepository.findByUsername(userDetails.getUsername()).orElseThrow(() -> new ResourceNotFoundException("User", "Username", userDetails.getUsername()));
 		user.setProfileImg(null);
 		userRepository.save(user);
-		File file = new File(profilePicsDirectory+"UserId-"+userId+".jpg");
+		File file = new File(profilePicsDirectory+"UserId-"+user.getId()+".jpg");
 		file.delete();
 	}
 }