From 60a2bf922f4d89ed84edcee37c05a1ddf32695e7 Mon Sep 17 00:00:00 2001 From: sojungpp Date: Sat, 22 Jul 2023 04:26:25 +0900 Subject: [PATCH 01/10] =?UTF-8?q?#1=20feat:=20enum=EA=B0=92=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/psr/psr/cs/entity/FaqType.kt | 7 +++++++ .../com/psr/psr/inquiry/entity/InquiryStatus.kt | 5 +++++ .../kotlin/com/psr/psr/order/entity/OrderStatus.kt | 8 ++++++++ .../com/psr/psr/product/entity/ReportCategory.kt | 8 ++++++++ src/main/kotlin/com/psr/psr/user/entity/Category.kt | 13 +++++++++++++ src/main/kotlin/com/psr/psr/user/entity/Provider.kt | 5 +++++ src/main/kotlin/com/psr/psr/user/entity/Type.kt | 8 ++++++++ 7 files changed, 54 insertions(+) create mode 100644 src/main/kotlin/com/psr/psr/cs/entity/FaqType.kt create mode 100644 src/main/kotlin/com/psr/psr/inquiry/entity/InquiryStatus.kt create mode 100644 src/main/kotlin/com/psr/psr/order/entity/OrderStatus.kt create mode 100644 src/main/kotlin/com/psr/psr/product/entity/ReportCategory.kt create mode 100644 src/main/kotlin/com/psr/psr/user/entity/Category.kt create mode 100644 src/main/kotlin/com/psr/psr/user/entity/Provider.kt create mode 100644 src/main/kotlin/com/psr/psr/user/entity/Type.kt diff --git a/src/main/kotlin/com/psr/psr/cs/entity/FaqType.kt b/src/main/kotlin/com/psr/psr/cs/entity/FaqType.kt new file mode 100644 index 0000000..3705c2f --- /dev/null +++ b/src/main/kotlin/com/psr/psr/cs/entity/FaqType.kt @@ -0,0 +1,7 @@ +package com.psr.psr.cs.entity + +enum class FaqType(val value: String) { + ACCOUNT_MANAGEMENT("계정관리"), + CONSULTING("컨설팅"), + PRODUCT("상품") +} \ No newline at end of file diff --git a/src/main/kotlin/com/psr/psr/inquiry/entity/InquiryStatus.kt b/src/main/kotlin/com/psr/psr/inquiry/entity/InquiryStatus.kt new file mode 100644 index 0000000..8234a79 --- /dev/null +++ b/src/main/kotlin/com/psr/psr/inquiry/entity/InquiryStatus.kt @@ -0,0 +1,5 @@ +package com.psr.psr.inquiry.entity + +enum class InquiryStatus(val value: String) { + +} \ No newline at end of file diff --git a/src/main/kotlin/com/psr/psr/order/entity/OrderStatus.kt b/src/main/kotlin/com/psr/psr/order/entity/OrderStatus.kt new file mode 100644 index 0000000..bb5daa9 --- /dev/null +++ b/src/main/kotlin/com/psr/psr/order/entity/OrderStatus.kt @@ -0,0 +1,8 @@ +package com.psr.psr.order.entity + +enum class OrderStatus(val value: String) { + ORDER_WAITING("요청대기"), + PROGRESSING("진행중"), + COMPLETED("진행완료"), + CANCELED("요청취소") +} diff --git a/src/main/kotlin/com/psr/psr/product/entity/ReportCategory.kt b/src/main/kotlin/com/psr/psr/product/entity/ReportCategory.kt new file mode 100644 index 0000000..2b4c031 --- /dev/null +++ b/src/main/kotlin/com/psr/psr/product/entity/ReportCategory.kt @@ -0,0 +1,8 @@ +package com.psr.psr.product.entity + +enum class ReportCategory(val value: String) { + JUNK("홍보/도배"), + PORN("음란물/유해한 정보"), + POOR_CONTENT("내용이 부실함"), + NOT_FIT("게시글 성격에 부적합함") +} \ No newline at end of file diff --git a/src/main/kotlin/com/psr/psr/user/entity/Category.kt b/src/main/kotlin/com/psr/psr/user/entity/Category.kt new file mode 100644 index 0000000..e78aeeb --- /dev/null +++ b/src/main/kotlin/com/psr/psr/user/entity/Category.kt @@ -0,0 +1,13 @@ +package com.psr.psr.user.entity + +enum class Category(val value: String) { + BROADCAST_PRODUCT("방송가능 상품소싱"), + SHOW_HOST_ADVERTISE("쇼호스트 구인"), + LIVE_COMMERCE_AGENT("라이브커머스 대행"), + LIVE_COMMERCE_EDUCATION("라이브커머스 교육"), + SMART_STORE_LAUNCHING("스마트스토어 런칭"), + VIDEO_EDITING("영상편집"), + INSTRUCTOR_MATCHING("강사매칭"), + SNS_MARKETING("SNS 마케팅"), + PROMOTION_DESIGN("홍보물 디자인") +} \ No newline at end of file diff --git a/src/main/kotlin/com/psr/psr/user/entity/Provider.kt b/src/main/kotlin/com/psr/psr/user/entity/Provider.kt new file mode 100644 index 0000000..a0297c2 --- /dev/null +++ b/src/main/kotlin/com/psr/psr/user/entity/Provider.kt @@ -0,0 +1,5 @@ +package com.psr.psr.user.entity + +enum class Provider(val value: String) { + LOCAL("로컬") +} \ No newline at end of file diff --git a/src/main/kotlin/com/psr/psr/user/entity/Type.kt b/src/main/kotlin/com/psr/psr/user/entity/Type.kt new file mode 100644 index 0000000..3a60304 --- /dev/null +++ b/src/main/kotlin/com/psr/psr/user/entity/Type.kt @@ -0,0 +1,8 @@ +package com.psr.psr.user.entity + +enum class Type(val value: String) { + GENERAL("일반"), + ENTREPRENEUR("사업자"), + SHOW_HOST("쇼호스트"), + MANAGER("관리자") +} \ No newline at end of file From d0c42a9c95943d14a5447464d086dbd9708fda0e Mon Sep 17 00:00:00 2001 From: sojungpp Date: Sat, 22 Jul 2023 04:27:07 +0900 Subject: [PATCH 02/10] =?UTF-8?q?#1=20feat:=20DB=20=EC=BB=AC=EB=9F=BC=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/psr/psr/chat/entity/ChatRoom.kt | 17 +++++++--- src/main/kotlin/com/psr/psr/cs/entity/Faq.kt | 13 ++++++- .../kotlin/com/psr/psr/cs/entity/Notice.kt | 12 ++++++- .../com/psr/psr/inquiry/entity/Inquiry.kt | 25 +++++++++++--- .../psr/notification/entity/Notification.kt | 10 +++++- .../kotlin/com/psr/psr/order/entity/Order.kt | 34 ++++++++++++++++--- .../psr/psr/product/entity/product/Product.kt | 28 ++++++++++++--- .../psr/product/entity/product/ProductImg.kt | 11 +++++- .../psr/product/entity/product/ProductLike.kt | 16 ++++++--- .../product/entity/product/ProductReport.kt | 22 +++++++++--- .../psr/psr/product/entity/review/Review.kt | 26 ++++++++++---- .../psr/product/entity/review/ReviewReport.kt | 23 +++++++++---- .../com/psr/psr/user/entity/BusinessInfo.kt | 24 ++++++++++--- .../kotlin/com/psr/psr/user/entity/User.kt | 22 +++++++++++- .../com/psr/psr/user/entity/UserInterest.kt | 16 ++++++--- 15 files changed, 242 insertions(+), 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 index 30bf2f2..5fa91a5 100644 --- 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 index 0598810..4c21416 100644 --- 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 index 851b22c..3a27d60 100644 --- 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 index edf52bd..997b456 100644 --- 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 index 16606c9..f8eccd7 100644 --- 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 index 53f282d..367bc34 100644 --- 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 index e8fcb2c..5c72c62 100644 --- 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 index 1656fa0..25656d0 100644 --- 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 index 72de456..65758f2 100644 --- 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 index 316a48c..6df0b0f 100644 --- 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 index 79c177f..536233d 100644 --- 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 index d4d0c26..e4ebc03 100644 --- 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 index 9b8caa3..ed42a2e 100644 --- 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() diff --git a/src/main/kotlin/com/psr/psr/user/entity/User.kt b/src/main/kotlin/com/psr/psr/user/entity/User.kt index 27eb049..82fe041 100644 --- a/src/main/kotlin/com/psr/psr/user/entity/User.kt +++ b/src/main/kotlin/com/psr/psr/user/entity/User.kt @@ -16,6 +16,26 @@ data class User( var email: String, @NotNull - var password:String + var password:String, + + @NotNull + var type:Type, + + @NotNull + var nickname:String, + + @NotNull + var phone:String, + + var profileImgKey: String, + + @NotNull + var provider: Provider, + + @NotNull + var marketing: Boolean, + + @NotNull + var notification: Boolean ): BaseEntity() diff --git a/src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt b/src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt index 24664b9..ac6a4f9 100644 --- a/src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt +++ b/src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt @@ -1,13 +1,19 @@ 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 UserInterest( @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - var id: Long + var id: Long, + + @ManyToOne + @JoinColumn(nullable = false, name = "user_idx") + var user: User, + + @NotNull + var category: Category + ): BaseEntity() From a63f1cfc8ca87993fe8be17003cc25619fc9639b Mon Sep 17 00:00:00 2001 From: sojungpp Date: Sat, 22 Jul 2023 04:36:41 +0900 Subject: [PATCH 03/10] =?UTF-8?q?#1=20feat:=20varchar=20=EA=B8=B8=EC=9D=B4?= =?UTF-8?q?=20=EC=A0=9C=ED=95=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/psr/psr/cs/entity/Faq.kt | 6 ++---- src/main/kotlin/com/psr/psr/cs/entity/Notice.kt | 3 +++ src/main/kotlin/com/psr/psr/inquiry/entity/Inquiry.kt | 1 + .../com/psr/psr/notification/entity/Notification.kt | 6 ++---- src/main/kotlin/com/psr/psr/order/entity/Order.kt | 1 + .../kotlin/com/psr/psr/product/entity/product/Product.kt | 1 + .../com/psr/psr/product/entity/product/ProductLike.kt | 1 + src/main/kotlin/com/psr/psr/user/entity/User.kt | 9 +++++---- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/kotlin/com/psr/psr/cs/entity/Faq.kt b/src/main/kotlin/com/psr/psr/cs/entity/Faq.kt index 4c21416..b08f6ce 100644 --- a/src/main/kotlin/com/psr/psr/cs/entity/Faq.kt +++ b/src/main/kotlin/com/psr/psr/cs/entity/Faq.kt @@ -1,10 +1,7 @@ package com.psr.psr.cs.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 @@ -13,6 +10,7 @@ data class Faq( var id: Long, @NotNull + @Column(length = 100) var title: String, @NotNull diff --git a/src/main/kotlin/com/psr/psr/cs/entity/Notice.kt b/src/main/kotlin/com/psr/psr/cs/entity/Notice.kt index 3a27d60..3109d7b 100644 --- a/src/main/kotlin/com/psr/psr/cs/entity/Notice.kt +++ b/src/main/kotlin/com/psr/psr/cs/entity/Notice.kt @@ -1,6 +1,7 @@ package com.psr.psr.cs.entity import com.psr.psr.global.entity.BaseEntity +import jakarta.persistence.Column import jakarta.persistence.Entity import jakarta.persistence.GeneratedValue import jakarta.persistence.GenerationType @@ -13,9 +14,11 @@ data class Notice( var id: Long, @NotNull + @Column(length = 100) var title: String, @NotNull + @Column(length = 500) var content: String, var imgKey: String diff --git a/src/main/kotlin/com/psr/psr/inquiry/entity/Inquiry.kt b/src/main/kotlin/com/psr/psr/inquiry/entity/Inquiry.kt index 997b456..3c08c33 100644 --- a/src/main/kotlin/com/psr/psr/inquiry/entity/Inquiry.kt +++ b/src/main/kotlin/com/psr/psr/inquiry/entity/Inquiry.kt @@ -15,6 +15,7 @@ data class Inquiry( var user: User, @NotNull + @Column(length = 100) var title: String, @NotNull diff --git a/src/main/kotlin/com/psr/psr/notification/entity/Notification.kt b/src/main/kotlin/com/psr/psr/notification/entity/Notification.kt index f8eccd7..230ae1d 100644 --- a/src/main/kotlin/com/psr/psr/notification/entity/Notification.kt +++ b/src/main/kotlin/com/psr/psr/notification/entity/Notification.kt @@ -1,10 +1,7 @@ package com.psr.psr.notification.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 @@ -13,6 +10,7 @@ data class Notification( var id: Long, @NotNull + @Column(length = 100) var title: String, @NotNull diff --git a/src/main/kotlin/com/psr/psr/order/entity/Order.kt b/src/main/kotlin/com/psr/psr/order/entity/Order.kt index 367bc34..2beca77 100644 --- a/src/main/kotlin/com/psr/psr/order/entity/Order.kt +++ b/src/main/kotlin/com/psr/psr/order/entity/Order.kt @@ -20,6 +20,7 @@ data class Order( var user: User, @NotNull + @Column(length = 100) var ordererName: String, @NotNull 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 index 5c72c62..5d7fac1 100644 --- a/src/main/kotlin/com/psr/psr/product/entity/product/Product.kt +++ b/src/main/kotlin/com/psr/psr/product/entity/product/Product.kt @@ -16,6 +16,7 @@ data class Product( var user: User, @NotNull + @Column(length = 50) var name: String, @NotNull 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 index 65758f2..c38253f 100644 --- a/src/main/kotlin/com/psr/psr/product/entity/product/ProductLike.kt +++ b/src/main/kotlin/com/psr/psr/product/entity/product/ProductLike.kt @@ -16,4 +16,5 @@ data class ProductLike( @ManyToOne @JoinColumn(nullable = false, name = "user_idx") var user: User + ): BaseEntity() diff --git a/src/main/kotlin/com/psr/psr/user/entity/User.kt b/src/main/kotlin/com/psr/psr/user/entity/User.kt index 82fe041..aec2b78 100644 --- a/src/main/kotlin/com/psr/psr/user/entity/User.kt +++ b/src/main/kotlin/com/psr/psr/user/entity/User.kt @@ -1,10 +1,7 @@ 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 @@ -13,18 +10,22 @@ data class User( var id: Long, @NotNull + @Column(length = 100) var email: String, @NotNull + @Column(length = 300) var password:String, @NotNull var type:Type, @NotNull + @Column(length = 30) var nickname:String, @NotNull + @Column(length = 15) var phone:String, var profileImgKey: String, From 58fcac22e7c4bd19f1a6e72baf2dcbc0c9625942 Mon Sep 17 00:00:00 2001 From: sojungpp Date: Sat, 22 Jul 2023 04:37:20 +0900 Subject: [PATCH 04/10] =?UTF-8?q?#1=20feat:=20likeNum=20default=EA=B0=92?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/psr/psr/product/entity/product/Product.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 index 5d7fac1..6283b7c 100644 --- a/src/main/kotlin/com/psr/psr/product/entity/product/Product.kt +++ b/src/main/kotlin/com/psr/psr/product/entity/product/Product.kt @@ -28,5 +28,6 @@ data class Product( @NotNull var description: String, - var likeNum: Int + var likeNum: Int = 0 + ): BaseEntity() From 6d48d4d9e8aa6891d281ef0df4f8955aab5a1519 Mon Sep 17 00:00:00 2001 From: sojungpp Date: Sat, 22 Jul 2023 04:41:45 +0900 Subject: [PATCH 05/10] =?UTF-8?q?#1=20feat:=20InquiryStatus=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/psr/psr/inquiry/entity/InquiryStatus.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/com/psr/psr/inquiry/entity/InquiryStatus.kt b/src/main/kotlin/com/psr/psr/inquiry/entity/InquiryStatus.kt index 8234a79..502221e 100644 --- a/src/main/kotlin/com/psr/psr/inquiry/entity/InquiryStatus.kt +++ b/src/main/kotlin/com/psr/psr/inquiry/entity/InquiryStatus.kt @@ -1,5 +1,6 @@ package com.psr.psr.inquiry.entity enum class InquiryStatus(val value: String) { - + PROGRESSING("진행중"), + COMPLETED("완료") } \ No newline at end of file From 2582947a052907d43a8e986462a769bd1bbc5d9c Mon Sep 17 00:00:00 2001 From: sojungpp Date: Sun, 23 Jul 2023 21:39:39 +0900 Subject: [PATCH 06/10] =?UTF-8?q?#1=20fix:=20JoinColumn=20idx=20->=20id=20?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/psr/psr/chat/entity/ChatRoom.kt | 4 ++-- src/main/kotlin/com/psr/psr/inquiry/entity/Inquiry.kt | 2 +- src/main/kotlin/com/psr/psr/order/entity/Order.kt | 4 ++-- src/main/kotlin/com/psr/psr/product/entity/product/Product.kt | 2 +- .../kotlin/com/psr/psr/product/entity/product/ProductLike.kt | 4 ++-- .../com/psr/psr/product/entity/product/ProductReport.kt | 4 ++-- src/main/kotlin/com/psr/psr/product/entity/review/Review.kt | 4 ++-- .../kotlin/com/psr/psr/product/entity/review/ReviewReport.kt | 4 ++-- src/main/kotlin/com/psr/psr/user/entity/BusinessInfo.kt | 2 +- src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt | 2 +- 10 files changed, 16 insertions(+), 16 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 index 5fa91a5..9d9583c 100644 --- a/src/main/kotlin/com/psr/psr/chat/entity/ChatRoom.kt +++ b/src/main/kotlin/com/psr/psr/chat/entity/ChatRoom.kt @@ -10,11 +10,11 @@ data class ChatRoom( var id: Long, @ManyToOne - @JoinColumn(nullable = false, name = "sender_user_idx") + @JoinColumn(nullable = false, name = "sender_user_id") var senderUser: User, @ManyToOne - @JoinColumn(nullable = false, name = "receiver_user_idx") + @JoinColumn(nullable = false, name = "receiver_user_id") var receiverUser: User ): 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 index 3c08c33..307f51f 100644 --- a/src/main/kotlin/com/psr/psr/inquiry/entity/Inquiry.kt +++ b/src/main/kotlin/com/psr/psr/inquiry/entity/Inquiry.kt @@ -11,7 +11,7 @@ data class Inquiry( var id: Long, @ManyToOne - @JoinColumn(nullable = false, name = "user_idx") + @JoinColumn(nullable = false, name = "user_id") var user: User, @NotNull diff --git a/src/main/kotlin/com/psr/psr/order/entity/Order.kt b/src/main/kotlin/com/psr/psr/order/entity/Order.kt index 2beca77..2a8691c 100644 --- a/src/main/kotlin/com/psr/psr/order/entity/Order.kt +++ b/src/main/kotlin/com/psr/psr/order/entity/Order.kt @@ -12,11 +12,11 @@ data class Order( var id: Long, @ManyToOne - @JoinColumn(nullable = false, name = "product_idx") + @JoinColumn(nullable = false, name = "product_id") var product: Product, @ManyToOne - @JoinColumn(nullable = false, name = "user_idx") + @JoinColumn(nullable = false, name = "user_id") var user: User, @NotNull 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 index 6283b7c..97cda32 100644 --- a/src/main/kotlin/com/psr/psr/product/entity/product/Product.kt +++ b/src/main/kotlin/com/psr/psr/product/entity/product/Product.kt @@ -12,7 +12,7 @@ data class Product( var id: Long, @ManyToOne - @JoinColumn(nullable = false, name = "user_idx") + @JoinColumn(nullable = false, name = "user_id") var user: User, @NotNull 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 index c38253f..87e10f1 100644 --- a/src/main/kotlin/com/psr/psr/product/entity/product/ProductLike.kt +++ b/src/main/kotlin/com/psr/psr/product/entity/product/ProductLike.kt @@ -10,11 +10,11 @@ data class ProductLike( var id: Long, @ManyToOne - @JoinColumn(nullable = false, name = "product_idx") + @JoinColumn(nullable = false, name = "product_id") var product: Product, @ManyToOne - @JoinColumn(nullable = false, name = "user_idx") + @JoinColumn(nullable = false, name = "user_id") 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 index 6df0b0f..45c0925 100644 --- a/src/main/kotlin/com/psr/psr/product/entity/product/ProductReport.kt +++ b/src/main/kotlin/com/psr/psr/product/entity/product/ProductReport.kt @@ -12,11 +12,11 @@ data class ProductReport( var id: Long, @ManyToOne - @JoinColumn(nullable = false, name = "product_idx") + @JoinColumn(nullable = false, name = "product_id") var product: Product, @ManyToOne - @JoinColumn(nullable = false, name = "user_idx") + @JoinColumn(nullable = false, name = "user_id") var user: User, @NotNull 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 index 536233d..79ea922 100644 --- a/src/main/kotlin/com/psr/psr/product/entity/review/Review.kt +++ b/src/main/kotlin/com/psr/psr/product/entity/review/Review.kt @@ -12,11 +12,11 @@ data class Review( var id: Long, @ManyToOne - @JoinColumn(nullable = false, name = "product_idx") + @JoinColumn(nullable = false, name = "product_id") var product: Product, @ManyToOne - @JoinColumn(nullable = false, name = "user_idx") + @JoinColumn(nullable = false, name = "user_id") var user: User, @NotNull 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 index e4ebc03..e382ba3 100644 --- a/src/main/kotlin/com/psr/psr/product/entity/review/ReviewReport.kt +++ b/src/main/kotlin/com/psr/psr/product/entity/review/ReviewReport.kt @@ -11,11 +11,11 @@ data class ReviewReport( var id: Long, @ManyToOne - @JoinColumn(nullable = false, name = "review_idx") + @JoinColumn(nullable = false, name = "review_id") var review: Review, @ManyToOne - @JoinColumn(nullable = false, name = "user_idx") + @JoinColumn(nullable = false, name = "user_id") var user: User, var category: ReportCategory diff --git a/src/main/kotlin/com/psr/psr/user/entity/BusinessInfo.kt b/src/main/kotlin/com/psr/psr/user/entity/BusinessInfo.kt index ed42a2e..fc600f6 100644 --- a/src/main/kotlin/com/psr/psr/user/entity/BusinessInfo.kt +++ b/src/main/kotlin/com/psr/psr/user/entity/BusinessInfo.kt @@ -10,7 +10,7 @@ data class BusinessInfo( var id: Long, @OneToOne - @JoinColumn(nullable = false, name = "user_idx") + @JoinColumn(nullable = false, name = "user_id") var user: User, @NotNull diff --git a/src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt b/src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt index ac6a4f9..0ee5477 100644 --- a/src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt +++ b/src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt @@ -10,7 +10,7 @@ data class UserInterest( var id: Long, @ManyToOne - @JoinColumn(nullable = false, name = "user_idx") + @JoinColumn(nullable = false, name = "user_id") var user: User, @NotNull From b88877a58259a92b1a65a521358a3d6770dde215 Mon Sep 17 00:00:00 2001 From: sojungpp Date: Sun, 23 Jul 2023 21:41:41 +0900 Subject: [PATCH 07/10] =?UTF-8?q?#1=20feat:=20enumType=20String=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/psr/psr/cs/entity/Faq.kt | 1 + src/main/kotlin/com/psr/psr/inquiry/entity/Inquiry.kt | 1 + src/main/kotlin/com/psr/psr/order/entity/Order.kt | 1 + src/main/kotlin/com/psr/psr/product/entity/product/Product.kt | 1 + .../kotlin/com/psr/psr/product/entity/product/ProductReport.kt | 1 + .../kotlin/com/psr/psr/product/entity/review/ReviewReport.kt | 2 ++ src/main/kotlin/com/psr/psr/user/entity/User.kt | 2 ++ src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt | 1 + 8 files changed, 10 insertions(+) diff --git a/src/main/kotlin/com/psr/psr/cs/entity/Faq.kt b/src/main/kotlin/com/psr/psr/cs/entity/Faq.kt index b08f6ce..2a86286 100644 --- a/src/main/kotlin/com/psr/psr/cs/entity/Faq.kt +++ b/src/main/kotlin/com/psr/psr/cs/entity/Faq.kt @@ -17,6 +17,7 @@ data class Faq( var content: String, @NotNull + @Enumerated(EnumType.STRING) var type: FaqType ): 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 index 307f51f..6a3778c 100644 --- a/src/main/kotlin/com/psr/psr/inquiry/entity/Inquiry.kt +++ b/src/main/kotlin/com/psr/psr/inquiry/entity/Inquiry.kt @@ -22,6 +22,7 @@ data class Inquiry( var content: String, @NotNull + @Enumerated(EnumType.STRING) var inquiryStatus: InquiryStatus, var answer: String diff --git a/src/main/kotlin/com/psr/psr/order/entity/Order.kt b/src/main/kotlin/com/psr/psr/order/entity/Order.kt index 2a8691c..1216a55 100644 --- a/src/main/kotlin/com/psr/psr/order/entity/Order.kt +++ b/src/main/kotlin/com/psr/psr/order/entity/Order.kt @@ -27,6 +27,7 @@ data class Order( var websiteUrl: String, @NotNull + @Enumerated(EnumType.STRING) var orderStatus: OrderStatus, @NotNull 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 index 97cda32..086a3b8 100644 --- a/src/main/kotlin/com/psr/psr/product/entity/product/Product.kt +++ b/src/main/kotlin/com/psr/psr/product/entity/product/Product.kt @@ -20,6 +20,7 @@ data class Product( var name: String, @NotNull + @Enumerated(EnumType.STRING) var category: Category, @NotNull 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 index 45c0925..3f0f436 100644 --- a/src/main/kotlin/com/psr/psr/product/entity/product/ProductReport.kt +++ b/src/main/kotlin/com/psr/psr/product/entity/product/ProductReport.kt @@ -20,6 +20,7 @@ data class ProductReport( var user: User, @NotNull + @Enumerated(EnumType.STRING) var category: ReportCategory ): 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 index e382ba3..eb80b8f 100644 --- a/src/main/kotlin/com/psr/psr/product/entity/review/ReviewReport.kt +++ b/src/main/kotlin/com/psr/psr/product/entity/review/ReviewReport.kt @@ -4,6 +4,7 @@ import com.psr.psr.global.entity.BaseEntity 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 ReviewReport( @@ -18,6 +19,7 @@ data class ReviewReport( @JoinColumn(nullable = false, name = "user_id") var user: User, + @Enumerated(EnumType.STRING) var category: ReportCategory diff --git a/src/main/kotlin/com/psr/psr/user/entity/User.kt b/src/main/kotlin/com/psr/psr/user/entity/User.kt index aec2b78..14bf2ec 100644 --- a/src/main/kotlin/com/psr/psr/user/entity/User.kt +++ b/src/main/kotlin/com/psr/psr/user/entity/User.kt @@ -18,6 +18,7 @@ data class User( var password:String, @NotNull + @Enumerated(EnumType.STRING) var type:Type, @NotNull @@ -31,6 +32,7 @@ data class User( var profileImgKey: String, @NotNull + @Enumerated(EnumType.STRING) var provider: Provider, @NotNull diff --git a/src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt b/src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt index 0ee5477..afa0646 100644 --- a/src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt +++ b/src/main/kotlin/com/psr/psr/user/entity/UserInterest.kt @@ -14,6 +14,7 @@ data class UserInterest( var user: User, @NotNull + @Enumerated(EnumType.STRING) var category: Category ): BaseEntity() From 20d0c70afc763b101150765fc695e081de611aaf Mon Sep 17 00:00:00 2001 From: sojungpp Date: Sun, 23 Jul 2023 21:43:41 +0900 Subject: [PATCH 08/10] =?UTF-8?q?#1=20fix:=20=EC=9D=B4=EB=AF=B8=EC=A7=80?= =?UTF-8?q?=20=EC=BB=AC=EB=9F=BC=EB=AA=85=20imgKey=EB=A1=9C=20=ED=86=B5?= =?UTF-8?q?=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/psr/psr/user/entity/User.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/psr/psr/user/entity/User.kt b/src/main/kotlin/com/psr/psr/user/entity/User.kt index 14bf2ec..36a904f 100644 --- a/src/main/kotlin/com/psr/psr/user/entity/User.kt +++ b/src/main/kotlin/com/psr/psr/user/entity/User.kt @@ -29,7 +29,7 @@ data class User( @Column(length = 15) var phone:String, - var profileImgKey: String, + var imgKey: String, @NotNull @Enumerated(EnumType.STRING) From feb1222e212dee7820bc92870dfdde73ece7f997 Mon Sep 17 00:00:00 2001 From: sojungpp Date: Sun, 23 Jul 2023 21:59:56 +0900 Subject: [PATCH 09/10] =?UTF-8?q?#1=20fix:=20reportCategory=20=EC=A2=85?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/psr/psr/product/entity/ReportCategory.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/psr/psr/product/entity/ReportCategory.kt b/src/main/kotlin/com/psr/psr/product/entity/ReportCategory.kt index 2b4c031..95e0c1f 100644 --- a/src/main/kotlin/com/psr/psr/product/entity/ReportCategory.kt +++ b/src/main/kotlin/com/psr/psr/product/entity/ReportCategory.kt @@ -1,8 +1,9 @@ package com.psr.psr.product.entity enum class ReportCategory(val value: String) { - JUNK("홍보/도배"), + JUNK("스팸홍보/도배"), + ABUSE("욕설/혐오/차별"), PORN("음란물/유해한 정보"), - POOR_CONTENT("내용이 부실함"), + FRAUD("사기/불법정보"), NOT_FIT("게시글 성격에 부적합함") } \ No newline at end of file From 1965998b59a8fbd02b521d26d3265b96a05be531 Mon Sep 17 00:00:00 2001 From: sojungpp Date: Sun, 23 Jul 2023 22:00:38 +0900 Subject: [PATCH 10/10] =?UTF-8?q?#1=20fix:=20reportCategory=20notnull=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/com/psr/psr/product/entity/review/ReviewReport.kt | 1 + 1 file changed, 1 insertion(+) 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 index eb80b8f..db8f2e6 100644 --- a/src/main/kotlin/com/psr/psr/product/entity/review/ReviewReport.kt +++ b/src/main/kotlin/com/psr/psr/product/entity/review/ReviewReport.kt @@ -19,6 +19,7 @@ data class ReviewReport( @JoinColumn(nullable = false, name = "user_id") var user: User, + @NotNull @Enumerated(EnumType.STRING) var category: ReportCategory