[Refactor] entity - erdCloud 확인 후 수정

src/main/java/com/school/mohitto/domain/CreatedImage.java

@@ -16,9 +16,9 @@ public class CreatedImage extends BaseTimeEntity {
     @Column(name = "created_image_id")
     private Long id;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "diagnosis_id")
-    private Diagnosis diagnosis;
+    @OneToOne
+    @JoinColumn(name = "hair_id", nullable = true)
+    private Hair hair;
 
     @Column(name = "url", length = 255)
     private String createdImageUrl;

src/main/java/com/school/mohitto/domain/Diagnosis.java

@@ -51,10 +51,6 @@ public class Diagnosis extends BaseTimeEntity{
     @OneToMany(mappedBy = "diagnosis", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<DiagnosisMood> diagnosisMoods = new ArrayList<>();
 
-
-    @OneToMany(mappedBy = "diagnosis", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<CreatedImage> createdImages = new ArrayList<>();
-
     @OneToMany(mappedBy = "diagnosis", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Hair> hairs = new ArrayList<>();
 

src/main/java/com/school/mohitto/domain/Hair.java

@@ -31,10 +31,6 @@ public class Hair {
     @Column(name = "is_liked")
     private Boolean isLiked;
 
-
-    @OneToMany(mappedBy = "hair", cascade = CascadeType.ALL)
-    private List<UserHair> userHairs = new ArrayList<>();
-
     @OneToMany(mappedBy = "hair", cascade = CascadeType.ALL)
     private List<SalonHair> salonHairs = new ArrayList<>();
 
@@ -45,4 +41,8 @@ public class Hair {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "model_image_id")
     private ModelImage modelImage;
+
+    @OneToOne(mappedBy = "hair", fetch = FetchType.LAZY)
+    private CreatedImage createdImage;
+
 }

src/main/java/com/school/mohitto/domain/ModelImage.java

@@ -1,5 +1,9 @@
 package com.school.mohitto.domain;
 
+import com.school.mohitto.domain.enums.HairLengthType;
+import com.school.mohitto.domain.enums.HairTypeEnum;
+import com.school.mohitto.domain.enums.HasBangType;
+import com.school.mohitto.domain.enums.SexType;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -19,6 +23,25 @@ public class ModelImage {
     @Column(name = "model_image_id")
     private Long id;
 
+    @Column(length = 40)
+    private String name;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "sex_type")
+    private SexType sex;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "hair_type")
+    private HairTypeEnum hairTypeEnum;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "hasbang_type")
+    private HasBangType hasBangType;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "hair_length")
+    private HairLengthType hairLength;
+
     @Column(name = "upload_image_url", length = 255)
     private String uploadImageUrl;
 

src/main/java/com/school/mohitto/domain/User.java

@@ -39,9 +39,6 @@ public class User {
     @Column(name = "oauth2_type", nullable = false)
     private OAuth2Type oauth2Type;
 
-    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<UserHair> userHairs = new ArrayList<>();
-
     @OneToMany(mappedBy = "user")
     private List<Diagnosis> diagnosis = new ArrayList<>();
 

src/main/java/com/school/mohitto/domain/enums/HairTypeEnum.java

@@ -6,7 +6,8 @@
 public enum HairTypeEnum {
     STRAIGHT("직모"),
     COILY("반곱슬"),
-    CURLY("곱슬");
+    CURLY("곱슬"),
+    NONE("상관없음");
 
     private final String value;
 

src/main/java/com/school/mohitto/domain/enums/HasBangType.java

@@ -4,8 +4,9 @@
 
 @Getter
 public enum HasBangType{
-    TRUE("있음"),
-    FALSE("없음");
+    YES("있음"),
+    NO("없음"),
+    NONE("상관없음");
 
     private final String value;