Changeset 33d4f5d for src/main/java/it/finki/tinki/service

Timestamp:

01/12/21 02:42:18 (3 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

a70db1a

Parents:

8f1f460

Message:

bugfixes and refactoring

Location:

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

Files:

• MatchmakerService.java (modified) (2 diffs)
• impl/AccountServiceImpl.java (modified) (1 diff)
• impl/MatchmakerServiceImpl.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package it.finki.tinki.service;
 
+import it.finki.tinki.model.Match;
 import it.finki.tinki.model.Work.Internship;
 import it.finki.tinki.model.Work.Job;
@@ -15 +16 @@
     void setUpUserProjectMatches(Project project, User user);
     void setUpUserInternshipMatches(Internship internship, User user);
+    List<Match> removeByUserId(Long userId);
 }

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

@@ -214 +214 @@
 
     private void setUpUser(User u){
+
+        this.matchmakerService.removeByUserId(u.getId());
+
         List<Job> jobs = this.jobRepository.findAll();
         List<Project> projects = this.projectRepository.findAll();

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

@@ -17 +17 @@
 import org.springframework.stereotype.Service;
 
+import javax.transaction.Transactional;
 import java.util.ArrayList;
 import java.util.List;
@@ -118 +119 @@
         if(coef!=0){
             EmbeddedMatchId embeddedMatchId = new EmbeddedMatchId(internship, user);
-            Match m = new Match(embeddedMatchId, coef, WorkType.PROJECT);
+            Match m = new Match(embeddedMatchId, coef, WorkType.INTERNSHIP);
             this.matchRepository.save(m);
         }
     }
 
+    @Transactional
+    @Override
+    public List<Match> removeByUserId(Long userId) {
+        return this.matchRepository.deleteAllByEmbeddedMatchId_User_Id(userId);
+    }
 
 }