Changeset b24fe9b

Timestamp:

01/08/21 02:17:20 (3 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

b31afbd

Parents:

4cec0a3

Message:

project and internship response dto

Location:

src/main/java/it/finki/tinki

Files:

• model/dto/InternshipResponseDTO.java (added)
• model/dto/ProjectResponseDTO.java (added)
• model/dto/UserResponseDTO.java (modified) (1 diff)
• web/controller/LoginController.java (modified) (2 diffs)

src/main/java/it/finki/tinki/model/dto/UserResponseDTO.java

@@ -16 +16 @@
     private List<Skill> toLearn;
     private List<JobResponseDTO> jobs;
-    private List<Internship> internships;
-    private List<Project> projects;
+    private List<InternshipResponseDTO> internships;
+    private List<ProjectResponseDTO> projects;
 
     public UserResponseDTO(){

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

@@ -3 +3 @@
 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.Users.Account;
 import it.finki.tinki.model.Users.Company;
@@ -58 +59 @@
 
                 List<Job> matchedJobs = this.matchmakerService.getMatchingJobsForUser((User) a1);
+                List<Project> matchedProjects = this.matchmakerService.getMatchingProjectsForUser((User) a1);
+                List<Internship> matchedInternships = this.matchmakerService.getMatchingInternshipsForUser((User) a1);
 
                 matchedJobs.forEach(job -> {
                     JobResponseDTO dto = new JobResponseDTO(job);
                     uDto.getJobs().add(dto);
+                });
+
+                matchedProjects.forEach(project -> {
+                    ProjectResponseDTO dto = new ProjectResponseDTO(project);
+                    uDto.getProjects().add(dto);
+                });
+
+                matchedInternships.forEach(internship -> {
+                    InternshipResponseDTO dto = new InternshipResponseDTO(internship);
+                    uDto.getInternships().add(dto);
                 });