From 0463cef7fa4b7966db1323bd958e964f9d20797a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?=
 <raspaev.niko@mail.ru>
Date: Mon, 1 May 2023 12:38:20 +0400
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B2=D1=8F=D0=B7=D0=B0=D0=BB=20=D1=8E?=
 =?UTF-8?q?=D0=B7=D0=B5=D1=80=D0=B0=20=D1=81=20=D1=81=D0=BE=D0=B7=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D0=B5=D0=BC,=20=D0=BD=D1=83=D0=B6?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=B1=D1=83=D0=B4=D0=B5=D1=82=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D1=82=D1=8C=20=D0=BA=D0=BE=D0=B4?=
 =?UTF-8?q?,=20=D1=82=D0=B0=D0=BA=20=D0=BA=D0=B0=D0=BA=20=D0=B8=D0=B7=20?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D1=83?=
 =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BD=20?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D0=B0=D1=80=D0=BE=D0=BB=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/MangaStore/model/Default/Creator.java | 32 ++++---------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/LabWork/app/MangaStore/model/Default/Creator.java b/src/main/java/com/LabWork/app/MangaStore/model/Default/Creator.java
index d4b5618..0ae6ea6 100644
--- a/src/main/java/com/LabWork/app/MangaStore/model/Default/Creator.java
+++ b/src/main/java/com/LabWork/app/MangaStore/model/Default/Creator.java
@@ -1,5 +1,7 @@
 package com.LabWork.app.MangaStore.model.Default;
 
+import com.LabWork.app.MangaStore.user.model.User;
+
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 
@@ -10,16 +12,11 @@ import java.util.Objects;
 @Entity
 public class Creator {
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
-    @NotBlank(message = "creatorName can't be null or empty")
-    @Column
-    private String creatorName;
-
-    @NotBlank(message = "hashedPassword can't be null or empty")
-    @Column
-    private String hashedPassword;
+    @OneToOne(fetch = FetchType.LAZY)
+    @MapsId
+    private User user;
 
     @OneToMany(fetch = FetchType.EAGER, mappedBy = "creator", cascade = CascadeType.REMOVE)
     private List<Manga> mangas;
@@ -28,8 +25,7 @@ public class Creator {
     }
 
     public Creator(String creatorName, String hashedPassword) {
-        this.creatorName = creatorName;
-        this.hashedPassword = hashedPassword;
+        this.user = user;
         this.mangas = new ArrayList<>();
     }
 
@@ -41,25 +37,11 @@ public class Creator {
         return mangas;
     }
 
-    public String getCreatorName() {
-        return creatorName;
-    }
-
-    public String getHashedPassword() {
-        return hashedPassword;
-    }
-
     public void setMangas(List<Manga> mangas) {
         this.mangas = mangas;
     }
 
-    public void setCreatorName(String creatorName) {
-        this.creatorName = creatorName;
-    }
-
-    public void setHashedPassword(String hashedPassword) {
-        this.hashedPassword = hashedPassword;
-    }
+    public User getUser() { return user; }
 
     @Override
     public boolean equals(Object o) {