From 998eb32deb2e534da22d4f3eed5f5721d4ea30c0 Mon Sep 17 00:00:00 2001 From: hoon7566 Date: Wed, 26 Jan 2022 14:34:46 +0900 Subject: [PATCH] update order-service jpa --- .../justpickup/orderservice/domain/order/entity/Order.java | 3 ++- .../orderservice/domain/order/entity/OrderStatus.java | 2 +- .../orderservice/domain/orderItem/entity/OrderItem.java | 3 ++- .../domain/orderItemOption/entity/OrderItemOption.java | 5 +++-- .../orderservice/domain/transaction/entity/Transaction.java | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/Order.java b/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/Order.java index 7b3073f..906b4b2 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/Order.java +++ b/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/Order.java @@ -3,6 +3,7 @@ package com.justpickup.orderservice.domain.order.entity; import com.justpickup.orderservice.domain.orderItem.entity.OrderItem; import com.justpickup.orderservice.domain.transaction.entity.Transaction; import com.justpickup.orderservice.global.entity.BaseEntity; +import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @@ -13,7 +14,7 @@ import java.util.List; @Entity @Table(name = "orders") @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class Order extends BaseEntity { @Id @GeneratedValue diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/OrderStatus.java b/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/OrderStatus.java index c524418..2ff4f7f 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/OrderStatus.java +++ b/order-service/src/main/java/com/justpickup/orderservice/domain/order/entity/OrderStatus.java @@ -1,8 +1,8 @@ package com.justpickup.orderservice.domain.order.entity; public enum OrderStatus { + PENDING, PLACED, CANCELED, - SUCCESS, FAILED } diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/orderItem/entity/OrderItem.java b/order-service/src/main/java/com/justpickup/orderservice/domain/orderItem/entity/OrderItem.java index 556b5c5..d9d21d2 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/domain/orderItem/entity/OrderItem.java +++ b/order-service/src/main/java/com/justpickup/orderservice/domain/orderItem/entity/OrderItem.java @@ -3,6 +3,7 @@ package com.justpickup.orderservice.domain.orderItem.entity; import com.justpickup.orderservice.domain.order.entity.Order; import com.justpickup.orderservice.domain.orderItemOption.entity.OrderItemOption; import com.justpickup.orderservice.global.entity.BaseEntity; +import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @@ -12,7 +13,7 @@ import java.util.List; @Entity @Table(name = "order_item") @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class OrderItem extends BaseEntity { @Id @GeneratedValue diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/orderItemOption/entity/OrderItemOption.java b/order-service/src/main/java/com/justpickup/orderservice/domain/orderItemOption/entity/OrderItemOption.java index 91dfa8e..28148bb 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/domain/orderItemOption/entity/OrderItemOption.java +++ b/order-service/src/main/java/com/justpickup/orderservice/domain/orderItemOption/entity/OrderItemOption.java @@ -2,15 +2,16 @@ package com.justpickup.orderservice.domain.orderItemOption.entity; import com.justpickup.orderservice.domain.orderItem.entity.OrderItem; import com.justpickup.orderservice.global.entity.BaseEntity; +import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; import javax.persistence.*; @Entity -@Table(name = "order_item") +@Table(name = "order_item_option") @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class OrderItemOption extends BaseEntity { @Id @GeneratedValue diff --git a/order-service/src/main/java/com/justpickup/orderservice/domain/transaction/entity/Transaction.java b/order-service/src/main/java/com/justpickup/orderservice/domain/transaction/entity/Transaction.java index 6c7bad3..3f230df 100644 --- a/order-service/src/main/java/com/justpickup/orderservice/domain/transaction/entity/Transaction.java +++ b/order-service/src/main/java/com/justpickup/orderservice/domain/transaction/entity/Transaction.java @@ -2,6 +2,7 @@ package com.justpickup.orderservice.domain.transaction.entity; import com.justpickup.orderservice.domain.order.entity.Order; import com.justpickup.orderservice.global.entity.BaseEntity; +import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @@ -10,7 +11,7 @@ import javax.persistence.*; @Entity @Table(name = "transaction") @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class Transaction extends BaseEntity { @Id @GeneratedValue