Changeset 28b3398 for jobvista-backend/src/main/java/mk/ukim/finki/predmeti

Timestamp:

06/09/24 14:24:03 (3 weeks ago)

Author:

223021 <daniel.ilievski.2@…>

Branches:

main

Children:

b248810

Parents:

19398ad

Message:

Implemented job application functionality, added job advertisement filtering and replaced text areas with editors

Location:

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

Files:

• config/SecurityConfiguration.java (modified) (1 diff)
• controllers/ApplicationController.java (added)
• controllers/JobAdvertisementController.java (modified) (4 diffs)
• models/applications/Application.java (added)
• models/applications/DTO/ApplicationDTO.java (added)
• models/applications/DTO/ApplicationDetailsDTO.java (added)
• models/applications/DTO/ApplicationStatusDTO.java (added)
• models/enumerations/ApplicationStatus.java (added)
• models/job_advertisements/DTO/JobAdFilterDTO.java (added)
• models/job_advertisements/JobAdvertisement.java (modified) (3 diffs)
• repositories/ApplicationRepository.java (added)
• repositories/RecruiterRepository.java (modified) (1 diff)
• service/impl/ApplicationServiceImpl.java (added)
• service/impl/JobAdvertisementServiceImpl.java (modified) (6 diffs)
• service/intef/ApplicationService.java (added)
• service/intef/JobAdvertisementService.java (modified) (2 diffs)

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

@@ -30 +30 @@
         http.csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(request -> request
-                        .requestMatchers("/api/job-advertisements/all","/api/job-advertisements/view/**","/api/recruiter/info/**", "/api/auth/**").permitAll()
+                        // TO DO: FIX PERMISSIONS
+                        .requestMatchers("/api/job-advertisements/**","/api/job-advertisements/view/**","/api/recruiter/info/**",
+                                "/api/job-advertisements/apply/**","/api/auth/**", "/api/resume/**", "/api/my-applications/**", "/api/applications/{id}/update").permitAll()
                         //.requestMatchers("/api/job-advertisements/**").hasAnyAuthority(Role.ROLE_RECRUITER.name())
                         .anyRequest().authenticated())

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

@@ -3 +3 @@
 
 import lombok.AllArgsConstructor;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.applications.Application;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.applications.DTO.ApplicationDTO;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdFilterDTO;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdvertisementDTO;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdDetailsDTO;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.JobAdvertisement;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.ApplicationService;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.JobAdvertisementService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -20 +25 @@
 
     private final JobAdvertisementService jobAdvertisementService;
+    private final ApplicationService applicationService;
 
     @PostMapping("/add")
@@ -45 +51 @@
     }
 
+    @PostMapping("/recruiter/{id}/filtered")
+    public ResponseEntity<?> filterJobAdvertisementsByRecruiterId(@PathVariable Long id, @RequestBody JobAdFilterDTO jobAdFilterDTO) {
+        List<JobAdDetailsDTO> jobAdDetailsDTOS = jobAdvertisementService.filterJobAdvertisementsByRecruiterId(id, jobAdFilterDTO);
+        return new ResponseEntity<>(jobAdDetailsDTOS, HttpStatus.OK);
+    }
+
     @GetMapping("/all")
     public ResponseEntity<?> findAllJobAdvertisements() {
@@ -51 +63 @@
     }
 
-    @GetMapping("/view/{id}")
+    @PostMapping("/filtered")
+    public ResponseEntity<?> filterJobAdvertisements(@RequestBody JobAdFilterDTO jobAdFilterDTO) {
+        List<JobAdDetailsDTO> jobAdDetailsDTOS = jobAdvertisementService.filterJobAdvertisements(jobAdFilterDTO);
+        return new ResponseEntity<>(jobAdDetailsDTOS, HttpStatus.OK);
+    }
+
+    @GetMapping("/{id}")
     public ResponseEntity<?> findJobAdvertisementById(@PathVariable Long id) {
         JobAdDetailsDTO jobAdDetailsDTO = jobAdvertisementService.findJobAdvertisementById(id);
         return new ResponseEntity<>(jobAdDetailsDTO, HttpStatus.OK);
     }
+
+
+
 }

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/job_advertisements/JobAdvertisement.java

@@ -8 +8 @@
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.enumerations.JobType;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdDetailsDTO;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.Recruiter;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.User;
 
@@ -20 +21 @@
 public class JobAdvertisement {
 
-    public JobAdvertisement(User recruiter, String title, String description, String industry, int startingSalary, LocalDate activeUntil, JobType jobType, EmploymentStatus employmentStatus) {
+    public JobAdvertisement(Recruiter recruiter, String title, String description, String industry, int startingSalary, LocalDate activeUntil, JobType jobType, EmploymentStatus employmentStatus) {
         this.recruiter = recruiter;
         this.title = title;
@@ -38 +39 @@
 
     @ManyToOne
-    private User recruiter;
+    private Recruiter recruiter;
 
     private String title;

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

@@ -5 +5 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.Optional;
+
 public interface RecruiterRepository extends JpaRepository<Recruiter, Long> {
-    Recruiter findRecruiterByEmail(String email);
+    Optional<Recruiter> findRecruiterByEmail(String email);
 }

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

@@ -5 +5 @@
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.enumerations.JobType;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdDetailsDTO;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdFilterDTO;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdvertisementDTO;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.JobAdvertisement;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.Recruiter;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.User;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.repositories.JobAdvertisementRepository;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.repositories.RecruiterRepository;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.repositories.UserRepository;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.JobAdvertisementService;
@@ -15 +18 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.Comparator;
 import java.util.List;
 
@@ -22 +26 @@
     private final UserRepository userRepository;
     private final JobAdvertisementRepository jobAdvertisementRepository;
+    private final RecruiterRepository recruiterRepository;
 
     @Override
     public JobAdDetailsDTO addJobAdvertisement(JobAdvertisementDTO jobAdvertisementDTO) {
-        User recruiter = userRepository.findByEmail(jobAdvertisementDTO.getEmail()).orElseThrow(() -> new IllegalArgumentException("User not found"));
+        Recruiter recruiter = recruiterRepository.findRecruiterByEmail(jobAdvertisementDTO.getEmail()).orElseThrow(() -> new IllegalArgumentException("User not found"));
         JobAdvertisement jobAdvertisement = new JobAdvertisement(
                 recruiter,
@@ -35 +40 @@
                 JobType.valueOf(jobAdvertisementDTO.getJobType()),
                 EmploymentStatus.valueOf(jobAdvertisementDTO.getEmploymentStatus())
-                );
+        );
         jobAdvertisementRepository.save(jobAdvertisement);
         return JobAdvertisement.mapToJobAdDetailsDTO(jobAdvertisement);
@@ -79 +84 @@
 
     @Override
+    public List<JobAdDetailsDTO> filterJobAdvertisements(JobAdFilterDTO jobAdFilterDTO) {
+        List<JobAdvertisement> filteredJobAds = jobAdvertisementRepository.findAll();
+        filteredJobAds = filter(filteredJobAds, jobAdFilterDTO);
+
+        return filteredJobAds.stream()
+                .map(JobAdvertisement::mapToJobAdDetailsDTO)
+                .toList();
+    }
+
+    private List<JobAdvertisement> filter(List<JobAdvertisement> filteredJobAdvertisements, JobAdFilterDTO jobAdFilterDTO) {
+        return filteredJobAdvertisements.stream()
+                .filter(jobAd -> jobAd.getTitle().toLowerCase().contains(jobAdFilterDTO.getSearchTerm().toLowerCase()))
+                .filter(jobAd -> jobAdFilterDTO.getIndustry().equals("all") || jobAd.getIndustry().equals(jobAdFilterDTO.getIndustry()))
+                .sorted(getComparator(jobAdFilterDTO.getSortOrder()))
+                .toList();
+    }
+
+    private Comparator<JobAdvertisement> getComparator(String sortOrder) {
+        return switch (sortOrder) {
+            case "date_newest" -> Comparator.comparing(JobAdvertisement::getPostedOn).reversed();
+            case "date_oldest" -> Comparator.comparing(JobAdvertisement::getPostedOn);
+            case "salary_highest" -> Comparator.comparing(JobAdvertisement::getStartingSalary).reversed();
+            case "salary_lowest" -> Comparator.comparing(JobAdvertisement::getStartingSalary);
+            default -> Comparator.comparing(JobAdvertisement::getPostedOn); // Default sorting order
+        };
+    }
+
+
+    @Override
     public List<JobAdDetailsDTO> findAllJobAdvertisementsByRecruiterId(Long recruiterId) {
         List<JobAdvertisement> jobAdvertisementList = jobAdvertisementRepository.findAllByRecruiterId(recruiterId);
-//        jobAdvertisementList.forEach(jobAdvertisement -> {
-//            if (!jobAdvertisement.isJobAdActive() && jobAdvertisement.isActive()) {
-//                jobAdvertisement.setActive(false);
-//                jobAdvertisementRepository.save(jobAdvertisement);
-//            } else if (jobAdvertisement.isJobAdActive() && !jobAdvertisement.isActive()) {
-//                jobAdvertisement.setActive(true);
-//                jobAdvertisementRepository.save(jobAdvertisement);
-//            }
-//        });
 
         return jobAdvertisementList.stream()
@@ -95 +120 @@
                 .toList();
     }
+
+    @Override
+    public List<JobAdDetailsDTO> filterJobAdvertisementsByRecruiterId(Long recruiterId, JobAdFilterDTO jobAdFilterDTO) {
+        List<JobAdvertisement> filteredJobAds = jobAdvertisementRepository.findAllByRecruiterId(recruiterId);
+        filteredJobAds = filter(filteredJobAds, jobAdFilterDTO);
+        return filteredJobAds.stream()
+                .map(JobAdvertisement::mapToJobAdDetailsDTO)
+                .toList();
+    }
+
     @Override
     public JobAdDetailsDTO findJobAdvertisementById(Long id) {

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

@@ -2 +2 @@
 
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdDetailsDTO;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdFilterDTO;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.DTO.JobAdvertisementDTO;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.job_advertisements.JobAdvertisement;
@@ -14 +15 @@
 
     List<JobAdDetailsDTO> findAllJobAdvertisements();
+    List<JobAdDetailsDTO> filterJobAdvertisements(JobAdFilterDTO jobAdFilterDTO);
     List<JobAdDetailsDTO> findAllJobAdvertisementsByRecruiterId(Long recruiterId);
+    List<JobAdDetailsDTO> filterJobAdvertisementsByRecruiterId(Long recruiterId, JobAdFilterDTO jobAdFilterDTO);
     JobAdDetailsDTO findJobAdvertisementById(Long id);