diff --git a/src/main/java/com/example/nto/entity/Code.java b/src/main/java/com/example/nto/entity/Code.java index 29e07b4..71e34b9 100644 --- a/src/main/java/com/example/nto/entity/Code.java +++ b/src/main/java/com/example/nto/entity/Code.java @@ -13,9 +13,9 @@ public class Code { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name="name", nullable = false, unique = true) + @Column(name="value") private Long value; - @Column(name = "value", nullable = false, unique = true) + @Column(name ="name") private String name; } diff --git a/src/main/java/com/example/nto/entity/Enter.java b/src/main/java/com/example/nto/entity/Enter.java index 896ea61..c229c96 100644 --- a/src/main/java/com/example/nto/entity/Enter.java +++ b/src/main/java/com/example/nto/entity/Enter.java @@ -1,6 +1,7 @@ package com.example.nto.entity; +import io.micrometer.core.annotation.TimedSet; import liquibase.pro.packaged.C; import lombok.Data; import lombok.Getter; @@ -18,22 +19,17 @@ public class Enter { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @ManyToMany - @JoinTable( - name = "enter_employee", // Name of the join table - joinColumns = @JoinColumn(name = "enter_id"), // Column for this entity - inverseJoinColumns = @JoinColumn(name = "employee_id") // Column for the other entity - ) - private Set employees; + @OneToOne + @JoinColumn(name="code_id") + private Code code; - @ManyToMany - @JoinTable( - name = "enter_code", // Name of the join table - joinColumns = @JoinColumn(name = "enter_id"), // Column for this entity - inverseJoinColumns = @JoinColumn(name = "code_id") // Column for the other entity - ) - private Set codes; - @Column(nullable = false) + @OneToOne + @JoinColumn(name="employee_id") + private Employee employee; + + @Column(name="entered_at") private Timestamp entered_at; + @Column(name="enter_type") + private String enterType; }