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

Timestamp:

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

Author:

Vzdra <vladko.zdravkovski@…>

Branches:

master

Children:

a70db1a

Parents:

8f1f460

Message:

bugfixes and refactoring

Location:

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

Files:

• InternshipResponseDTO.java (modified) (3 diffs)
• JobResponseDTO.java (modified) (2 diffs)
• ProjectResponseDTO.java (modified) (1 diff)
• WorkResponseDTO.java (modified) (1 diff)

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

@@ -2 +2 @@
 
 import it.finki.tinki.model.Address;
+import it.finki.tinki.model.Skill;
 import it.finki.tinki.model.Work.Internship;
 import it.finki.tinki.model.Users.Company;
 import lombok.Data;
+
+import java.util.List;
 
 @Data
@@ -11 +14 @@
     int openSpots;
     Address accountAddress;
+    List<Skill> skillsTrained;
+
+    public InternshipResponseDTO(){
+        super();
+    }
 
     public InternshipResponseDTO(Internship internship){
@@ -17 +25 @@
         this.openSpots = internship.getOpenSpots();
         this.accountAddress = ((Company) internship.getAccount()).getAddress();
+        this.skillsTrained = internship.getSkillsTrained();
     }
 }

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

@@ -2 +2 @@
 
 import it.finki.tinki.model.Address;
+import it.finki.tinki.model.Skill;
 import it.finki.tinki.model.Work.Job;
 import it.finki.tinki.model.Users.Company;
@@ -8 +9 @@
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class JobResponseDTO extends WorkResponseDTO {
     Address accountAddress;
     int members;
+    List<Skill> skillsRequired;
+
+    public JobResponseDTO(){
+        super();
+    }
 
     public JobResponseDTO(Job job){
         super(job.getId(), job.getTitle(), job.getDescription(), job.getSalary(), job.getAccount());
+        this.skillsRequired = job.getSkillsRequired();
         if(job.getAccount().getAccountType()==AccountType.COMPANY){
             this.accountAddress = ((Company) job.getAccount()).getAddress();

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

@@ -1 +1 @@
 package it.finki.tinki.model.dto.response.work;
 
+import it.finki.tinki.model.Skill;
 import it.finki.tinki.model.Work.Project;
 import it.finki.tinki.model.Users.Team;
 import lombok.Data;
 
+import java.util.Date;
+import java.util.List;
+
 @Data
 public class ProjectResponseDTO extends WorkResponseDTO {
     int members;
+    Date validUntil;
+    List<Skill> skillsRequired;
+
+    public ProjectResponseDTO(){
+        super();
+    }
 
     public ProjectResponseDTO(Project project){
         super(project.getId(), project.getTitle(), project.getDescription(), project.getSalary(), project.getAccount());
         this.members = ((Team) project.getAccount()).getMembers();
+        this.validUntil = project.getValidUntil();
+        this.skillsRequired = project.getSkillsRequired();
     }
 }

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

@@ -14 +14 @@
     String accountName;
     AccountType accountType;
+    String error;
 
-    WorkResponseDTO(){}
+    WorkResponseDTO(){
+        this.error = "Error registering job!";
+    }
 
     WorkResponseDTO(Long id, String title, String description, int salary, Account account){
+        this.error = null;
         this.id = id;
         this.title = title;