Changeset 297bd16

Timestamp:

01/09/21 01:07:09 (3 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

f067338

Parents:

bd46dbb

Message:

added job/internship/project inserts

Location:

src/main/java/it/finki/tinki

Files:

• TinkiApplication.java (modified) (1 diff)
• model/EmbeddedMatchId.java (modified) (1 diff)
• model/dto/register/work/InternshipRegisterDTO.java (modified) (1 diff)
• model/dto/register/work/ProjectRegisterDTO.java (modified) (1 diff)
• model/dto/register/work/WorkRegisterDTO.java (modified) (2 diffs)
• service/AccountService.java (modified) (1 diff)
• service/impl/WorkServiceImpl.java (modified) (8 diffs)
• web/controller/AccountRegisterController.java (moved) (moved from src/main/java/it/finki/tinki/web/controller/RegisterController.java ) (2 diffs)
• web/controller/WorkRegisterController.java (modified) (2 diffs)

src/main/java/it/finki/tinki/TinkiApplication.java

@@ -11 +11 @@
         SpringApplication.run(TinkiApplication.class, args);
     }
+
 }

src/main/java/it/finki/tinki/model/EmbeddedMatchId.java

@@ -19 +19 @@
     private User user;
 
-    public EmbeddedMatchId(){ }
+    public EmbeddedMatchId(){}
 
     public EmbeddedMatchId(Work work, User user){

src/main/java/it/finki/tinki/model/dto/register/work/InternshipRegisterDTO.java

@@ -6 +6 @@
 
 @Data
-public class InternshipRegisterDTO {
+public class InternshipRegisterDTO extends WorkRegisterDTO {
     int openSpots;
     List<Long> skillsTrained;

src/main/java/it/finki/tinki/model/dto/register/work/ProjectRegisterDTO.java

@@ -7 +7 @@
 
 @Data
-public class ProjectRegisterDTO {
+public class ProjectRegisterDTO extends WorkRegisterDTO {
     Date validUntil;
     List<Long> skillsRequired;

src/main/java/it/finki/tinki/model/dto/register/work/WorkRegisterDTO.java

@@ -1 +1 @@
 package it.finki.tinki.model.dto.register.work;
 
+import it.finki.tinki.model.enumerator.AccountType;
 import lombok.Data;
 
@@ -9 +10 @@
     Long accountId;
     int salary;
+    AccountType type;
 }

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

@@ -19 +19 @@
     User editUser(Long id, String email, String name, String surname, List<Skill> retainedSkills, List<Skill> skillsToLearn);
     Company editCompany(Long id, String email, String name, String country, String city, String street);
+    Team editTeam(Long id, String email, String name, int members);
     Optional<?> findByIdAndEmail(Long id, String email, AccountType type);
-    Team editTeam(Long id, String email, String name, int members);
 }

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

@@ -1 +1 @@
 package it.finki.tinki.service.impl;
 
+import it.finki.tinki.model.Users.User;
 import it.finki.tinki.model.Work.Internship;
 import it.finki.tinki.model.Work.Job;
@@ -7 +8 @@
 import it.finki.tinki.model.Users.Account;
 import it.finki.tinki.model.enumerator.AccountType;
-import it.finki.tinki.repository.InternshipRepository;
-import it.finki.tinki.repository.JobRepository;
-import it.finki.tinki.repository.MatchRepository;
-import it.finki.tinki.repository.ProjectRepository;
+import it.finki.tinki.repository.*;
 import it.finki.tinki.service.AccountService;
+import it.finki.tinki.service.MatchmakerService;
 import it.finki.tinki.service.SkillService;
 import it.finki.tinki.service.WorkService;
@@ -26 +25 @@
     ProjectRepository projectRepository;
     MatchRepository matchRepository;
+    MatchmakerService matchmakerService;
     SkillService skillService;
     AccountService accountService;
+    UserRepository userRepository;
 
     public WorkServiceImpl(JobRepository jobRepository,
@@ -34 +35 @@
                            MatchRepository matchRepository,
                            SkillService skillService,
-                           AccountService accountService) {
+                           AccountService accountService,
+                           UserRepository userRepository,
+                           MatchmakerService matchmakerService) {
         this.jobRepository = jobRepository;
         this.internshipRepository = internshipRepository;
@@ -41 +44 @@
         this.skillService = skillService;
         this.accountService = accountService;
+        this.userRepository = userRepository;
+        this.matchmakerService = matchmakerService;
     }
 
@@ -78 +83 @@
         Account account = this.accountService.findByIdAndType(adccId, type);
         Job j = new Job(title, description, account, salary, skills);
-        return this.jobRepository.save(j);
+        Job jb = this.jobRepository.save(j);
+
+        List<User> users = this.userRepository.findAll();
+
+        users.forEach(user -> {
+            this.matchmakerService.setUpUserJobMatches(jb, user);
+        });
+
+        return jb;
     }
 
@@ -86 +99 @@
         Account account = this.accountService.findByIdAndType(adccId, type);
         Internship j = new Internship(title, description, account, salary, skills, openSpots);
-        return this.internshipRepository.save(j);
+        Internship jb = this.internshipRepository.save(j);
+
+        List<User> users = this.userRepository.findAll();
+
+        users.forEach(user -> {
+            this.matchmakerService.setUpUserInternshipMatches(jb, user);
+        });
+
+        return jb;
     }
 
@@ -94 +115 @@
         Account account = this.accountService.findByIdAndType(adccId, type);
         Project j = new Project(title, description, account, salary, skills, validUntil);
-        return this.projectRepository.save(j);
+        Project jb = this.projectRepository.save(j);
+
+        List<User> users = this.userRepository.findAll();
+
+        users.forEach(user -> {
+            this.matchmakerService.setUpUserProjectMatches(jb, user);
+        });
+
+        return jb;
     }
 }

src/main/java/it/finki/tinki/web/controller/AccountRegisterController.java

@@ -19 +19 @@
 @CrossOrigin(origins = "http://localhost:3000")
 @RequestMapping("/api/register")
-public class RegisterController {
+public class AccountRegisterController {
 
     AccountService accountService;
@@ -26 +26 @@
     MatchmakerService matchmakerService;
 
-    public RegisterController(AccountService accountService, SkillService skillService, WorkService workService, MatchmakerService matchmakerService) {
+    public AccountRegisterController(AccountService accountService, SkillService skillService, WorkService workService, MatchmakerService matchmakerService) {
         this.accountService = accountService;
         this.skillService = skillService;

src/main/java/it/finki/tinki/web/controller/WorkRegisterController.java

@@ -1 +1 @@
 package it.finki.tinki.web.controller;
 
+import it.finki.tinki.model.Work.Internship;
+import it.finki.tinki.model.Work.Job;
+import it.finki.tinki.model.Work.Project;
+import it.finki.tinki.model.dto.register.work.InternshipRegisterDTO;
+import it.finki.tinki.model.dto.register.work.JobRegisterDTO;
+import it.finki.tinki.model.dto.register.work.ProjectRegisterDTO;
+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.service.WorkService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11 +20 @@
 public class WorkRegisterController {
 
-//    @PostMapping("/job")
-//    public JobResponseDTO registerJob(@RequestBody JobRegisterDTO body){
-//
-//    }
+    WorkService workService;
+
+    public WorkRegisterController(WorkService workService) {
+        this.workService = workService;
+    }
+
+    @PostMapping("/job")
+    public JobResponseDTO registerJob(@RequestBody JobRegisterDTO body){
+
+        Job j = this.workService.insertJob(body.getTitle(),
+                body.getDescription(), body.getAccountId(), body.getSalary(), body.getSkillsRequired(), body.getType());
+
+        return new JobResponseDTO(j);
+    }
+
+    @PostMapping("/internship")
+    public InternshipResponseDTO registerInternship(@RequestBody InternshipRegisterDTO body){
+
+        Internship j = this.workService.insertInternship(body.getTitle(),
+                body.getDescription(), body.getAccountId(), body.getSalary(), body.getSkillsTrained(), body.getOpenSpots(), body.getType());
+
+        return new InternshipResponseDTO(j);
+    }
+
+    @PostMapping("/project")
+    public ProjectResponseDTO registerProject(@RequestBody ProjectRegisterDTO body){
+
+        Project j = this.workService.insertProject(body.getTitle(),
+                body.getDescription(), body.getAccountId(), body.getSalary(), body.getSkillsRequired(), body.getValidUntil(), body.getType());
+
+        return new ProjectResponseDTO(j);
+    }
 }