Changeset f067338 for src/main/java/it/finki/tinki/service

Timestamp:

01/09/21 03:04:38 (3 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

a3d2b0d

Parents:

297bd16

Message:

added full text search on work

Location:

src/main/java/it/finki/tinki/service

Files:

• SkillService.java (modified) (1 diff)
• WorkService.java (modified) (2 diffs)
• impl/SkillServiceImpl.java (modified) (1 diff)
• impl/WorkServiceImpl.java (modified) (3 diffs)

src/main/java/it/finki/tinki/service/SkillService.java

@@ -7 +7 @@
 public interface SkillService {
     List<Skill> returnSkillsBasedOnId(List<Long> skillIds);
+    List<Skill> returnBasedOnText(String text);
 }

src/main/java/it/finki/tinki/service/WorkService.java

@@ -4 +4 @@
 import it.finki.tinki.model.Work.Job;
 import it.finki.tinki.model.Work.Project;
+import it.finki.tinki.model.dto.response.work.InternshipResponseDTO;
+import it.finki.tinki.model.dto.response.work.JobResponseDTO;
+import it.finki.tinki.model.dto.response.work.ProjectResponseDTO;
+import it.finki.tinki.model.dto.response.work.WorkResponseDTO;
 import it.finki.tinki.model.enumerator.AccountType;
 
@@ -19 +23 @@
     Internship insertInternship(String title, String description, Long adccId, int salary, List<Long> skillsTrained, int openSpots, AccountType type);
     Project insertProject(String title, String description, Long adccId, int salary, List<Long> skillsRequired, Date validUntil, AccountType type);
+    List<JobResponseDTO> fullTextJobSearch(String text);
+    List<InternshipResponseDTO> fullTextInternshipSearch(String text);
+    List<ProjectResponseDTO> fullTextProjectSearch(String text);
 }

src/main/java/it/finki/tinki/service/impl/SkillServiceImpl.java

@@ -29 +29 @@
         return list;
     }
+
+    public List<Skill> returnBasedOnText(String text){
+        return this.skillRepository.findAllByNameContaining(text);
+    }
 }

src/main/java/it/finki/tinki/service/impl/WorkServiceImpl.java

@@ -7 +7 @@
 import it.finki.tinki.model.Skill;
 import it.finki.tinki.model.Users.Account;
+import it.finki.tinki.model.Work.Work;
+import it.finki.tinki.model.dto.response.work.InternshipResponseDTO;
+import it.finki.tinki.model.dto.response.work.JobResponseDTO;
+import it.finki.tinki.model.dto.response.work.ProjectResponseDTO;
+import it.finki.tinki.model.dto.response.work.WorkResponseDTO;
 import it.finki.tinki.model.enumerator.AccountType;
 import it.finki.tinki.repository.*;
@@ -15 +20 @@
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Service
@@ -125 +129 @@
         return jb;
     }
+
+    @Override
+    public List<JobResponseDTO> fullTextJobSearch(String text) {
+        List<Skill> skills = this.skillService.returnBasedOnText(text);
+
+        List<Job> jobs = this.jobRepository.findAllByTitleContainsOrDescriptionContains(text,text);
+        List<Job> sjob = new ArrayList<>();
+
+        skills.forEach(skill -> {
+            sjob.addAll(this.jobRepository.findAllBySkillsRequiredContaining(skill));
+        });
+
+        sjob.forEach(job -> {
+            if(!jobs.contains(job)){
+                jobs.add(job);
+            }
+        });
+
+        List<JobResponseDTO> jobs2 = new ArrayList<>();
+
+        jobs.forEach(job -> {
+            jobs2.add(new JobResponseDTO(job));
+        });
+
+        return jobs2;
+    }
+
+    @Override
+    public List<InternshipResponseDTO> fullTextInternshipSearch(String text) {
+        List<Skill> skills = this.skillService.returnBasedOnText(text);
+
+        List<Internship> jobs = this.internshipRepository.findAllByTitleContainsOrDescriptionContains(text,text);
+        List<Internship> sjob = new ArrayList<>();
+
+        skills.forEach(skill -> {
+            sjob.addAll(this.internshipRepository.findAllBySkillsTrainedContaining(skill));
+        });
+
+        sjob.forEach(job -> {
+            if(!jobs.contains(job)){
+                jobs.add(job);
+            }
+        });
+
+        List<InternshipResponseDTO> jobs2 = new ArrayList<>();
+
+        jobs.forEach(job -> {
+            jobs2.add(new InternshipResponseDTO(job));
+        });
+
+        return jobs2;
+    }
+
+    @Override
+    public List<ProjectResponseDTO> fullTextProjectSearch(String text) {
+        List<Skill> skills = this.skillService.returnBasedOnText(text);
+
+        List<Project> jobs = this.projectRepository.findAllByTitleContainsOrDescriptionContains(text,text);
+        List<Project> sjob = new ArrayList<>();
+
+        skills.forEach(skill -> {
+            sjob.addAll(this.projectRepository.findAllBySkillsRequiredContaining(skill));
+        });
+
+        sjob.forEach(job -> {
+            if(!jobs.contains(job)){
+                jobs.add(job);
+            }
+        });
+
+        List<ProjectResponseDTO> jobs2 = new ArrayList<>();
+
+        jobs.forEach(job -> {
+            jobs2.add(new ProjectResponseDTO(job));
+        });
+
+        return jobs2;
+    }
 }