Changeset 08f82ec for jobvista-backend/src/main/java/mk/ukim/finki

Timestamp:

06/20/24 11:57:13 (5 months ago)

Author:

223021 <daniel.ilievski.2@…>

Branches:

main

Children:

0f0add0

Parents:

befb988

Message:

Did more refactoring

Location:

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend

Files:

• config/SecurityConfiguration.java (modified) (1 diff)
• controllers/ApplicationController.java (modified) (3 diffs)
• controllers/JobAdvertisementController.java (modified) (1 diff)
• models/applications/Application.java (modified) (3 diffs)
• models/users/DTO/JobSeekerEditDetailsDTO.java (added)
• models/users/DTO/RecruiterAdminDetailsDTO.java (added)
• models/users/DTO/RecruiterEditDetailsDTO.java (added)
• service/impl/ApplicationServiceImpl.java (modified) (4 diffs)
• service/impl/JobAdvertisementServiceImpl.java (modified) (4 diffs)
• service/impl/JobSeekerServiceImpl.java (added)
• service/impl/RecruiterServiceImpl.java (modified) (3 diffs)
• service/intef/ApplicationService.java (modified) (1 diff)
• service/intef/JobSeekerService.java (added)

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/config/SecurityConfiguration.java

@@ -31 +31 @@
         http.csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(request -> request
-                        // TO DO: FIX PERMISSIONS
-                        .requestMatchers("/api/job-advertisements/**",
-                                "/api/job-advertisements/view/**",
+                        .requestMatchers(
+                                "/api/auth/**",
+                                "/api/job-advertisements/**",
+                                "/api/applications/**",
                                 "/api/recruiter/**",
-                                "/api/job-seeker/**",
-                                "/api/recruiter/{id}/info",
-                                "/api/recruiter/{id}/edit-info",
-                                "/api/job-advertisements/apply/**",
-                                "/api/auth/**",
-                                "/api/resume/**",
-                                "/api/my-applications/**",
-                                "/api/applications/{id}/update",
-                                "/api/admin/**").permitAll()
-//                        .requestMatchers("/api/recruiter").hasAnyAuthority(Role.ROLE_RECRUITER.name())
+                                "/api/job-seeker/**"
+                        ).permitAll()
+                        .requestMatchers("/api/admin/**").hasAnyAuthority(Role.ROLE_ADMIN.name())
+                        .requestMatchers("/api/recruiter/{id}/edit-info").hasAnyAuthority(Role.ROLE_RECRUITER.name())
+                        .requestMatchers("/api/recruiter/submit-logo").hasAnyAuthority(Role.ROLE_RECRUITER.name())
+                        .requestMatchers("/api/job-seeker/{id}/edit-info").hasAnyAuthority(Role.ROLE_RECRUITER.name())
+                        .requestMatchers("/api/job-seeker/submit-profile-pic").hasAnyAuthority(Role.ROLE_JOBSEEKER.name())
+                        .requestMatchers("/api/job-advertisements/add").hasAnyAuthority(Role.ROLE_RECRUITER.name())
+                        .requestMatchers("/api/job-advertisements/edit/{id}").hasAnyAuthority(Role.ROLE_RECRUITER.name())
+                        .requestMatchers("/api/job-advertisements/delete/{id}").hasAnyAuthority(Role.ROLE_RECRUITER.name())
+                        .requestMatchers("/api/applications/{id}/update").hasAnyAuthority(Role.ROLE_RECRUITER.name())
+                        .requestMatchers("/api/job-advertisements/{advertisement_id}/applications").hasAnyAuthority(Role.ROLE_RECRUITER.name())
+                        .requestMatchers("/api/applications/submit").hasAnyAuthority(Role.ROLE_JOBSEEKER.name())
+                        .requestMatchers("/api/my-applications/{id}").hasAnyAuthority(Role.ROLE_JOBSEEKER.name())
                         .anyRequest().authenticated())
                 .sessionManagement(manager -> manager.sessionCreationPolicy(SessionCreationPolicy.STATELESS))

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/ApplicationController.java

@@ -42 +42 @@
     }
 
-    @GetMapping("/resume/{fileName:.+}")
-    public ResponseEntity<Resource> downloadResume(@PathVariable("fileName") String fileName) {
-        Resource resource = applicationService.loadResumeAsResource(fileName);
+    @GetMapping("/applications/{id}/download-resume")
+    public ResponseEntity<Resource> downloadResume(@PathVariable("id") Long applicationId) {
+        Resource resource = applicationService.loadResumeAsResource(applicationId);
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_PDF)
@@ -51 +51 @@
     }
 
-    @PostMapping("/job-advertisements/apply")
+    @PostMapping("/applications/submit")
     public ResponseEntity<ApplicationDetailsDTO> submitApplication(
             @RequestParam("jobSeekerId") Long jobSeekerId,
@@ -61 +61 @@
             @RequestParam("messageToRecruiter") String messageToRecruiter) {
 
-        ApplicationDTO applicationDTO = new ApplicationDTO(jobSeekerId, jobAdId, resumeFile, answerOne, answerTwo, answerThree, messageToRecruiter);
+        ApplicationDTO applicationDTO = new ApplicationDTO(jobSeekerId, jobAdId,
+                resumeFile, answerOne, answerTwo, answerThree, messageToRecruiter);
         ApplicationDetailsDTO applicationDetailsDTO = applicationService.submitApplication(applicationDTO);
         return new ResponseEntity<>(applicationDetailsDTO, HttpStatus.OK);
     }
-
 }

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/JobAdvertisementController.java

@@ -46 +46 @@
 
     @GetMapping("/recruiter/{id}")
-    public ResponseEntity<?> findALlJobAdvertisementsByRecruiterId(@PathVariable Long id) {
+    public ResponseEntity<?> findAllJobAdvertisementsByRecruiterId(@PathVariable Long id) {
         List<JobAdDetailsDTO> jobAdDetailsDTOS = jobAdvertisementService.findAllJobAdvertisementsByRecruiterId(id);
         return new ResponseEntity<>(jobAdDetailsDTOS, HttpStatus.OK);

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/applications/Application.java

@@ -32 +32 @@
     private JobAdvertisement jobAdvertisement;
 
-    @Column(name = "resume_file_name", nullable = false)
-    private String resumeFileName;
+    @Column(name = "resume_file_name", nullable = true)
+    private String resumeFilePath;
 
     @ElementCollection
@@ -45 +45 @@
     private ApplicationStatus status;
 
-    public Application(JobSeeker jobSeeker, JobAdvertisement jobAdvertisement, String resumeFileName, List<String> answers, String message) {
+    public Application(JobSeeker jobSeeker, JobAdvertisement jobAdvertisement, List<String> answers, String message) {
         this.jobSeeker = jobSeeker;
         this.jobAdvertisement = jobAdvertisement;
-        this.resumeFileName = resumeFileName;
+        this.resumeFilePath = "";
         this.questionAnswers = answers;
         this.message = message;
@@ -69 +69 @@
                 application.getJobAdvertisement().getTitle(),
                 application.getQuestionAnswers(),
-                application.getResumeFileName(),
+                application.getResumeFilePath(),
                 application.getMessage(),
                 application.getSubmittedOn(),

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);
         }
     }

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

@@ -17 +17 @@
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Comparator;
 import java.util.List;
@@ -24 +23 @@
 @RequiredArgsConstructor
 public class JobAdvertisementServiceImpl implements JobAdvertisementService {
-    private final UserRepository userRepository;
     private final JobAdvertisementRepository jobAdvertisementRepository;
     private final RecruiterRepository recruiterRepository;
@@ -30 +28 @@
     @Override
     public JobAdDetailsDTO addJobAdvertisement(JobAdvertisementDTO jobAdvertisementDTO) {
-        Recruiter recruiter = recruiterRepository.findById(jobAdvertisementDTO.getId()).orElseThrow(() -> new IllegalArgumentException("User not found"));
+        Recruiter recruiter = recruiterRepository.findById(jobAdvertisementDTO.getId())
+                .orElseThrow(() -> new IllegalArgumentException("User not found"));
         JobAdvertisement jobAdvertisement = new JobAdvertisement(
                 recruiter,
@@ -47 +46 @@
     @Override
     public JobAdDetailsDTO editJobAdvertisement(Long id, JobAdvertisementDTO jobAdvertisementDTO) {
-        JobAdvertisement jobAdvertisement = jobAdvertisementRepository.findById(id).orElseThrow(() -> new IllegalArgumentException("Job Advertisement not found"));
+        JobAdvertisement jobAdvertisement = jobAdvertisementRepository.findById(id)
+                .orElseThrow(() -> new IllegalArgumentException("Job Advertisement not found"));
         jobAdvertisement.setTitle(jobAdvertisementDTO.getTitle());
         jobAdvertisement.setDescription(jobAdvertisementDTO.getDescription());

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

@@ -32 +32 @@
         this.recruiterRepository = recruiterRepository;
 
-        this.logoStorageLocation = Paths.get(uploadDir + "/logo").toAbsolutePath().normalize();
+        this.logoStorageLocation = Paths.get(uploadDir + "/recruiters").toAbsolutePath().normalize();
         try {
             Files.createDirectories(this.logoStorageLocation);
@@ -70 +70 @@
     public void submitLogo(Long recruiterId, MultipartFile logoFile) {
 
-        Path recruiterLogoDir = this.logoStorageLocation.resolve(String.valueOf(recruiterId));
+        Path recruiterLogoDir = this.logoStorageLocation.resolve(String.valueOf(recruiterId)).resolve("logos");
         try {
             Files.createDirectories(recruiterLogoDir);
@@ -82 +82 @@
                 Recruiter recruiter = recruiterRepository.findById(recruiterId)
                         .orElseThrow(() -> new RuntimeException("Recruiter not found"));
-                String relativePath = Paths.get("uploads", "logo", String.valueOf(recruiterId), originalFilename).toString();
+                String relativePath = Paths.get("uploads","recruiters", String.valueOf(recruiterId), "logos", originalFilename).toString();
                 recruiter.setLogoFilePath(relativePath);
                 recruiterRepository.save(recruiter);

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/ApplicationService.java

@@ -14 +14 @@
     List<ApplicationDetailsDTO> findAllByJobAdvertisementId(Long jobId);
     List<ApplicationDetailsDTO> findAllByJobSeekerId(Long jobSeekerId);
-    Resource loadResumeAsResource(String fileName);
+    Resource loadResumeAsResource(Long applicationId);
     ApplicationStatusDTO updateApplicationStatus(Long id, String status);
 }