From 99f453908549f28fe739fb19ee1de9b596743f3b Mon Sep 17 00:00:00 2001
From: Jan Tymel <410388@mail.muni.cz>
Date: Sat, 6 Feb 2021 10:39:24 +0100
Subject: [PATCH] Add default values of attributes to a newly created Task
Related to #5
---
src/main/java/com/example/demo/domain/Task.java | 6 +++---
src/main/java/com/example/demo/dto/PhaseCreateDTO.java | 2 +-
src/main/java/com/example/demo/dto/TaskDto.java | 6 +++---
src/main/java/com/example/demo/service/TaskService.java | 5 ++++-
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/example/demo/domain/Task.java b/src/main/java/com/example/demo/domain/Task.java
index 6f132fd3..23bf2d22 100644
--- a/src/main/java/com/example/demo/domain/Task.java
+++ b/src/main/java/com/example/demo/domain/Task.java
@@ -19,7 +19,7 @@ public class Task {
private String content;
private String flag;
private String solution;
- private Long incorrectFlagLimit;
+ private int incorrectFlagLimit;
@Column(name = "order_in_training_phase", nullable = false)
private Integer order;
@@ -75,11 +75,11 @@ public class Task {
this.solution = solution;
}
- public Long getIncorrectFlagLimit() {
+ public int getIncorrectFlagLimit() {
return incorrectFlagLimit;
}
- public void setIncorrectFlagLimit(Long incorrectFlagLimit) {
+ public void setIncorrectFlagLimit(int incorrectFlagLimit) {
this.incorrectFlagLimit = incorrectFlagLimit;
}
diff --git a/src/main/java/com/example/demo/dto/PhaseCreateDTO.java b/src/main/java/com/example/demo/dto/PhaseCreateDTO.java
index 7c4b286e..13330b24 100644
--- a/src/main/java/com/example/demo/dto/PhaseCreateDTO.java
+++ b/src/main/java/com/example/demo/dto/PhaseCreateDTO.java
@@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;
public class PhaseCreateDTO {
- @ApiModelProperty(value = "Type of phase.", required = true, allowableValues = "QUESTIONNAIRE, INFO, GAME", example = "GAME")
+ @ApiModelProperty(value = "Type of phase.", required = true, allowableValues = "QUESTIONNAIRE_ADAPTIVE, QUESTIONNAIRE_GENERAL, INFO, GAME", example = "TRAINING")
@NotNull(message = "Phase type must be specified")
private PhaseType phaseType;
diff --git a/src/main/java/com/example/demo/dto/TaskDto.java b/src/main/java/com/example/demo/dto/TaskDto.java
index 4277d4f3..863bdf30 100644
--- a/src/main/java/com/example/demo/dto/TaskDto.java
+++ b/src/main/java/com/example/demo/dto/TaskDto.java
@@ -10,7 +10,7 @@ public class TaskDto implements Serializable {
private String content;
private String flag;
private String solution;
- private Long incorrectFlagLimit;
+ private int incorrectFlagLimit;
public Long getId() {
return id;
@@ -60,11 +60,11 @@ public class TaskDto implements Serializable {
this.solution = solution;
}
- public Long getIncorrectFlagLimit() {
+ public int getIncorrectFlagLimit() {
return incorrectFlagLimit;
}
- public void setIncorrectFlagLimit(Long incorrectFlagLimit) {
+ public void setIncorrectFlagLimit(int incorrectFlagLimit) {
this.incorrectFlagLimit = incorrectFlagLimit;
}
diff --git a/src/main/java/com/example/demo/service/TaskService.java b/src/main/java/com/example/demo/service/TaskService.java
index 2d87bcb8..63c34c5e 100644
--- a/src/main/java/com/example/demo/service/TaskService.java
+++ b/src/main/java/com/example/demo/service/TaskService.java
@@ -41,9 +41,12 @@ public class TaskService {
// TODO add check to trainingDefinitionId (field structure will be probably changed)
Task task = new Task();
- task.setTitle("Title of task");
+ task.setTitle("Title of a new task");
task.setTrainingPhase(trainingPhase);
task.setOrder(taskRepository.getCurrentMaxOrder(phaseId) + 1);
+ task.setFlag("Secret flag");
+ task.setContent("Task content ...");
+ task.setSolution("Task solution ...");
Task persistedEntity = taskRepository.save(task);
--
GitLab