|
|
@ -1,20 +1,14 @@
|
|
|
|
package ru.ulstu.paper.model;
|
|
|
|
package ru.ulstu.paper.model;
|
|
|
|
|
|
|
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonCreator;
|
|
|
|
import com.fasterxml.jackson.annotation.JsonCreator;
|
|
|
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
|
|
|
import org.hibernate.validator.constraints.NotEmpty;
|
|
|
|
import org.hibernate.validator.constraints.NotEmpty;
|
|
|
|
import org.springframework.format.annotation.DateTimeFormat;
|
|
|
|
|
|
|
|
import ru.ulstu.deadline.model.DeadlineDto;
|
|
|
|
import ru.ulstu.deadline.model.DeadlineDto;
|
|
|
|
import ru.ulstu.deadline.model.DeadlineDto;
|
|
|
|
|
|
|
|
import ru.ulstu.user.model.UserDto;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import javax.validation.constraints.Future;
|
|
|
|
|
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
|
|
|
|
|
import javax.validation.constraints.Size;
|
|
|
|
import javax.validation.constraints.Size;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
import java.util.Set;
|
|
|
|
import java.util.Set;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import static ru.ulstu.core.util.StreamApiUtils.convert;
|
|
|
|
import static ru.ulstu.core.util.StreamApiUtils.convert;
|
|
|
|
|
|
|
|
|
|
|
@ -26,7 +20,7 @@ public class PaperDto {
|
|
|
|
private Paper.PaperStatus status;
|
|
|
|
private Paper.PaperStatus status;
|
|
|
|
private Date createDate;
|
|
|
|
private Date createDate;
|
|
|
|
private Date updateDate;
|
|
|
|
private Date updateDate;
|
|
|
|
private final List<DeadlineDto> deadlines;
|
|
|
|
private List<DeadlineDto> deadlines;
|
|
|
|
private String comment;
|
|
|
|
private String comment;
|
|
|
|
private Boolean locked;
|
|
|
|
private Boolean locked;
|
|
|
|
private String tmpFileName;
|
|
|
|
private String tmpFileName;
|
|
|
@ -35,6 +29,10 @@ public class PaperDto {
|
|
|
|
private Date fileCreateDate;
|
|
|
|
private Date fileCreateDate;
|
|
|
|
private Set<Integer> authors;
|
|
|
|
private Set<Integer> authors;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public PaperDto() {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@JsonCreator
|
|
|
|
@JsonCreator
|
|
|
|
public PaperDto(@JsonProperty("id") Integer id,
|
|
|
|
public PaperDto(@JsonProperty("id") Integer id,
|
|
|
|
@JsonProperty("title") String title,
|
|
|
|
@JsonProperty("title") String title,
|
|
|
|