Changeset 08f82ec for jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/ApplicationServiceImpl.java

Timestamp:

06/20/24 11:57:13 (11 days ago)

Author:

223021 <daniel.ilievski.2@…>

Branches:

main

Children:

0f0add0

Parents:

befb988

Message:

Did more refactoring

File:

• jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/ApplicationServiceImpl.java (modified) (4 diffs)

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/ApplicationServiceImpl.java

@@ -41 +41 @@
     public ApplicationServiceImpl(@Value("${file.upload-dir}") String uploadDir, UserRepository userRepository, ApplicationRepository applicationRepository, JobAdvertisementRepository jobAdvertisementRepository,
                                   JobSeekerRepository jobSeekerRepository) {
-        this.fileStorageLocation = Paths.get(uploadDir).toAbsolutePath().normalize();
+        this.fileStorageLocation = Paths.get(uploadDir + "/applications").toAbsolutePath().normalize();
 
         try {
@@ -58 +58 @@
     public ApplicationDetailsDTO submitApplication(ApplicationDTO applicationDTO) {
 
+        JobSeeker jobSeeker = jobSeekerRepository.findById(applicationDTO.getJobSeekerId())
+                .orElseThrow(() -> new IllegalArgumentException("User not found."));
+        JobAdvertisement jobAdvertisement = jobAdvertisementRepository.findById(applicationDTO.getJobAdId())
+                .orElseThrow(() -> new IllegalArgumentException("Job advertisement not found."));
+
         if (applicationDTO.getResumeFile().isEmpty()) {
             throw new RuntimeException("Failed to store empty file.");
         }
-
-        Path targetLocation = this.fileStorageLocation.resolve(applicationDTO.getResumeFile().getOriginalFilename());
-        try {
-            Files.copy(applicationDTO.getResumeFile().getInputStream(), targetLocation, StandardCopyOption.REPLACE_EXISTING);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-
-        JobSeeker jobSeeker = jobSeekerRepository.findById(applicationDTO.getJobSeekerId()).orElseThrow(() -> new IllegalArgumentException("User not found"));
-        JobAdvertisement jobAdvertisement = jobAdvertisementRepository.findById(applicationDTO.getJobAdId()).orElseThrow(() -> new IllegalArgumentException("Job Ad not found"));
 
         List<String> answers = new ArrayList<>();
@@ -77 +72 @@
         answers.add(applicationDTO.getAnswerThree());
 
-        Application application = new Application(jobSeeker, jobAdvertisement, applicationDTO.getResumeFile().getOriginalFilename(), answers, applicationDTO.getMessageToRecruiter());
-        applicationRepository.save(application);
+        Application application = new Application(jobSeeker, jobAdvertisement,
+                answers,applicationDTO.getMessageToRecruiter());
+        application = applicationRepository.save(application);
+
+        Path filePath = this.fileStorageLocation.resolve(String.valueOf(application.getId())).resolve("resume");
+        Path targetLocation = filePath.resolve(applicationDTO.getResumeFile().getOriginalFilename());
+
+        try {
+            Files.createDirectories(filePath);
+            Files.copy(applicationDTO.getResumeFile().getInputStream(), targetLocation);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        String relativePath = Paths.get("uploads","applications",String.valueOf(application.getId()),
+                "resume", applicationDTO.getResumeFile().getOriginalFilename()).toString();
+        application.setResumeFilePath(relativePath);
+        application = applicationRepository.save(application);
+
         return Application.mapToApplicationDetailsDTO(application);
     }
@@ -95 +107 @@
 
     @Override
-    public Resource loadResumeAsResource(String fileName) {
+    public Resource loadResumeAsResource(Long applicationId) {
+        Application application = applicationRepository.findById(applicationId).
+                orElseThrow(() -> new IllegalArgumentException("Application not found"));
+
+        String relativeFilePath = application.getResumeFilePath();
+        Path filePath = fileStorageLocation.getParent().getParent().resolve(relativeFilePath).normalize();
+
         try {
-            Path filePath = fileStorageLocation.resolve(fileName).normalize();
             Resource resource = new UrlResource(filePath.toUri());
             if (resource.exists()) {
                 return resource;
             } else {
-                throw new RuntimeException("File not found " + fileName);
+                throw new RuntimeException("File not found: " + relativeFilePath);
             }
         } catch (IOException ex) {
-            throw new RuntimeException("File not found " + fileName, ex);
+            throw new RuntimeException("File path is invalid: " + relativeFilePath, ex);
         }
     }