Changeset 509cb95 for src/main/java/it/finki/tinki/service

Timestamp:

01/07/21 22:32:22 (4 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

a8e8545

Parents:

723994f

Message:

finalized register and login and added insert options for jobs

Location:

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

Files:

• AccountService.java (modified) (2 diffs)
• MatchmakerService.java (modified) (1 diff)
• WorkService.java (added)
• impl/AccountServiceImpl.java (modified) (1 diff)
• impl/MatchmakerServiceImpl.java (modified) (5 diffs)
• impl/WorkServiceImpl.java (added)

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

@@ -6 +6 @@
 
 import java.util.List;
-import java.util.Map;
 
 public interface AccountService {
@@ -13 +12 @@
     Account registerTeam(String email, String password, String name, int members);
     Account registerCompany(String email, String password, String name, String country, String city, String street);
+    Account findByIdAndType(Long accId, AccountType type);
 }

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

@@ -12 +12 @@
     List<Job> getMatchingJobsForUser(User user);
     List<Project> getMatchingProjectsForUser(User user);
+    void setUpUserJobMatches(Job job, User user);
+    void setUpUserProjectMatches(Project project, User user);
+    void setUpUserInternshipMatches(Internship internship, User user);
 }

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

@@ -96 +96 @@
         return this.companyRepository.save(c);
     }
+
+    public Account findByIdAndType(Long id, AccountType type){
+        switch (type){
+            case COMPANY:
+                return this.companyRepository.findById(id).get();
+            case TEAM:
+                return this.teamRepository.findById(id).get();
+            case USER:
+                return this.userRepository.findById(id).get();
+        }
+
+        return null;
+    }
 }

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

@@ -1 +1 @@
 package it.finki.tinki.service.impl;
 
+import it.finki.tinki.helper.Matchmaker;
+import it.finki.tinki.model.EmbeddedMatchId;
 import it.finki.tinki.model.Jobs.Internship;
 import it.finki.tinki.model.Jobs.Job;
 import it.finki.tinki.model.Jobs.Project;
+import it.finki.tinki.model.Jobs.Work;
 import it.finki.tinki.model.Match;
-import it.finki.tinki.model.Users.Team;
+import it.finki.tinki.model.Skill;
 import it.finki.tinki.model.Users.User;
 import it.finki.tinki.model.enumerator.WorkType;
@@ -27 +30 @@
     @Override
     public List<Internship> getMatchingInternshipsForUser(User user) {
-        List<Match> matches = this.matchRepository.getAllByCombinedId_UserAndTypeOrderByCoefficientDesc(user, WorkType.INTERNSHIP);
+        List<Match> matches = this.matchRepository.getAllByCombinedId_User_IdAndTypeOrderByCoefficientDesc(user.getId(), WorkType.INTERNSHIP);
 
         List<Internship> internships = new ArrayList<>();
@@ -39 +42 @@
     @Override
     public List<Job> getMatchingJobsForUser(User user) {
-        List<Match> matches = this.matchRepository.getAllByCombinedId_UserAndTypeOrderByCoefficientDesc(user, WorkType.JOB);
+        List<Match> matches = this.matchRepository.getAllByCombinedId_User_IdAndTypeOrderByCoefficientDesc(user.getId(), WorkType.JOB);
 
         List<Job> jobs = new ArrayList<>();
@@ -51 +54 @@
     @Override
     public List<Project> getMatchingProjectsForUser(User user) {
-        List<Match> matches = this.matchRepository.getAllByCombinedId_UserAndTypeOrderByCoefficientDesc(user, WorkType.PROJECT);
+        List<Match> matches = this.matchRepository.getAllByCombinedId_User_IdAndTypeOrderByCoefficientDesc(user.getId(), WorkType.PROJECT);
 
         List<Project> projects = new ArrayList<>();
@@ -60 +63 @@
         return projects;
     }
+
+    @Override
+    public void setUpUserJobMatches(Job job, User user) {
+        List<Skill> jobSkill = job.getSkillsRequired();
+        List<Skill> userSkill = user.getRetainedSkills();
+
+        float coef = Matchmaker.match(jobSkill, userSkill);
+
+        if(coef!=0){
+            EmbeddedMatchId matchId = new EmbeddedMatchId(job, user);
+            Match m = new Match(matchId, coef, WorkType.JOB);
+            this.matchRepository.save(m);
+        }
+    }
+
+    @Override
+    public void setUpUserProjectMatches(Project project, User user) {
+        List<Skill> projectSkills = project.getSkillsRequired();
+        List<Skill> userSkill = user.getRetainedSkills();
+
+        float coef = Matchmaker.match(projectSkills, userSkill);
+
+        if(coef!=0){
+            EmbeddedMatchId matchId = new EmbeddedMatchId(project, user);
+            Match m = new Match(matchId, coef, WorkType.PROJECT);
+            this.matchRepository.save(m);
+        }
+    }
+
+    @Override
+    public void setUpUserInternshipMatches(Internship internship, User user) {
+        List<Skill> internshipSkills = internship.getSkillsTrained();
+        List<Skill> userSkill = user.getSkillsToLearn();
+
+        float coef = Matchmaker.match(internshipSkills, userSkill);
+
+        if(coef!=0){
+            EmbeddedMatchId matchId = new EmbeddedMatchId(internship, user);
+            Match m = new Match(matchId, coef, WorkType.INTERNSHIP);
+            this.matchRepository.save(m);
+        }
+    }
+
+
 }