From 4898568dede2369cf17f5347fc0147278552d0b0 Mon Sep 17 00:00:00 2001
From: Jan Tymel <410388@mail.muni.cz>
Date: Wed, 20 Jan 2021 20:00:20 +0100
Subject: [PATCH] Remove solutionPenalized attribute from tasks

Resolves #7
---
 src/main/java/com/example/demo/domain/Task.java   | 15 +++------------
 src/main/java/com/example/demo/dto/TaskDto.java   | 10 ----------
 .../java/com/example/demo/dto/TaskUpdateDto.java  | 13 -------------
 .../demo/dto/input/GameDefinitionCreateDto.java   |  9 ---------
 4 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/Task.java b/src/main/java/com/example/demo/domain/Task.java
index 51eb51be..ee2576a1 100644
--- a/src/main/java/com/example/demo/domain/Task.java
+++ b/src/main/java/com/example/demo/domain/Task.java
@@ -12,7 +12,6 @@ import java.util.List;
 public class Task extends BaseLevel {
 
     private String content;
-    private boolean solutionPenalized;
     private String flag;
     private String solution;
     private Long incorrectFlagLimit;
@@ -29,14 +28,6 @@ public class Task extends BaseLevel {
         this.content = content;
     }
 
-    public boolean getSolutionPenalized() {
-        return solutionPenalized;
-    }
-
-    public void setSolutionPenalized(boolean solutionPenalized) {
-        this.solutionPenalized = solutionPenalized;
-    }
-
     public String getFlag() {
         return flag;
     }
@@ -71,8 +62,8 @@ public class Task extends BaseLevel {
 
     @Override
     public String toString() {
-        return "Task{" + "content='" + content + '\'' + ", solutionPenalized=" + solutionPenalized + ", flag='" +
-               flag + '\'' + ", solution='" + solution + '\'' + ", incorrectFlagLimit=" + incorrectFlagLimit +
-               ", attachments=" + attachments + "} " + super.toString();
+        return "Task{" + "content='" + content + '\'' + ", flag='" +
+                flag + '\'' + ", solution='" + solution + '\'' + ", incorrectFlagLimit=" + incorrectFlagLimit +
+                ", attachments=" + attachments + "} " + super.toString();
     }
 }
diff --git a/src/main/java/com/example/demo/dto/TaskDto.java b/src/main/java/com/example/demo/dto/TaskDto.java
index 694ccf5e..b32112f3 100644
--- a/src/main/java/com/example/demo/dto/TaskDto.java
+++ b/src/main/java/com/example/demo/dto/TaskDto.java
@@ -6,7 +6,6 @@ import java.util.List;
 public class TaskDto extends BaseLevelDto implements Serializable {
 
     private String content;
-    private boolean solutionPenalized;
     private String flag;
     private String solution;
     private Long incorrectFlagLimit;
@@ -22,14 +21,6 @@ public class TaskDto extends BaseLevelDto implements Serializable {
         this.content = content;
     }
 
-    public boolean isSolutionPenalized() {
-        return solutionPenalized;
-    }
-
-    public void setSolutionPenalized(boolean solutionPenalized) {
-        this.solutionPenalized = solutionPenalized;
-    }
-
     public String getFlag() {
         return flag;
     }
@@ -66,7 +57,6 @@ public class TaskDto extends BaseLevelDto implements Serializable {
     public String toString() {
         return "TaskDto{" +
                 "content='" + content + '\'' +
-                ", solutionPenalized=" + solutionPenalized +
                 ", flag='" + flag + '\'' +
                 ", solution='" + solution + '\'' +
                 ", incorrectFlagLimit='" + incorrectFlagLimit + '\'' +
diff --git a/src/main/java/com/example/demo/dto/TaskUpdateDto.java b/src/main/java/com/example/demo/dto/TaskUpdateDto.java
index 9cb4ebe3..325cd77e 100644
--- a/src/main/java/com/example/demo/dto/TaskUpdateDto.java
+++ b/src/main/java/com/example/demo/dto/TaskUpdateDto.java
@@ -7,7 +7,6 @@ public class TaskUpdateDto {
     private Long id;
     private String title;
     private String content;
-    private boolean solutionPenalized;
     private String flag;
     private String solution;
     private Long incorrectFlagLimit;
@@ -30,9 +29,6 @@ public class TaskUpdateDto {
         this.title = title;
     }
 
-    public boolean isSolutionPenalized() {
-        return solutionPenalized;
-    }
 
     public String getContent() {
         return content;
@@ -42,14 +38,6 @@ public class TaskUpdateDto {
         this.content = content;
     }
 
-    public boolean getSolutionPenalized() {
-        return solutionPenalized;
-    }
-
-    public void setSolutionPenalized(boolean solutionPenalized) {
-        this.solutionPenalized = solutionPenalized;
-    }
-
     public String getFlag() {
         return flag;
     }
@@ -88,7 +76,6 @@ public class TaskUpdateDto {
                 "id=" + id +
                 ", title='" + title + '\'' +
                 ", content='" + content + '\'' +
-                ", solutionPenalized=" + solutionPenalized +
                 ", flag='" + flag + '\'' +
                 ", solution='" + solution + '\'' +
                 ", incorrectFlagLimit=" + incorrectFlagLimit +
diff --git a/src/main/java/com/example/demo/dto/input/GameDefinitionCreateDto.java b/src/main/java/com/example/demo/dto/input/GameDefinitionCreateDto.java
index 4a230bc1..f8d2bde9 100644
--- a/src/main/java/com/example/demo/dto/input/GameDefinitionCreateDto.java
+++ b/src/main/java/com/example/demo/dto/input/GameDefinitionCreateDto.java
@@ -17,7 +17,6 @@ public class GameDefinitionCreateDto {
 
     // game level fields
     private String content;
-    private boolean solutionPenalized;
     private String flag;
     private String solution;
     private Long incorrectFlagLimit;
@@ -78,14 +77,6 @@ public class GameDefinitionCreateDto {
         this.content = content;
     }
 
-    public boolean isSolutionPenalized() {
-        return solutionPenalized;
-    }
-
-    public void setSolutionPenalized(boolean solutionPenalized) {
-        this.solutionPenalized = solutionPenalized;
-    }
-
     public String getFlag() {
         return flag;
     }
-- 
GitLab