diff --git a/src/main/java/koz01/java2/lab10/Clas.java b/src/main/java/koz01/java2/lab10/Clas.java index 660d6f398bd9ff1f437897e852ea4e70d04f7173..6b4a7709abdacb1605d2443aceb2fc30e7316c50 100644 --- a/src/main/java/koz01/java2/lab10/Clas.java +++ b/src/main/java/koz01/java2/lab10/Clas.java @@ -3,7 +3,7 @@ package koz01.java2.lab10; import java.util.Set; import javax.persistence.Entity; -import javax.persistence.Transient; +import javax.persistence.ManyToMany; import lombok.AllArgsConstructor; import lombok.Getter; @@ -19,7 +19,7 @@ public class Clas extends BaseEntity { @Setter private String cname; - @Transient + @ManyToMany(mappedBy = "clas") @Getter @Setter private Set<Teacher> teacher; diff --git a/src/main/java/koz01/java2/lab10/Department.java b/src/main/java/koz01/java2/lab10/Department.java index 8ab9522c788c397cce714224efa2835b264ba5a6..937132ac7d194ed5b1db852810b15ad1bc5aae84 100644 --- a/src/main/java/koz01/java2/lab10/Department.java +++ b/src/main/java/koz01/java2/lab10/Department.java @@ -3,7 +3,7 @@ package koz01.java2.lab10; import java.util.List; import javax.persistence.Entity; -import javax.persistence.Transient; +import javax.persistence.OneToMany; import lombok.AllArgsConstructor; import lombok.Getter; @@ -21,7 +21,8 @@ public class Department extends BaseEntity { @Setter private String name; - @Transient + @ToString.Exclude + @OneToMany(mappedBy = "department") @Getter @Setter private List<Employee> employee; diff --git a/src/main/java/koz01/java2/lab10/Employee.java b/src/main/java/koz01/java2/lab10/Employee.java index b4b98dfa0b35a3cf6c2af02d8c5fdd7c9ce6d6af..667514e6f5391d0df78e1e83561145277f321eed 100644 --- a/src/main/java/koz01/java2/lab10/Employee.java +++ b/src/main/java/koz01/java2/lab10/Employee.java @@ -1,7 +1,7 @@ package koz01.java2.lab10; import javax.persistence.Entity; -import javax.persistence.Transient; +import javax.persistence.ManyToOne; import lombok.AllArgsConstructor; import lombok.Getter; @@ -28,7 +28,7 @@ public class Employee extends BaseEntity { private String deg; @ToString.Exclude - @Transient + @ManyToOne @Setter @Getter private Department department; diff --git a/src/main/java/koz01/java2/lab10/NonTeachingStaff.java b/src/main/java/koz01/java2/lab10/NonTeachingStaff.java index 59b164a093a8b8cfb44417e01b5cc233a4083d68..71f5e2f33d9a6d6dfc1512c9717ee0b19de31d2d 100644 --- a/src/main/java/koz01/java2/lab10/NonTeachingStaff.java +++ b/src/main/java/koz01/java2/lab10/NonTeachingStaff.java @@ -1,5 +1,6 @@ package koz01.java2.lab10; +import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; import lombok.Getter; @@ -7,6 +8,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; @Entity +@DiscriminatorValue(value = "nts") @NoArgsConstructor public class NonTeachingStaff extends Staff { diff --git a/src/main/java/koz01/java2/lab10/Staff.java b/src/main/java/koz01/java2/lab10/Staff.java index 6f09a62943a09c3d44b4b9e1bf0c4f0e8a270c52..87e37283b36817a87478e988b7f6b9e02a5466d4 100644 --- a/src/main/java/koz01/java2/lab10/Staff.java +++ b/src/main/java/koz01/java2/lab10/Staff.java @@ -1,12 +1,15 @@ package koz01.java2.lab10; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @Entity +@Inheritance(strategy = InheritanceType.JOINED) @NoArgsConstructor public class Staff extends BaseEntity { diff --git a/src/main/java/koz01/java2/lab10/Teacher.java b/src/main/java/koz01/java2/lab10/Teacher.java index d2b11e5af9e3a67fb8a70d19d712ba97e1783c9c..e824c26f5664428adcd2ab0068ca963cae4dbe7f 100644 --- a/src/main/java/koz01/java2/lab10/Teacher.java +++ b/src/main/java/koz01/java2/lab10/Teacher.java @@ -4,7 +4,7 @@ package koz01.java2.lab10; import java.util.Set; import javax.persistence.Entity; -import javax.persistence.Transient; +import javax.persistence.ManyToMany; import lombok.AllArgsConstructor; import lombok.Getter; @@ -24,7 +24,7 @@ public class Teacher extends BaseEntity { @Setter private String subject; - @Transient + @ManyToMany @Getter @Setter private Set<Clas> clas;