feat: 테이블 변경

.gitignore

@@ -36,4 +36,5 @@ out/
 ### VS Code ###
 .vscode/
 .env
-.DS_Store
+.DS_Store
+src/main/generated/

src/main/java/server/acode/domain/fragrance/entity/Concentration.java

@@ -1,5 +1,5 @@
 package server.acode.domain.fragrance.entity;
 
 public enum Concentration {
-    EDP, EDT, EDC
+    EDP, EDT, EDC;
 }

src/main/java/server/acode/domain/fragrance/entity/Fragrance.java

@@ -9,6 +9,7 @@
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Table(indexes = @Index(columnList = "korBrand"))
 public class Fragrance extends BaseTimeEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -18,6 +19,10 @@ public class Fragrance extends BaseTimeEntity {
     @Column(length = 50)
     private String name; // 향수 이름 한글
 
+    private String korBrand; // 브랜드 한글 이름
+    private String engBrand; // 브랜드 영어 이름
+
+
     private int rateSum; // 별점 총점
     private int reviewCnt; // 리뷰 수
 
@@ -27,12 +32,17 @@ public class Fragrance extends BaseTimeEntity {
 
     private int view; // 조회수
 
-    private String poster; //포스터 url
+    private String poster; //포스터 이미지 url
+
     private String link1; // 구매 링크 url
     private String link2;
     private String link3;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "brand_id")
-    private Brand brand;
+    private String thumbnail;  // 대표 사진 url
+    private String image1;
+    private String image2;
+
+    private String style;  // 스타일
+    private String season;  // 계절감
+    private String scent;  // 향
 }

src/main/java/server/acode/domain/ingredient/entity/Ingredient.java

@@ -5,6 +5,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import server.acode.domain.family.entity.Family;
+import server.acode.domain.fragrance.entity.Fragrance;
 import server.acode.global.common.BaseTimeEntity;
 
 @Entity
@@ -20,7 +21,7 @@ public class Ingredient extends BaseTimeEntity {
     private String korName; // 향료 한글이름
 
     @Column(length = 50)
-    private String engName; // 향료 한글이름
+    private String engName; // 향료 영어이름
 
     private String acode; // 어코드 설명
 
@@ -29,6 +30,7 @@ public class Ingredient extends BaseTimeEntity {
     private String summary; // 향료 설명 줄글
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "family_id")
-    private Family family;
+    @JoinColumn(name = "ingredient_type_id")
+    private IngredientType ingredientType;
+
 }

src/main/java/server/acode/domain/fragrance/entity/Brand.java → src/main/java/server/acode/domain/ingredient/entity/IngredientType.java

@@ -1,4 +1,4 @@
-package server.acode.domain.fragrance.entity;
+package server.acode.domain.ingredient.entity;
 
 import jakarta.persistence.*;
 import lombok.AccessLevel;
@@ -9,15 +9,16 @@
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class Brand extends BaseTimeEntity {
+public class IngredientType extends BaseTimeEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "brand_id")
+    @Column(name = "ingredient_type_id")
     private Long id;
 
     @Column(length = 50)
-    private String korName; // 브랜드 한글 이름
-
+    private String korName; // 향료타입 한글이름
     @Column(length = 50)
-    private String engName; // 브랜드 한글 이름
+    private String engName; // 향료타입 영어이름
+
+    private String icon; // 아이콘 이미지 url
 }