Merge pull request #31 from UMC-neoul/feature/#29

Feat: 엔티티랑 디비 수정
UMC-neoul · Aug 1, 2023 · 8c962f4 · 8c962f4
2 parents 826dff4 + 492ee6e
commit 8c962f4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/src/main/java/com/example/neoul/entity/brand/Brand.java b/src/main/java/com/example/neoul/entity/brand/Brand.java
@@ -23,8 +23,7 @@ public class Brand extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "brand_id")
-    private Long brandId;
+    private Long id;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "vcategory_id")

diff --git a/src/main/java/com/example/neoul/entity/brand/Product.java b/src/main/java/com/example/neoul/entity/brand/Product.java
@@ -31,8 +31,7 @@ public class Product extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "product_id")
-    private Long productId;
+    private Long id;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "brand_id") //기본 0

diff --git a/src/main/java/com/example/neoul/entity/brand/Story.java b/src/main/java/com/example/neoul/entity/brand/Story.java
@@ -23,8 +23,7 @@ public class Story extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "story_id")
-    private Long storyId;
+    private Long id;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "vcategory_id")

diff --git a/src/main/java/com/example/neoul/entity/notice/Notice.java b/src/main/java/com/example/neoul/entity/notice/Notice.java
@@ -25,8 +25,7 @@ public class Notice extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "notice_id")
-    private Long noticeId;
+    private Long id;
 
     private String title;
 

diff --git a/src/main/java/com/example/neoul/service/BoardService.java b/src/main/java/com/example/neoul/service/BoardService.java
@@ -37,7 +37,7 @@ public List<BoardRes.CategoryBoardSimple> getCategoryList(Long categoryId, int o
 
         for(Product product : productList){
             BoardRes.CategoryBoardSimple e = BoardRes.CategoryBoardSimple.builder()
-                    .productId(product.getProductId())
+                    .productId(product.getId())
                     .categoryId(categoryId)
                     .brandName(product.getBrand().getName())
                     .productName(product.getName())