|
|
@ -6,16 +6,13 @@ import org.hibernate.validator.constraints.NotEmpty;
|
|
|
|
import org.springframework.format.annotation.DateTimeFormat;
|
|
|
|
import org.springframework.format.annotation.DateTimeFormat;
|
|
|
|
import ru.ulstu.deadline.model.Deadline;
|
|
|
|
import ru.ulstu.deadline.model.Deadline;
|
|
|
|
import ru.ulstu.paper.model.Paper;
|
|
|
|
import ru.ulstu.paper.model.Paper;
|
|
|
|
import ru.ulstu.user.model.UserDto;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import javax.persistence.Temporal;
|
|
|
|
import javax.persistence.Temporal;
|
|
|
|
import javax.persistence.TemporalType;
|
|
|
|
import javax.persistence.TemporalType;
|
|
|
|
import javax.validation.constraints.Size;
|
|
|
|
import javax.validation.constraints.Size;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.HashSet;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Set;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import static ru.ulstu.core.util.StreamApiUtils.convert;
|
|
|
|
import static ru.ulstu.core.util.StreamApiUtils.convert;
|
|
|
|
|
|
|
|
|
|
|
@ -38,14 +35,12 @@ public class ConferenceDto {
|
|
|
|
private Date endDate = new Date();
|
|
|
|
private Date endDate = new Date();
|
|
|
|
private List<Deadline> deadlines = new ArrayList<>();
|
|
|
|
private List<Deadline> deadlines = new ArrayList<>();
|
|
|
|
private List<Integer> removedDeadlineIds = new ArrayList<>();
|
|
|
|
private List<Integer> removedDeadlineIds = new ArrayList<>();
|
|
|
|
private Set<Integer> userIds = new HashSet<>();
|
|
|
|
private List<Integer> userIds = new ArrayList<>();
|
|
|
|
private List<Integer> paperIds = new ArrayList<>();
|
|
|
|
private List<Integer> paperIds = new ArrayList<>();
|
|
|
|
private List<Paper> papers = new ArrayList<>();
|
|
|
|
private List<Paper> papers = new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private List<Paper> notSelectedPapers = new ArrayList<>();
|
|
|
|
private List<Paper> notSelectedPapers = new ArrayList<>();
|
|
|
|
private Set<UserDto> users = new HashSet<>();
|
|
|
|
private List<ConferenceUser> users = new ArrayList<>();
|
|
|
|
private Integer filterUserId;
|
|
|
|
private boolean disabledTakePart = false;
|
|
|
|
|
|
|
|
|
|
|
|
public ConferenceDto() {
|
|
|
|
public ConferenceDto() {
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -59,11 +54,12 @@ public class ConferenceDto {
|
|
|
|
@JsonProperty("beginDate") Date beginDate,
|
|
|
|
@JsonProperty("beginDate") Date beginDate,
|
|
|
|
@JsonProperty("endDate") Date endDate,
|
|
|
|
@JsonProperty("endDate") Date endDate,
|
|
|
|
@JsonProperty("deadlines") List<Deadline> deadlines,
|
|
|
|
@JsonProperty("deadlines") List<Deadline> deadlines,
|
|
|
|
@JsonProperty("userIds") Set<Integer> userIds,
|
|
|
|
@JsonProperty("userIds") List<Integer> userIds,
|
|
|
|
@JsonProperty("paperIds") List<Integer> paperIds,
|
|
|
|
@JsonProperty("paperIds") List<Integer> paperIds,
|
|
|
|
@JsonProperty("users") Set<UserDto> users,
|
|
|
|
@JsonProperty("users") List<ConferenceUser> users,
|
|
|
|
@JsonProperty("papers") List<Paper> papers,
|
|
|
|
@JsonProperty("papers") List<Paper> papers,
|
|
|
|
@JsonProperty("notSelectedPapers") List<Paper> notSelectedPapers) {
|
|
|
|
@JsonProperty("notSelectedPapers") List<Paper> notSelectedPapers,
|
|
|
|
|
|
|
|
@JsonProperty("notSelectedPapers") Boolean disabledTakePart) {
|
|
|
|
this.id = id;
|
|
|
|
this.id = id;
|
|
|
|
this.title = title;
|
|
|
|
this.title = title;
|
|
|
|
this.description = description;
|
|
|
|
this.description = description;
|
|
|
@ -77,6 +73,7 @@ public class ConferenceDto {
|
|
|
|
this.users = users;
|
|
|
|
this.users = users;
|
|
|
|
this.papers = papers;
|
|
|
|
this.papers = papers;
|
|
|
|
this.notSelectedPapers = notSelectedPapers;
|
|
|
|
this.notSelectedPapers = notSelectedPapers;
|
|
|
|
|
|
|
|
this.disabledTakePart = disabledTakePart;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public ConferenceDto(Conference conference) {
|
|
|
|
public ConferenceDto(Conference conference) {
|
|
|
@ -90,9 +87,8 @@ public class ConferenceDto {
|
|
|
|
this.deadlines = conference.getDeadlines();
|
|
|
|
this.deadlines = conference.getDeadlines();
|
|
|
|
this.userIds = convert(conference.getUsers(), user -> user.getId());
|
|
|
|
this.userIds = convert(conference.getUsers(), user -> user.getId());
|
|
|
|
this.paperIds = convert(conference.getPapers(), paper -> paper.getId());
|
|
|
|
this.paperIds = convert(conference.getPapers(), paper -> paper.getId());
|
|
|
|
this.users = convert(conference.getUsers(), UserDto::new);
|
|
|
|
this.users = conference.getUsers();
|
|
|
|
this.papers = conference.getPapers();
|
|
|
|
this.papers = conference.getPapers();
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Integer getId() {
|
|
|
|
public Integer getId() {
|
|
|
@ -159,11 +155,11 @@ public class ConferenceDto {
|
|
|
|
this.deadlines = deadlines;
|
|
|
|
this.deadlines = deadlines;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Set<Integer> getUserIds() {
|
|
|
|
public List<Integer> getUserIds() {
|
|
|
|
return userIds;
|
|
|
|
return userIds;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public void setUserIds(Set<Integer> userIds) {
|
|
|
|
public void setUserIds(List<Integer> userIds) {
|
|
|
|
this.userIds = userIds;
|
|
|
|
this.userIds = userIds;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -183,20 +179,20 @@ public class ConferenceDto {
|
|
|
|
this.papers = papers;
|
|
|
|
this.papers = papers;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Set<UserDto> getUsers() {
|
|
|
|
public List<ConferenceUser> getUsers() {
|
|
|
|
return users;
|
|
|
|
return users;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public void setUsers(Set<UserDto> users) {
|
|
|
|
public void setUsers(List<ConferenceUser> users) {
|
|
|
|
this.users = users;
|
|
|
|
this.users = users;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Integer getFilterUserId() {
|
|
|
|
public boolean isDisabledTakePart() {
|
|
|
|
return filterUserId;
|
|
|
|
return disabledTakePart;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public void setFilterUserId(Integer filterUserId) {
|
|
|
|
public void setDisabledTakePart(boolean disabledTakePart) {
|
|
|
|
this.filterUserId = filterUserId;
|
|
|
|
this.disabledTakePart = disabledTakePart;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public List<Integer> getRemovedDeadlineIds() {
|
|
|
|
public List<Integer> getRemovedDeadlineIds() {
|
|
|
|