#1 feat: DB 컬럼 생성

PSR-Co · Jul 21, 2023 · d0c42a9 · d0c42a9
1 parent 60a2bf9
commit d0c42a9
Show file tree

Hide file tree

Showing 15 changed files with 242 additions and 57 deletions.
diff --git a/src/main/kotlin/com/psr/psr/chat/entity/ChatRoom.kt b/src/main/kotlin/com/psr/psr/chat/entity/ChatRoom.kt
@@ -1,13 +1,20 @@
 package com.psr.psr.chat.entity
 
 import com.psr.psr.global.entity.BaseEntity
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
+import com.psr.psr.user.entity.User
+import jakarta.persistence.*
 
 @Entity
 data class ChatRoom(
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        var id: Long
+        var id: Long,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "sender_user_idx")
+        var senderUser: User,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "receiver_user_idx")
+        var receiverUser: User
+
 ): BaseEntity()
diff --git a/src/main/kotlin/com/psr/psr/cs/entity/Faq.kt b/src/main/kotlin/com/psr/psr/cs/entity/Faq.kt
@@ -5,9 +5,20 @@ import jakarta.persistence.Entity
 import jakarta.persistence.GeneratedValue
 import jakarta.persistence.GenerationType
 import jakarta.persistence.Id
+import org.jetbrains.annotations.NotNull
 
 @Entity
 data class Faq(
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        var id: Long
+        var id: Long,
+
+        @NotNull
+        var title: String,
+
+        @NotNull
+        var content: String,
+
+        @NotNull
+        var type: FaqType
+
 ): BaseEntity()
diff --git a/src/main/kotlin/com/psr/psr/cs/entity/Notice.kt b/src/main/kotlin/com/psr/psr/cs/entity/Notice.kt
@@ -5,9 +5,19 @@ import jakarta.persistence.Entity
 import jakarta.persistence.GeneratedValue
 import jakarta.persistence.GenerationType
 import jakarta.persistence.Id
+import org.jetbrains.annotations.NotNull
 
 @Entity
 data class Notice(
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        var id: Long
+        var id: Long,
+
+        @NotNull
+        var title: String,
+
+        @NotNull
+        var content: String,
+
+        var imgKey: String
+
 ): BaseEntity()
diff --git a/src/main/kotlin/com/psr/psr/inquiry/entity/Inquiry.kt b/src/main/kotlin/com/psr/psr/inquiry/entity/Inquiry.kt
@@ -1,13 +1,28 @@
 package com.psr.psr.inquiry.entity
 
 import com.psr.psr.global.entity.BaseEntity
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
+import com.psr.psr.user.entity.User
+import jakarta.persistence.*
+import org.jetbrains.annotations.NotNull
 
 @Entity
 data class Inquiry(
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        var id: Long
+        var id: Long,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "user_idx")
+        var user: User,
+
+        @NotNull
+        var title: String,
+
+        @NotNull
+        var content: String,
+
+        @NotNull
+        var inquiryStatus: InquiryStatus,
+
+        var answer: String
+
 ): BaseEntity()
diff --git a/src/main/kotlin/com/psr/psr/notification/entity/Notification.kt b/src/main/kotlin/com/psr/psr/notification/entity/Notification.kt
@@ -5,9 +5,17 @@ import jakarta.persistence.Entity
 import jakarta.persistence.GeneratedValue
 import jakarta.persistence.GenerationType
 import jakarta.persistence.Id
+import org.jetbrains.annotations.NotNull
 
 @Entity
 data class Notification(
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        var id: Long
+        var id: Long,
+
+        @NotNull
+        var title: String,
+
+        @NotNull
+        var content: String
+
 ): BaseEntity()
diff --git a/src/main/kotlin/com/psr/psr/order/entity/Order.kt b/src/main/kotlin/com/psr/psr/order/entity/Order.kt
@@ -1,13 +1,37 @@
 package com.psr.psr.order.entity
 
 import com.psr.psr.global.entity.BaseEntity
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
+import com.psr.psr.product.entity.product.Product
+import com.psr.psr.user.entity.User
+import jakarta.persistence.*
+import org.jetbrains.annotations.NotNull
 
 @Entity
 data class Order(
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        var id: Long
+        var id: Long,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "product_idx")
+        var product: Product,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "user_idx")
+        var user: User,
+
+        @NotNull
+        var ordererName: String,
+
+        @NotNull
+        var websiteUrl: String,
+
+        @NotNull
+        var orderStatus: OrderStatus,
+
+        @NotNull
+        var inquiry: String,
+
+        @NotNull
+        var description: String
+
 ): BaseEntity()
diff --git a/src/main/kotlin/com/psr/psr/product/entity/product/Product.kt b/src/main/kotlin/com/psr/psr/product/entity/product/Product.kt
@@ -1,13 +1,31 @@
 package com.psr.psr.product.entity.product
 
 import com.psr.psr.global.entity.BaseEntity
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
+import com.psr.psr.user.entity.Category
+import com.psr.psr.user.entity.User
+import jakarta.persistence.*
+import org.jetbrains.annotations.NotNull
 
 @Entity
 data class Product(
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        var id: Long
+        var id: Long,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "user_idx")
+        var user: User,
+
+        @NotNull
+        var name: String,
+
+        @NotNull
+        var category: Category,
+
+        @NotNull
+        var price: Int,
+
+        @NotNull
+        var description: String,
+
+        var likeNum: Int
 ): BaseEntity()
diff --git a/src/main/kotlin/com/psr/psr/product/entity/product/ProductImg.kt b/src/main/kotlin/com/psr/psr/product/entity/product/ProductImg.kt
@@ -5,9 +5,18 @@ import jakarta.persistence.Entity
 import jakarta.persistence.GeneratedValue
 import jakarta.persistence.GenerationType
 import jakarta.persistence.Id
+import jakarta.persistence.ManyToOne
+import org.jetbrains.annotations.NotNull
 
 @Entity
 data class ProductImg(
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        var id: Long
+        var id: Long,
+
+        @ManyToOne
+        var product: Product,
+
+        @NotNull
+        var imgKey: String
+
 ): BaseEntity()
diff --git a/src/main/kotlin/com/psr/psr/product/entity/product/ProductLike.kt b/src/main/kotlin/com/psr/psr/product/entity/product/ProductLike.kt
@@ -1,13 +1,19 @@
 package com.psr.psr.product.entity.product
 
 import com.psr.psr.global.entity.BaseEntity
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
+import com.psr.psr.user.entity.User
+import jakarta.persistence.*
 
 @Entity
 data class ProductLike(
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        var id: Long
+        var id: Long,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "product_idx")
+        var product: Product,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "user_idx")
+        var user: User
 ): BaseEntity()
diff --git a/src/main/kotlin/com/psr/psr/product/entity/product/ProductReport.kt b/src/main/kotlin/com/psr/psr/product/entity/product/ProductReport.kt
@@ -1,13 +1,25 @@
 package com.psr.psr.product.entity.product
 
 import com.psr.psr.global.entity.BaseEntity
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
+import com.psr.psr.product.entity.ReportCategory
+import com.psr.psr.user.entity.User
+import jakarta.persistence.*
+import org.jetbrains.annotations.NotNull
 
 @Entity
 data class ProductReport(
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        var id: Long
+        var id: Long,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "product_idx")
+        var product: Product,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "user_idx")
+        var user: User,
+
+        @NotNull
+        var category: ReportCategory
+
 ): BaseEntity()
diff --git a/src/main/kotlin/com/psr/psr/product/entity/review/Review.kt b/src/main/kotlin/com/psr/psr/product/entity/review/Review.kt
@@ -1,13 +1,27 @@
 package com.psr.psr.product.entity.review
 
 import com.psr.psr.global.entity.BaseEntity
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
+import com.psr.psr.product.entity.product.Product
+import com.psr.psr.user.entity.User
+import jakarta.persistence.*
+import org.jetbrains.annotations.NotNull
 
 @Entity
 data class Review(
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        var id: Long
-): BaseEntity()
+        var id: Long,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "product_idx")
+        var product: Product,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "user_idx")
+        var user: User,
+
+        @NotNull
+        var rating: Int,
+
+        var content: String
+
+        ): BaseEntity()
diff --git a/src/main/kotlin/com/psr/psr/product/entity/review/ReviewReport.kt b/src/main/kotlin/com/psr/psr/product/entity/review/ReviewReport.kt
@@ -1,13 +1,24 @@
 package com.psr.psr.product.entity.review
 
 import com.psr.psr.global.entity.BaseEntity
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
+import com.psr.psr.product.entity.ReportCategory
+import com.psr.psr.user.entity.User
+import jakarta.persistence.*
 
 @Entity
 data class ReviewReport(
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        var id: Long
-): BaseEntity()
+        var id: Long,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "review_idx")
+        var review: Review,
+
+        @ManyToOne
+        @JoinColumn(nullable = false, name = "user_idx")
+        var user: User,
+
+        var category: ReportCategory
+
+
+        ): BaseEntity()
diff --git a/src/main/kotlin/com/psr/psr/user/entity/BusinessInfo.kt b/src/main/kotlin/com/psr/psr/user/entity/BusinessInfo.kt
@@ -1,13 +1,27 @@
 package com.psr.psr.user.entity
 
 import com.psr.psr.global.entity.BaseEntity
-import jakarta.persistence.Entity
-import jakarta.persistence.GeneratedValue
-import jakarta.persistence.GenerationType
-import jakarta.persistence.Id
+import jakarta.persistence.*
+import org.jetbrains.annotations.NotNull
 
 @Entity
 data class BusinessInfo(
         @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
-        var id: Long
+        var id: Long,
+
+        @OneToOne
+        @JoinColumn(nullable = false, name = "user_idx")
+        var user: User,
+
+        @NotNull
+        var companyName: String,
+
+        @NotNull
+        var ownerName: String,
+
+        @NotNull
+        var number: String,
+
+        @NotNull
+        var address: String
 ): BaseEntity()