diff --git a/.vscode/settings.json b/.vscode/settings.json index c5f3f6b..a760fd6 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { - "java.configuration.updateBuildConfiguration": "interactive" + "java.configuration.updateBuildConfiguration": "interactive", + "java.debug.settings.onBuildFailureProceed": true } \ No newline at end of file diff --git a/nekontakte/src/main/java/com/example/nekontakte/core/model/BaseEntity.java b/nekontakte/src/main/java/com/example/nekontakte/core/model/BaseEntity.java index 334fa19..4057872 100644 --- a/nekontakte/src/main/java/com/example/nekontakte/core/model/BaseEntity.java +++ b/nekontakte/src/main/java/com/example/nekontakte/core/model/BaseEntity.java @@ -6,7 +6,9 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.SequenceGenerator; import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +@MappedSuperclass public class BaseEntity { @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = Constants.SEQUENCE_NAME) diff --git a/nekontakte/src/main/java/com/example/nekontakte/users/model/UserEntity.java b/nekontakte/src/main/java/com/example/nekontakte/users/model/UserEntity.java index 541e066..f9e5a9a 100644 --- a/nekontakte/src/main/java/com/example/nekontakte/users/model/UserEntity.java +++ b/nekontakte/src/main/java/com/example/nekontakte/users/model/UserEntity.java @@ -12,8 +12,10 @@ import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.OneToMany; import jakarta.persistence.OrderBy; +import jakarta.persistence.Entity; import jakarta.persistence.Table; +@Entity @Table(name = "users") public class UserEntity extends BaseEntity { @Column(nullable = false) @@ -22,7 +24,9 @@ public class UserEntity extends BaseEntity { private String surname; @Column(nullable = false) private Date birthday; + @Column private String city; + @Column private String avatarImg; @Column(nullable = false, unique = true) private String username; @@ -30,10 +34,11 @@ public class UserEntity extends BaseEntity { private String password; @Column(nullable = false) private boolean isAdmin; + @Column private String status; - @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) - @OrderBy("id ASC") - private Set posts = new HashSet<>(); + // @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + // @OrderBy("id ASC") + // private Set posts = new HashSet<>(); public UserEntity() { } diff --git a/nekontakte/test.mv.db b/nekontakte/test.mv.db new file mode 100644 index 0000000..7a36609 Binary files /dev/null and b/nekontakte/test.mv.db differ diff --git a/test.mv.db b/test.mv.db new file mode 100644 index 0000000..71fe339 Binary files /dev/null and b/test.mv.db differ