final version for school

Author: Hattinger04

src/main/java/io/github/Hattinger04/course/model/exercise/Exercise.java

@@ -44,8 +44,8 @@ public Exercise(Course course, String name) {
 	@Column(name = "name", unique = true, nullable = false)
 	private String name;
 
-	@Column(name = "text", unique = false, nullable = true)
-	private String text; 
+	@Column(name = "hamster", unique = false, nullable = false)
+	private String hamster; 
 
 	@ManyToOne
 	@JoinColumn(name="course_id", nullable = false)

src/main/java/io/github/Hattinger04/course/model/solution/Solution.java

@@ -31,17 +31,17 @@
 @JsonTypeName("solution") 
 public class Solution {
 
-	public Solution(Exercise exercise, String text) {
+	public Solution(Exercise exercise, String hamster) {
 		this.exercise = exercise; 
-		this.text = text; 
+		this.hamster = hamster; 
 	}
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "solution_id")
 	private Integer id;
 
-	@Column(name = "text", unique = false, nullable = true)	
-	private String text; 
+	@Column(name = "hamster", unique = false, nullable = false)	
+	private String hamster; 
 
 	@ManyToOne
 	@JoinColumn(name="exercise_id", nullable = false)

src/main/java/io/github/Hattinger04/hamster/model/Hamster.java

@@ -2,6 +2,11 @@
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -13,8 +18,15 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-@ToString
+@ToString@JsonTypeInfo(include=As.WRAPPER_OBJECT, use=com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, property="type")
+@JsonTypeName("hamster") 
 public class Hamster {
+	
+	public Hamster(String program, String programName) {
+		this.program = program; 
+		this.programName = programName; 
+	}
+	
 	@Id
 	private Integer hamster_id;
 	private String programName; 

src/main/resources/allLogs.log

@@ -354,3 +354,13 @@ Sep. 03, 2022 11:39:22 AM io.github.Hattinger04.aop.LogAspect loginLog
 FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
 Sep. 03, 2022 11:39:57 AM io.github.Hattinger04.aop.LogAspect loginLog
 FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Okt. 17, 2022 3:15:32 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Okt. 17, 2022 3:15:41 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Okt. 17, 2022 3:16:15 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Okt. 17, 2022 3:22:04 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]
+Okt. 17, 2022 3:25:10 PM io.github.Hattinger04.aop.LogAspect loginLog
+FEIN: User(id=null, username=admin, password=admin, active=null, roles=null) - [logged in]