diff --git a/src/main/java/com/example/demo/domain/GameLevel.java b/src/main/java/com/example/demo/domain/GameLevel.java
index 4edf0956a3d1511657bcc359f6eda581fe0b70fd..63d4f0bd229966b64a56eeaf76fb800ad4d55d8d 100644
--- a/src/main/java/com/example/demo/domain/GameLevel.java
+++ b/src/main/java/com/example/demo/domain/GameLevel.java
@@ -23,10 +23,6 @@ public class GameLevel extends BaseLevel {
@OneToMany(mappedBy = "gameLevel", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
private List<Attachment> attachments;
- @OrderBy
- @OneToMany(mappedBy = "gameLevel", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
- private List<Hint> hints;
-
public String getContent() {
return content;
}
@@ -75,21 +71,10 @@ public class GameLevel extends BaseLevel {
this.incorrectFlagLimit = incorrectFlagLimit;
}
- public List<Hint> getHints() {
- if (Objects.isNull(hints)) {
- hints = new ArrayList<>();
- }
- return hints;
- }
-
- public void setHints(List<Hint> hints) {
- this.hints = hints;
- }
-
@Override
public String toString() {
- return "GameLevel{" + ", content='" + content + '\'' + ", solutionPenalized='" + solutionPenalized + '\'' +
- ", flag='" + flag + '\'' + ", solution='" + solution + '\'' + ", attachments='" + attachments + '\'' +
- ", incorrectFlagLimit='" + incorrectFlagLimit + '\'' + ", hints=" + hints + "} " + super.toString();
+ return "GameLevel{" + "content='" + content + '\'' + ", solutionPenalized=" + solutionPenalized + ", flag='" +
+ flag + '\'' + ", solution='" + solution + '\'' + ", incorrectFlagLimit=" + incorrectFlagLimit +
+ ", attachments=" + attachments + "} " + super.toString();
}
}
diff --git a/src/main/java/com/example/demo/domain/Hint.java b/src/main/java/com/example/demo/domain/Hint.java
deleted file mode 100644
index 40217ed6c3a9705e889f9b084790b1947ec04398..0000000000000000000000000000000000000000
--- a/src/main/java/com/example/demo/domain/Hint.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.example.demo.domain;
-
-
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-
-@Entity
-public class Hint {
-
- @Id
- @GeneratedValue
- private Long id;
-
- private String title;
- private String content;
- private Long hintPenalty;
- private Long orderInLevel;
-
- @ManyToOne(fetch = FetchType.LAZY)
- private GameLevel gameLevel;
-
- 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 String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Long getHintPenalty() {
- return hintPenalty;
- }
-
- public void setHintPenalty(Long hintPenalty) {
- this.hintPenalty = hintPenalty;
- }
-
- public Long getOrderInLevel() {
- return orderInLevel;
- }
-
- public void setOrderInLevel(Long orderInLevel) {
- this.orderInLevel = orderInLevel;
- }
-
- public GameLevel getGameLevel() {
- return gameLevel;
- }
-
- public void setGameLevel(GameLevel gameLevel) {
- this.gameLevel = gameLevel;
- }
-
- @Override
- public String toString() {
- return "Hint{" +
- "id=" + id +
- ", title='" + title + '\'' +
- ", content='" + content + '\'' +
- ", hintPenalty='" + hintPenalty + '\'' +
- ", orderInLevel='" + orderInLevel + '\'' +
- '}';
- }
-}
diff --git a/src/main/java/com/example/demo/dto/GameLevelUpdateDto.java b/src/main/java/com/example/demo/dto/GameLevelUpdateDto.java
index 464b6b075d1b9b8fc0aee9612c35aa298abeea92..41d011514a5cad542e0f34508e797bc43e12dbf7 100644
--- a/src/main/java/com/example/demo/dto/GameLevelUpdateDto.java
+++ b/src/main/java/com/example/demo/dto/GameLevelUpdateDto.java
@@ -13,7 +13,6 @@ public class GameLevelUpdateDto extends BaseLevelDto {
private Long incorrectFlagLimit;
private List<AttachmentDto> attachments;
- private List<HintDto> hints;
public String getContent() {
return content;
@@ -63,17 +62,6 @@ public class GameLevelUpdateDto extends BaseLevelDto {
this.incorrectFlagLimit = incorrectFlagLimit;
}
- public List<HintDto> getHints() {
- if (Objects.isNull(hints)) {
- hints = new ArrayList<>();
- }
- return hints;
- }
-
- public void setHints(List<HintDto> hints) {
- this.hints = hints;
- }
-
@Override
public String toString() {
return "GameLevelDto{" +
@@ -83,7 +71,6 @@ public class GameLevelUpdateDto extends BaseLevelDto {
", solution='" + solution + '\'' +
", attachments='" + attachments + '\'' +
", incorrectFlagLimit='" + incorrectFlagLimit + '\'' +
- ", hints=" + hints +
"} " + super.toString();
}
}
diff --git a/src/main/java/com/example/demo/dto/HintDto.java b/src/main/java/com/example/demo/dto/HintDto.java
deleted file mode 100644
index 4893075ed9d831e6177216653a73299c8c07d4b2..0000000000000000000000000000000000000000
--- a/src/main/java/com/example/demo/dto/HintDto.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.example.demo.dto;
-
-import java.io.Serializable;
-
-public class HintDto implements Serializable {
-
- private Long id;
-
- private String title;
- private String content;
- private Long hintPenalty;
- private Long orderInLevel;
-
- 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 String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public Long getHintPenalty() {
- return hintPenalty;
- }
-
- public void setHintPenalty(Long hintPenalty) {
- this.hintPenalty = hintPenalty;
- }
-
- public Long getOrderInLevel() {
- return orderInLevel;
- }
-
- public void setOrderInLevel(Long orderInLevel) {
- this.orderInLevel = orderInLevel;
- }
-
- @Override
- public String toString() {
- return "HintDto{" +
- "id=" + id +
- ", title='" + title + '\'' +
- ", content='" + content + '\'' +
- ", hintPenalty='" + hintPenalty + '\'' +
- ", orderInLevel='" + orderInLevel + '\'' +
- '}';
- }
-}
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 be11e9d44bb6c59135916c2f88ab6b5cc403a2dc..9b7a2760f010366de9ae366099b8a193f2e943d4 100644
--- a/src/main/java/com/example/demo/dto/input/GameDefinitionCreateDto.java
+++ b/src/main/java/com/example/demo/dto/input/GameDefinitionCreateDto.java
@@ -1,7 +1,6 @@
package com.example.demo.dto.input;
import com.example.demo.dto.AttachmentDto;
-import com.example.demo.dto.HintDto;
import java.util.List;
@@ -22,7 +21,6 @@ public class GameDefinitionCreateDto {
private Long incorrectFlagLimit;
private List<AttachmentDto> attachments;
- private List<HintDto> hints;
// info level fields
// currently none special
@@ -118,14 +116,6 @@ public class GameDefinitionCreateDto {
this.attachments = attachments;
}
- public List<HintDto> getHints() {
- return hints;
- }
-
- public void setHints(List<HintDto> hints) {
- this.hints = hints;
- }
-
public List<GameDefinitionCreateDto> getSubLevels() {
return subLevels;
}
diff --git a/src/main/java/com/example/demo/mapper/BeanMapper.java b/src/main/java/com/example/demo/mapper/BeanMapper.java
index 252062f59fca2169d5e8b943be4f688f9ac089ba..92a97f049fd95b45234975d3ff9590813d79a46f 100644
--- a/src/main/java/com/example/demo/mapper/BeanMapper.java
+++ b/src/main/java/com/example/demo/mapper/BeanMapper.java
@@ -2,9 +2,7 @@ package com.example.demo.mapper;
import com.example.demo.domain.AssessmentLevel;
import com.example.demo.domain.Attachment;
-import com.example.demo.domain.BaseLevel;
import com.example.demo.domain.GameLevel;
-import com.example.demo.domain.Hint;
import com.example.demo.domain.InfoLevel;
import com.example.demo.domain.TrainingDefinition;
import com.example.demo.domain.UnityLevel;
@@ -13,7 +11,6 @@ import com.example.demo.dto.AttachmentDto;
import com.example.demo.dto.GameLevelCreateDto;
import com.example.demo.dto.GameLevelDto;
import com.example.demo.dto.GameLevelUpdateDto;
-import com.example.demo.dto.HintDto;
import com.example.demo.dto.InfoLevelCreateDto;
import com.example.demo.dto.InfoLevelDto;
import com.example.demo.dto.InfoLevelUpdateDto;
@@ -60,13 +57,9 @@ public interface BeanMapper {
@Mapping(target = "orderInTrainingDefinition", source = "order")
InfoLevel toEntity(InfoLevelUpdateDto gameLevel);
- HintDto toDto(Hint hint);
+ AttachmentDto toDto(Attachment attachment);
- Hint toEntity(HintDto hint);
-
- AttachmentDto toDto(Attachment hint);
-
- Attachment toEntity(AttachmentDto hint);
+ Attachment toEntity(AttachmentDto attachment);
UnityLevelDto toDto(UnityLevel unityLevel);
@@ -97,7 +90,6 @@ public interface BeanMapper {
@Mapping(target = "trainingDefinition", ignore = true)
@Mapping(target = "unityLevel", ignore = true)
@Mapping(target = "attachments", ignore = true) // TODO not really sure about this
- @Mapping(target = "hints", ignore = true) // TODO not really sure about this
GameLevel updateGameLevel(@MappingTarget GameLevel gameLevel, GameDefinitionCreateDto gameDefinitionCreateDto);
@Mapping(target = "orderInTrainingDefinition", source = "order")