From 03e593f6248c20b1ad47c790354d6eca6372d70a Mon Sep 17 00:00:00 2001
From: "ns.potapov" <ns.potapov@yandex.ru>
Date: Mon, 15 Apr 2024 17:39:44 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BE=D1=81=D0=BF=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B1=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D1=8E=D0=B7?=
 =?UTF-8?q?=D0=B5=D1=80=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                           |   3 ++-
 .../nekontakte/core/model/BaseEntity.java       |   2 ++
 .../nekontakte/users/model/UserEntity.java      |  11 ++++++++---
 nekontakte/test.mv.db                           | Bin 0 -> 24576 bytes
 test.mv.db                                      | Bin 0 -> 20480 bytes
 5 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 nekontakte/test.mv.db
 create mode 100644 test.mv.db

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<PostEntity> posts = new HashSet<>();
+    // @OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
+    // @OrderBy("id ASC")
+    // private Set<PostEntity> posts = new HashSet<>();
 
     public UserEntity() {
     }
diff --git a/nekontakte/test.mv.db b/nekontakte/test.mv.db
new file mode 100644
index 0000000000000000000000000000000000000000..7a3660937defc58360ca3cbb46f9c484e06c6129
GIT binary patch
literal 24576
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
N-OyG*qi4F<`Wj3DeHH)!

literal 0
HcmV?d00001

diff --git a/test.mv.db b/test.mv.db
new file mode 100644
index 0000000000000000000000000000000000000000..71fe3393cc17c0cb3295cb2985a2ce093f28baa1
GIT binary patch
literal 20480
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
OpFN^L{IC6J@&ET>JS@2Y

literal 0
HcmV?d00001