Skip to content

Commit 6207236

Browse files
committed
Fixed some things for PR#1 of issue #2
- Renamed the assignment associated with AssignmentEnrollment from "course" to "assignment - Added a JsonIgnore tag to the ID in AssignmentEnrollment - Added a USER_ID variable to bootstrap_data.sql for ease of testing - Added a 2 more test cases to Assignment enrolment in bootstrap_data
1 parent 8b4d34b commit 6207236

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/main/java/com/unityTest/courseManagement/entity/AssignmentEnrollment.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public class AssignmentEnrollment {
2323

2424
@Id
2525
@Column(name = "ID")
26+
@JsonIgnore
2627
@GeneratedValue(generator = "sequence-generator")
2728
@GenericGenerator(
2829
name = "sequence-generator",
@@ -37,7 +38,7 @@ public class AssignmentEnrollment {
3738
@ApiModelProperty(value = "Enrolled assignment")
3839
@ManyToOne(fetch = FetchType.LAZY)
3940
@JoinColumn(name = "ASSIGNMENT_ID", referencedColumnName = "ID")
40-
private Assignment course;
41+
private Assignment assignment;
4142

4243
// User id
4344
@JsonIgnore

src/main/resources/db/h2/bootstrap_data.sql

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2+
SET @USER_ID = 'TEST_ID';
3+
14
INSERT INTO COURSE (ID, CODE, LEVEL, TERM, ACADEMIC_YEAR)
25
VALUES
36
(1, 'COMPSCI 1JC3', 1, 'FALL', 2019),
@@ -70,4 +73,6 @@ VALUES
7073
(2, 2, 'X02', false),
7174
(3, 1, 'X02', true),
7275
(4, 2, 'X01', true),
73-
(5, 1, 'X03', false);
76+
(5, 1, 'X03', false),
77+
(6, 1, @USER_ID, false),
78+
(7, 2, @USER_ID, true);

0 commit comments

Comments
 (0)