Changeset bd46dbb for src/main/java/it/finki/tinki/model/dto/response

Timestamp:

01/08/21 23:47:41 (3 years ago)

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

297bd16

Parents:

bd38a55

Message:

refactoring and response dto

Location:

src/main/java/it/finki/tinki/model/dto/response

Files:

• account/CompanyResponseDTO.java (moved) (moved from src/main/java/it/finki/tinki/model/dto/CompanyResponseDTO.java ) (1 diff)
• account/LoginResponseDTO.java (moved) (moved from src/main/java/it/finki/tinki/model/dto/LoginResponseDTO.java ) (1 diff)
• account/TeamResponseDTO.java (moved) (moved from src/main/java/it/finki/tinki/model/dto/TeamResponseDTO.java ) (2 diffs)
• account/UserResponseDTO.java (moved) (moved from src/main/java/it/finki/tinki/model/dto/UserResponseDTO.java ) (2 diffs)
• work/InternshipResponseDTO.java (added)
• work/JobResponseDTO.java (moved) (moved from src/main/java/it/finki/tinki/model/dto/JobResponseDTO.java ) (2 diffs)
• work/ProjectResponseDTO.java (added)
• work/WorkResponseDTO.java (added)

src/main/java/it/finki/tinki/model/dto/response/account/CompanyResponseDTO.java

@@ -1 @@
-package it.finki.tinki.model.dto;
+package it.finki.tinki.model.dto.response.account;
 
 import it.finki.tinki.model.Address;
+import it.finki.tinki.model.dto.response.work.InternshipResponseDTO;
+import it.finki.tinki.model.dto.response.work.JobResponseDTO;
 import lombok.Data;
 

src/main/java/it/finki/tinki/model/dto/response/account/LoginResponseDTO.java

@@ -1 @@
-package it.finki.tinki.model.dto;
+package it.finki.tinki.model.dto.response.account;
 
 import it.finki.tinki.model.enumerator.AccountType;

src/main/java/it/finki/tinki/model/dto/response/account/TeamResponseDTO.java

@@ -1 @@
-package it.finki.tinki.model.dto;
+package it.finki.tinki.model.dto.response.account;
 
+import it.finki.tinki.model.dto.response.work.JobResponseDTO;
+import it.finki.tinki.model.dto.response.work.ProjectResponseDTO;
 import lombok.Data;
 
@@ -7 +9 @@
 
 @Data
-public class TeamResponseDTO extends LoginResponseDTO{
+public class TeamResponseDTO extends LoginResponseDTO {
     private int members;
     private List<JobResponseDTO> jobs;

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

@@ -1 @@
-package it.finki.tinki.model.dto;
+package it.finki.tinki.model.dto.response.account;
 
 import it.finki.tinki.model.Skill;
+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 lombok.Data;
 
@@ -8 +11 @@
 
 @Data
-public class UserResponseDTO extends LoginResponseDTO{
+public class UserResponseDTO extends LoginResponseDTO {
     private String surname;
     private List<Skill> retained;

src/main/java/it/finki/tinki/model/dto/response/work/JobResponseDTO.java

@@ -1 @@
-package it.finki.tinki.model.dto;
+package it.finki.tinki.model.dto.response.work;
 
 import it.finki.tinki.model.Address;
-import it.finki.tinki.model.Jobs.Job;
+import it.finki.tinki.model.Work.Job;
 import it.finki.tinki.model.Users.Company;
 import it.finki.tinki.model.Users.Team;
@@ -9 +9 @@
 
 @Data
-public class JobResponseDTO {
-    Long id;
-    String title;
-    String description;
-    int salary;
-    String accountEmail;
-    String accountName;
-    AccountType accountType;
+public class JobResponseDTO extends WorkResponseDTO {
     Address accountAddress;
     int members;
 
     public JobResponseDTO(Job job){
-        this.id = job.getId();
-        this.title = job.getTitle();
-        this.description = job.getDescription();
-        this.salary = job.getSalary();
-        this.accountEmail = job.getAccount().getEmail();
-        this.accountName = job.getAccount().getName();
-        this.accountType = job.getAccount().getAccountType();
+        super(job.getId(), job.getTitle(), job.getDescription(), job.getSalary(), job.getAccount());
         if(job.getAccount().getAccountType()==AccountType.COMPANY){
             this.accountAddress = ((Company) job.getAccount()).getAddress();