changes to project dto to match new api structure
This commit is contained in:
parent
2e4899a808
commit
d76acea80f
src/main/java/se/su/dsv/scipro/io
@ -6,12 +6,11 @@ import java.util.Set;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class ProjectDTO {
|
||||
@SerializedName("thesisID")
|
||||
public long id;
|
||||
public String status;
|
||||
public String title;
|
||||
public String type;
|
||||
public long startDate;
|
||||
public String startDate;
|
||||
public Set<ProjectParticipantDTO> participants = new HashSet<ProjectParticipantDTO>();
|
||||
|
||||
public ProjectDTO(){
|
||||
|
@ -1,5 +1,7 @@
|
||||
package se.su.dsv.scipro.io.facade;
|
||||
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
@ -180,7 +182,12 @@ public class ImporterFacade {
|
||||
}
|
||||
private void projectFromDTO(Project project, final ProjectDTO projectDTO, boolean mergeLinkedEntities) {
|
||||
project.setIdentifier(projectDTO.id);
|
||||
project.setDaisyStartDate(new Date(projectDTO.startDate));
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
||||
try {
|
||||
project.setDaisyStartDate(format.parse(projectDTO.startDate));
|
||||
} catch (ParseException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
project.setTitle(projectDTO.title);
|
||||
project.setProjectStatus(toLocalStatus(projectDTO.status));
|
||||
ProjectClass externalProjectClass = toLocalClass(projectDTO);
|
||||
@ -199,6 +206,7 @@ public class ImporterFacade {
|
||||
project = projectDao.save(project);
|
||||
//Loop over all participants and assign roles
|
||||
if(mergeLinkedEntities){
|
||||
System.out.println(projectDTO.participants);
|
||||
for(ProjectParticipantDTO projectParticipant:projectDTO.participants){
|
||||
projectParticipantFromDTO(project,projectParticipant);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user