From eb6dd97c7b08c7c335080b4f0764689c2855b09d Mon Sep 17 00:00:00 2001 From: Jan Tymel <410388@mail.muni.cz> Date: Wed, 20 Jan 2021 07:24:16 +0100 Subject: [PATCH] TaskUpdateDto is no longer a subclass of BaseLevelDto Resolves #6 --- .../java/com/example/demo/dto/TaskDto.java | 68 ++++++++++++++++--- .../com/example/demo/dto/TaskUpdateDto.java | 40 ++++++++--- .../com/example/demo/service/TaskService.java | 1 + 3 files changed, 93 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/example/demo/dto/TaskDto.java b/src/main/java/com/example/demo/dto/TaskDto.java index ceae0ffe..694ccf5e 100644 --- a/src/main/java/com/example/demo/dto/TaskDto.java +++ b/src/main/java/com/example/demo/dto/TaskDto.java @@ -1,24 +1,76 @@ package com.example.demo.dto; import java.io.Serializable; +import java.util.List; -public class TaskDto extends TaskUpdateDto implements Serializable { +public class TaskDto extends BaseLevelDto implements Serializable { - private Long id; + private String content; + private boolean solutionPenalized; + private String flag; + private String solution; + private Long incorrectFlagLimit; - public Long getId() { - return id; + private List<AttachmentDto> attachments; + + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public boolean isSolutionPenalized() { + return solutionPenalized; } - public void setId(Long id) { - this.id = id; + public void setSolutionPenalized(boolean solutionPenalized) { + this.solutionPenalized = solutionPenalized; } + public String getFlag() { + return flag; + } + + public void setFlag(String flag) { + this.flag = flag; + } + + public String getSolution() { + return solution; + } + + public void setSolution(String solution) { + this.solution = solution; + } + + public List<AttachmentDto> getAttachments() { + return attachments; + } + + public void setAttachments(List<AttachmentDto> attachments) { + this.attachments = attachments; + } + + public Long getIncorrectFlagLimit() { + return incorrectFlagLimit; + } + + public void setIncorrectFlagLimit(Long incorrectFlagLimit) { + this.incorrectFlagLimit = incorrectFlagLimit; + } @Override public String toString() { return "TaskDto{" + - "id=" + id + - "} " + super.toString(); + "content='" + content + '\'' + + ", solutionPenalized=" + solutionPenalized + + ", flag='" + flag + '\'' + + ", solution='" + solution + '\'' + + ", incorrectFlagLimit='" + incorrectFlagLimit + '\'' + + ", attachments=" + attachments + + "} " + super.toString(); } } diff --git a/src/main/java/com/example/demo/dto/TaskUpdateDto.java b/src/main/java/com/example/demo/dto/TaskUpdateDto.java index 060248e4..9cb4ebe3 100644 --- a/src/main/java/com/example/demo/dto/TaskUpdateDto.java +++ b/src/main/java/com/example/demo/dto/TaskUpdateDto.java @@ -2,8 +2,10 @@ package com.example.demo.dto; import java.util.List; -public class TaskUpdateDto extends BaseLevelDto { +public class TaskUpdateDto { + private Long id; + private String title; private String content; private boolean solutionPenalized; private String flag; @@ -12,6 +14,26 @@ public class TaskUpdateDto extends BaseLevelDto { private List<AttachmentDto> attachments; + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public boolean isSolutionPenalized() { + return solutionPenalized; + } + public String getContent() { return content; } @@ -63,12 +85,14 @@ public class TaskUpdateDto extends BaseLevelDto { @Override public String toString() { return "TaskUpdateDto{" + - "content='" + content + '\'' + - ", solutionPenalized='" + solutionPenalized + '\'' + - ", flag='" + flag + '\'' + - ", solution='" + solution + '\'' + - ", attachments='" + attachments + '\'' + - ", incorrectFlagLimit='" + incorrectFlagLimit + '\'' + - "} " + super.toString(); + "id=" + id + + ", title='" + title + '\'' + + ", content='" + content + '\'' + + ", solutionPenalized=" + solutionPenalized + + ", flag='" + flag + '\'' + + ", solution='" + solution + '\'' + + ", incorrectFlagLimit=" + incorrectFlagLimit + + ", attachments=" + attachments + + '}'; } } diff --git a/src/main/java/com/example/demo/service/TaskService.java b/src/main/java/com/example/demo/service/TaskService.java index 73175269..e083f535 100644 --- a/src/main/java/com/example/demo/service/TaskService.java +++ b/src/main/java/com/example/demo/service/TaskService.java @@ -94,6 +94,7 @@ public class TaskService { taskUpdate.setPhaseLevel(persistedTask.get().getPhaseLevel()); taskUpdate.setTrainingDefinitionId(persistedTask.get().getTrainingDefinitionId()); + taskUpdate.setOrder(persistedTask.get().getOrder()); Task savedEntity = taskRepository.save(taskUpdate); -- GitLab