Index: src/main/java/it/finki/tinki/model/dto/CompanyResponseDTO.java
===================================================================
--- src/main/java/it/finki/tinki/model/dto/CompanyResponseDTO.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
+++ src/main/java/it/finki/tinki/model/dto/CompanyResponseDTO.java	(revision 4b1c93d9aae301f7d143f9950c8baf7d3cbf22b7)
@@ -11,5 +11,5 @@
 public class CompanyResponseDTO extends LoginResponseDTO {
     private Address address;
-    private List<Job> jobs;
-    private List<Internship> internships;
+    private List<JobResponseDTO> jobs;
+    private List<InternshipResponseDTO> internships;
 }
Index: src/main/java/it/finki/tinki/model/dto/TeamResponseDTO.java
===================================================================
--- src/main/java/it/finki/tinki/model/dto/TeamResponseDTO.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
+++ src/main/java/it/finki/tinki/model/dto/TeamResponseDTO.java	(revision 4b1c93d9aae301f7d143f9950c8baf7d3cbf22b7)
@@ -1,6 +1,4 @@
 package it.finki.tinki.model.dto;
 
-import it.finki.tinki.model.Jobs.Job;
-import it.finki.tinki.model.Jobs.Project;
 import lombok.Data;
 
@@ -10,5 +8,5 @@
 public class TeamResponseDTO extends LoginResponseDTO{
     private int members;
-    private List<Job> jobs;
-    private List<Project> projects;
+    private List<JobResponseDTO> jobs;
+    private List<ProjectResponseDTO> projects;
 }
Index: src/main/java/it/finki/tinki/web/controller/LoginController.java
===================================================================
--- src/main/java/it/finki/tinki/web/controller/LoginController.java	(revision 336d09ec13735b8bf9ab8fa94f748da07e9c15fb)
+++ src/main/java/it/finki/tinki/web/controller/LoginController.java	(revision 4b1c93d9aae301f7d143f9950c8baf7d3cbf22b7)
@@ -32,6 +32,4 @@
         this.workService = workService;
     }
-
-    //TODO: ADD JOB/INTERNSHIP RESPONSE TYPE TO COMPANY AND TEAM ---------------------v
 
     @PostMapping(path = "/login")
@@ -90,6 +88,16 @@
                 tDto.setMembers(((Team) a1).getMembers());
 
-                tDto.setJobs(this.workService.getAllJobsByAccount(a1.getId()));
-                tDto.setProjects(this.workService.getAllProjectsByAccount(a1.getId()));
+                List<Job> jobs = this.workService.getAllJobsByAccount(a1.getId());
+                List<Project> projects = this.workService.getAllProjectsByAccount(a1.getId());
+
+                jobs.forEach(job -> {
+                    JobResponseDTO dto = new JobResponseDTO(job);
+                    tDto.getJobs().add(dto);
+                });
+
+                projects.forEach(project -> {
+                    ProjectResponseDTO dto = new ProjectResponseDTO(project);
+                    tDto.getProjects().add(dto);
+                });
 
                 return tDto;
@@ -107,6 +115,16 @@
                 cDto.setAddress(((Company) a1).getAddress());
 
-                cDto.setJobs(this.workService.getAllJobsByAccount(a1.getId()));
-                cDto.setInternships(this.workService.getAllInternshipsByAccount(a1.getId()));
+                List<Job> jobs = this.workService.getAllJobsByAccount(a1.getId());
+                List<Internship> internships = this.workService.getAllInternshipsByAccount(a1.getId());
+
+                jobs.forEach(job -> {
+                    JobResponseDTO dto = new JobResponseDTO(job);
+                    cDto.getJobs().add(dto);
+                });
+
+                internships.forEach(internship -> {
+                    InternshipResponseDTO dto = new InternshipResponseDTO(internship);
+                    cDto.getInternships().add(dto);
+                });
 
                 return cDto;