|
|
|
@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
|
|
|
|
import ru.ulstu.conference.model.ConferenceDto;
|
|
|
|
|
import ru.ulstu.conference.model.ConferenceFilterDto;
|
|
|
|
|
import ru.ulstu.conference.service.ConferenceService;
|
|
|
|
|
import ru.ulstu.deadline.model.Deadline;
|
|
|
|
|
import springfox.documentation.annotations.ApiIgnore;
|
|
|
|
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
@ -61,6 +62,14 @@ public class ConferenceController {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@PostMapping(value = "/conference", params = "addDeadline")
|
|
|
|
|
public String addDeadline(@Valid ConferenceDto conferenceDto, Errors errors) {
|
|
|
|
|
filterEmptyDeadlines(conferenceDto);
|
|
|
|
|
hasErrors(errors, CONFERENCE_PAGE);
|
|
|
|
|
conferenceDto.getDeadlines().add(new Deadline());
|
|
|
|
|
return CONFERENCE_PAGE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void filterEmptyDeadlines(ConferenceDto conferenceDto) {
|
|
|
|
|
conferenceDto.setDeadlines(conferenceDto.getDeadlines().stream()
|
|
|
|
|
.filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
|
|
|
|
|