|
|
@ -52,11 +52,9 @@ public class ConferenceController {
|
|
|
|
@PostMapping(value = "/conference", params = "save")
|
|
|
|
@PostMapping(value = "/conference", params = "save")
|
|
|
|
public String save(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
|
|
|
|
public String save(@Valid ConferenceDto conferenceDto, Errors errors) throws IOException {
|
|
|
|
filterEmptyDeadlines(conferenceDto);
|
|
|
|
filterEmptyDeadlines(conferenceDto);
|
|
|
|
if (conferenceDto.getDeadlines().isEmpty()) {
|
|
|
|
if (errors.hasErrors()) {
|
|
|
|
errors.rejectValue("deadlines", "errorCode", "Не может быть пустым");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (errors.hasErrors())
|
|
|
|
|
|
|
|
return CONFERENCE_PAGE;
|
|
|
|
return CONFERENCE_PAGE;
|
|
|
|
|
|
|
|
}
|
|
|
|
conferenceService.save(conferenceDto);
|
|
|
|
conferenceService.save(conferenceDto);
|
|
|
|
return String.format(REDIRECT_TO, CONFERENCES_PAGE);
|
|
|
|
return String.format(REDIRECT_TO, CONFERENCES_PAGE);
|
|
|
|
|
|
|
|
|
|
|
@ -65,12 +63,23 @@ public class ConferenceController {
|
|
|
|
@PostMapping(value = "/conference", params = "addDeadline")
|
|
|
|
@PostMapping(value = "/conference", params = "addDeadline")
|
|
|
|
public String addDeadline(@Valid ConferenceDto conferenceDto, Errors errors) {
|
|
|
|
public String addDeadline(@Valid ConferenceDto conferenceDto, Errors errors) {
|
|
|
|
filterEmptyDeadlines(conferenceDto);
|
|
|
|
filterEmptyDeadlines(conferenceDto);
|
|
|
|
if (errors.hasErrors())
|
|
|
|
if (errors.hasErrors()) {
|
|
|
|
return CONFERENCE_PAGE;
|
|
|
|
return CONFERENCE_PAGE;
|
|
|
|
|
|
|
|
}
|
|
|
|
conferenceDto.getDeadlines().add(new Deadline());
|
|
|
|
conferenceDto.getDeadlines().add(new Deadline());
|
|
|
|
return CONFERENCE_PAGE;
|
|
|
|
return CONFERENCE_PAGE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@PostMapping(value = "/conference", params = "removeDeadline")
|
|
|
|
|
|
|
|
public String removeDeadline(@Valid ConferenceDto conferenceDto, Errors errors,
|
|
|
|
|
|
|
|
@RequestParam(value = "removeDeadline") Integer deadlineIndex) throws IOException {
|
|
|
|
|
|
|
|
if (errors.hasErrors()) {
|
|
|
|
|
|
|
|
return CONFERENCE_PAGE;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
conferenceService.removeDeadline(conferenceDto, deadlineIndex);
|
|
|
|
|
|
|
|
return CONFERENCE_PAGE;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void filterEmptyDeadlines(ConferenceDto conferenceDto) {
|
|
|
|
private void filterEmptyDeadlines(ConferenceDto conferenceDto) {
|
|
|
|
conferenceDto.setDeadlines(conferenceDto.getDeadlines().stream()
|
|
|
|
conferenceDto.setDeadlines(conferenceDto.getDeadlines().stream()
|
|
|
|
.filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
|
|
|
|
.filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
|
|
|
|