Merge pull request #33 from UruruLab/fix/30-editProductProductoptionProductnoticeEntity

Product, ProductOption, ProductNotice Entity 수정

Author: songcw8

src/main/java/com/ururulab/ururu/product/domain/entity/Product.java

@@ -40,6 +40,9 @@ public class Product extends BaseEntity {
     @OneToMany(mappedBy = "product", orphanRemoval = true)
     private List<ProductCategory> productCategories = new ArrayList<>();
 
+    @OneToOne(mappedBy = "product", cascade = CascadeType.ALL, orphanRemoval = true)
+    private ProductNotice productNotice;
+
     public static Product of(
             //Seller seller,
             String name,

src/main/java/com/ururulab/ururu/product/domain/entity/ProductNotice.java

@@ -17,12 +17,15 @@ public class ProductNotice extends BaseEntity {
     private Long id;
 
     @OneToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "product_option_id")
-    private ProductOption productOption;
+    @JoinColumn(name = "product_id")
+    private Product product;
 
     @Column(nullable = false, length = 50)
     private String capacity; //용량
 
+    @Column(nullable = false, length = 50)
+    private String spec; // 제품 주요 사양
+
     @Column(nullable = false, length = 100)
     private String expiry; // 사용기한
 
@@ -38,9 +41,6 @@ public class ProductNotice extends BaseEntity {
     @Column(nullable = false, length = 50)
     private String countryOfOrigin; //제조국
 
-    @Column(nullable = false, columnDefinition = "TEXT")
-    private String fullIngredients; // 전성분
-
     @Column(nullable = false)
     private boolean functionalCosmetics; // 기능성 여부
 
@@ -54,28 +54,28 @@ public class ProductNotice extends BaseEntity {
     private String customerServiceNumber; //고객센터 번호
 
     public static ProductNotice of(
-            ProductOption productOption,
+            Product product,
             String capacity,
+            String spec,
             String expiry,
             String usage,
             String manufacturer,
             String responsibleSeller,
             String countryOfOrigin,
-            String fullIngredients,
             boolean functionalCosmetics,
             String caution,
             String warranty,
             String customerServiceNumber
     ){
         ProductNotice productNotice = new ProductNotice();
-        productNotice.productOption = productOption;
+        productNotice.product = product;
         productNotice.capacity = capacity;
+        productNotice.spec = spec;
         productNotice.expiry = expiry;
         productNotice.usage = usage;
         productNotice.manufacturer = manufacturer;
         productNotice.responsibleSeller = responsibleSeller;
         productNotice.countryOfOrigin = countryOfOrigin;
-        productNotice.fullIngredients = fullIngredients;
         productNotice.functionalCosmetics = functionalCosmetics;
         productNotice.caution = caution;
         productNotice.warranty = warranty;

src/main/java/com/ururulab/ururu/product/domain/entity/ProductOption.java

@@ -5,10 +5,6 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.JdbcTypeCode;
-import org.hibernate.type.SqlTypes;
-
-import java.util.Map;
 
 @Entity
 @Getter
@@ -32,29 +28,25 @@ public class ProductOption extends BaseEntity {
     @Column(nullable = true)
     private String imageUrl;
 
-    @JdbcTypeCode(SqlTypes.JSON)
-    @Column(nullable = true, columnDefinition = "JSON")
-    private Map<String, String> specifications;
-
     @Column(nullable = false)
     private boolean isDeleted = false;
 
-    @OneToOne(mappedBy = "productOption", cascade = CascadeType.ALL, orphanRemoval = true)
-    private ProductNotice productNotice;
+    @Column(nullable = false, columnDefinition = "TEXT")
+    private String fullIngredients; // 전성분
 
     public static ProductOption of(
             Product product,
             String name,
             int price,
             String imageUrl,
-            Map<String,String> specifications
+            String fullIngredients
     ){
         ProductOption productOption = new ProductOption();
         productOption.product = product;
         productOption.name = name;
         productOption.price = price;
         productOption.imageUrl = imageUrl;
-        productOption.specifications = specifications;
+        productOption.fullIngredients = fullIngredients;
 
         return productOption;
     }

src/main/java/com/ururulab/ururu/product/domain/repository/ProductRepository.java

@@ -33,7 +33,7 @@ public interface ProductRepository extends JpaRepository<Product, Long> {
     @Query("SELECT p FROM Product p LEFT JOIN FETCH p.productOptions po WHERE p.id = :productId AND po.isDeleted = false")
     Optional<Product> findByIdWithOptions(@Param("productId") Long productId);
 
-    // 상품 + 정보고시 함께 조회 -> 엔티티 구조 변경 후 주석 제거
-//    @Query("SELECT p FROM Product p LEFT JOIN FETCH p.productNotice WHERE p.id = :productId")
-//    Optional<Product> findByIdWithNotice(@Param("productId") Long productId);
+    //상품 + 정보고시 함께 조회 -> 엔티티 구조 변경 후 주석 제거
+    @Query("SELECT p FROM Product p LEFT JOIN FETCH p.productNotice WHERE p.id = :productId")
+    Optional<Product> findByIdWithNotice(@Param("productId") Long productId);
 }