diff --git a/src/main/java/com/example/demo/domain/BaseLevel.java b/src/main/java/com/example/demo/domain/BaseLevel.java index 6062cfb95047ea71e83c9f218212527f0ea474bb..32345b4624fc3ce2ad8df394443f74ddde2f19f3 100644 --- a/src/main/java/com/example/demo/domain/BaseLevel.java +++ b/src/main/java/com/example/demo/domain/BaseLevel.java @@ -24,6 +24,8 @@ public abstract class BaseLevel { private String title; private String estimatedDuration; private Long maxScore; + private Integer maxCommands; + private Integer maxWrongFlags; @Column(name = "order_in_training_definition", nullable = false) private Integer order; @@ -89,9 +91,33 @@ public abstract class BaseLevel { this.trainingDefinitionId = trainingDefinition; } + public Integer getMaxCommands() { + return maxCommands; + } + + public void setMaxCommands(Integer maxCommands) { + this.maxCommands = maxCommands; + } + + public Integer getMaxWrongFlags() { + return maxWrongFlags; + } + + public void setMaxWrongFlags(Integer maxWrongFlags) { + this.maxWrongFlags = maxWrongFlags; + } + @Override public String toString() { - return "BaseLevel{" + "title='" + title + '\'' + ", estimatedDuration='" + estimatedDuration + '\'' + - ", maxScore=" + maxScore + '}'; + return "BaseLevel{" + + "id=" + id + + ", title='" + title + '\'' + + ", estimatedDuration='" + estimatedDuration + '\'' + + ", maxScore=" + maxScore + + ", maxCommands=" + maxCommands + + ", maxWrongFlags=" + maxWrongFlags + + ", order=" + order + + ", trainingDefinitionId=" + trainingDefinitionId + + '}'; } } diff --git a/src/main/java/com/example/demo/dto/BaseLevelDto.java b/src/main/java/com/example/demo/dto/BaseLevelDto.java index d53d125c4adb89070792e186233212c7b83479ab..c0a6762bcf416d88aa4d6ee2095914db712cb7a6 100644 --- a/src/main/java/com/example/demo/dto/BaseLevelDto.java +++ b/src/main/java/com/example/demo/dto/BaseLevelDto.java @@ -12,6 +12,8 @@ public abstract class BaseLevelDto implements Serializable { private String estimatedDuration; private Long maxScore; private LevelType type; + private Integer maxCommands; + private Integer maxWrongFlags; public Long getId() { return id; @@ -61,6 +63,22 @@ public abstract class BaseLevelDto implements Serializable { this.type = type; } + public Integer getMaxCommands() { + return maxCommands; + } + + public void setMaxCommands(Integer maxCommands) { + this.maxCommands = maxCommands; + } + + public Integer getMaxWrongFlags() { + return maxWrongFlags; + } + + public void setMaxWrongFlags(Integer maxWrongFlags) { + this.maxWrongFlags = maxWrongFlags; + } + @Override public String toString() { return "BaseLevelDto{" + "id=" + id + ", title='" + title + '\'' + ", order=" + order +