diff options
3 files changed, 15 insertions, 51 deletions
diff --git a/src/main/java/com/stileeducation/markr/entity/Student.java b/src/main/java/com/stileeducation/markr/entity/Student.java index 30a4c2b..2c45448 100644 --- a/src/main/java/com/stileeducation/markr/entity/Student.java +++ b/src/main/java/com/stileeducation/markr/entity/Student.java @@ -2,9 +2,7 @@ package com.stileeducation.markr.entity; import jakarta.persistence.*; -import java.util.HashSet; import java.util.Objects; -import java.util.Set; @Entity @Table(name = "students") @@ -23,9 +21,6 @@ public class Student { @Column(name = "student_number", nullable = false, unique = true) private String studentNumber; - @OneToMany(mappedBy = "student", cascade = CascadeType.ALL, orphanRemoval = true) - private Set<TestResult> testResults = new HashSet<>(); - @Transient private boolean created = false; @@ -64,14 +59,6 @@ public class Student { this.studentNumber = studentNumber; } - public Set<TestResult> getTestResults() { - return testResults; - } - - public void setTestResults(Set<TestResult> testResults) { - this.testResults = testResults; - } - public boolean isCreated() { return created; } @@ -96,15 +83,12 @@ public class Student { return Objects.equals(id, student.id) && Objects.equals(firstName, student.firstName) && Objects.equals(lastName, student.lastName) && - Objects.equals(studentNumber, student.studentNumber) && - Objects.equals(testResults, student.testResults) && - Objects.equals(created, student.created) && - Objects.equals(updated, student.updated); + Objects.equals(studentNumber, student.studentNumber); } @Override public int hashCode() { - return Objects.hash(id, firstName, lastName, studentNumber, testResults); + return Objects.hash(id, firstName, lastName, studentNumber); } @Override @@ -114,7 +98,6 @@ public class Student { ", firstName='" + firstName + '\'' + ", lastName='" + lastName + '\'' + ", studentNumber='" + studentNumber + '\'' + - ", testResults=" + testResults + ", created=" + created + ", updated=" + updated + '}'; diff --git a/src/main/java/com/stileeducation/markr/entity/Test.java b/src/main/java/com/stileeducation/markr/entity/Test.java index ff9088e..e258e9a 100644 --- a/src/main/java/com/stileeducation/markr/entity/Test.java +++ b/src/main/java/com/stileeducation/markr/entity/Test.java @@ -2,9 +2,7 @@ package com.stileeducation.markr.entity; import jakarta.persistence.*; -import java.util.HashSet; import java.util.Objects; -import java.util.Set; @Entity @Table(name = "tests") @@ -20,9 +18,6 @@ public class Test { @Column(name = "marks_available", nullable = false) private Integer marksAvailable; - @OneToMany(mappedBy = "test", cascade = CascadeType.ALL, orphanRemoval = true) - private Set<TestResult> testResults = new HashSet<>(); - @Transient private boolean created = false; @@ -53,14 +48,6 @@ public class Test { this.marksAvailable = marksAvailable; } - public Set<TestResult> getTestResults() { - return testResults; - } - - public void setTestResults(Set<TestResult> testResults) { - this.testResults = testResults; - } - public boolean isCreated() { return created; } @@ -84,15 +71,12 @@ public class Test { Test test = (Test) o; return Objects.equals(id, test.id) && Objects.equals(testId, test.testId) && - Objects.equals(marksAvailable, test.marksAvailable) && - Objects.equals(testResults, test.testResults) && - Objects.equals(created, test.created) && - Objects.equals(updated, test.updated); + Objects.equals(marksAvailable, test.marksAvailable); } @Override public int hashCode() { - return Objects.hash(id, testId, marksAvailable, testResults); + return Objects.hash(id, testId, marksAvailable); } @Override @@ -101,7 +85,6 @@ public class Test { "id=" + id + ", testId='" + testId + '\'' + ", marksAvailable=" + marksAvailable + - ", testResults=" + testResults + ", created=" + created + ", updated=" + updated + '}'; diff --git a/src/main/java/com/stileeducation/markr/entity/TestResult.java b/src/main/java/com/stileeducation/markr/entity/TestResult.java index bdbade4..cfee1c7 100644 --- a/src/main/java/com/stileeducation/markr/entity/TestResult.java +++ b/src/main/java/com/stileeducation/markr/entity/TestResult.java @@ -20,8 +20,8 @@ public class TestResult { @JoinColumn(name = "test_id", nullable = false) private Test test; - @Column(name = "marks_awarded", nullable = false) - private Integer marksAwarded; + @Column(name = "marks_obtained", nullable = false) + private Integer marksObtained; @Transient private boolean created = false; @@ -32,11 +32,11 @@ public class TestResult { public TestResult() { } - public TestResult(Long id, Student student, Test test, Integer marksAwarded) { + public TestResult(Long id, Student student, Test test, Integer marksObtained) { this.id = id; this.student = student; this.test = test; - this.marksAwarded = marksAwarded; + this.marksObtained = marksObtained; } public Long getId() { @@ -63,12 +63,12 @@ public class TestResult { this.test = test; } - public Integer getMarksAwarded() { - return marksAwarded; + public Integer getMarksObtained() { + return marksObtained; } - public void setMarksAwarded(Integer marksAwarded) { - this.marksAwarded = marksAwarded; + public void setMarksObtained(Integer marksObtained) { + this.marksObtained = marksObtained; } public boolean isCreated() { @@ -95,14 +95,12 @@ public class TestResult { return Objects.equals(id, that.id) && Objects.equals(student, that.student) && Objects.equals(test, that.test) && - Objects.equals(marksAwarded, that.marksAwarded) && - Objects.equals(created, that.created) && - Objects.equals(updated, that.updated); + Objects.equals(marksObtained, that.marksObtained); } @Override public int hashCode() { - return Objects.hash(id, student, test, marksAwarded); + return Objects.hash(id, student, test, marksObtained); } @Override @@ -111,7 +109,7 @@ public class TestResult { "id=" + id + ", student=" + student + ", test=" + test + - ", marksAwarded=" + marksAwarded + + ", marksObtained=" + marksObtained + ", created=" + created + ", updated=" + updated + '}'; |