[#23] create Entity, schema about Item & Order

src/main/java/me/jjeda/mall/accounts/domain/Account.java

@@ -6,7 +6,9 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import me.jjeda.mall.accounts.dto.AccountDto;
+import me.jjeda.mall.common.model.Address;
 
+import javax.persistence.Column;
 import javax.persistence.ElementCollection;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
@@ -27,6 +29,7 @@ public class Account {
 
     @Id
     @GeneratedValue
+    @Column(name = "account_id")
     private Long id;
 
     private String nickname;

src/main/java/me/jjeda/mall/accounts/dto/AccountDto.java

@@ -6,7 +6,7 @@
 import me.jjeda.mall.accounts.domain.Account;
 import me.jjeda.mall.accounts.domain.AccountRole;
 import me.jjeda.mall.accounts.domain.AccountStatus;
-import me.jjeda.mall.accounts.domain.Address;
+import me.jjeda.mall.common.model.Address;
 
 import javax.persistence.Column;
 import javax.validation.constraints.Email;

src/main/java/me/jjeda/mall/accounts/domain/Address.java → src/main/java/me/jjeda/mall/common/model/Address.java

@@ -1,13 +1,15 @@
-package me.jjeda.mall.accounts.domain;
+package me.jjeda.mall.common.model;
 
 import lombok.AllArgsConstructor;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Embeddable;
 
 @Embeddable
 @AllArgsConstructor
 @NoArgsConstructor
+@Getter
 public class Address {
 
     private String city;

src/main/java/me/jjeda/mall/items/domain/Category.java

@@ -0,0 +1,20 @@
+package me.jjeda.mall.items.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+@Getter @Setter
+public class Category {
+
+    @Id @GeneratedValue
+    @Column(name = "category_id")
+    private Long id;
+
+    private String name;
+}

src/main/java/me/jjeda/mall/items/domain/Item.java

@@ -0,0 +1,31 @@
+package me.jjeda.mall.items.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Getter @Setter
+public class Item {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "item_id")
+    private Long id;
+
+    private String name;
+
+    private int price;
+
+    private int stockQuantity;
+
+    @OneToMany(mappedBy = "item")
+    private List<ItemCategory> itemCategories = new ArrayList<>();
+}

src/main/java/me/jjeda/mall/items/domain/ItemCategory.java

@@ -0,0 +1,29 @@
+package me.jjeda.mall.items.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+@Entity
+@Getter @Setter
+public class ItemCategory {
+
+    @Id @GeneratedValue
+    @Column(name = "item_category_id")
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "item_id")
+    private Item item;
+
+    @ManyToOne
+    @JoinColumn(name = "category_id")
+    private Category category;
+
+}

src/main/java/me/jjeda/mall/orders/domain/Delivery.java

@@ -0,0 +1,34 @@
+package me.jjeda.mall.orders.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+import me.jjeda.mall.common.model.Address;
+
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToOne;
+
+@Entity
+@Getter @Setter
+public class Delivery {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "delivery_id")
+    private Long id;
+
+    @OneToOne(mappedBy = "delivery")
+    private Order order;
+
+    @Embedded
+    private Address address;
+
+    @Enumerated(EnumType.STRING)
+    private DeliveryStatus status;
+
+}

src/main/java/me/jjeda/mall/orders/domain/DeliveryStatus.java

@@ -0,0 +1,10 @@
+package me.jjeda.mall.orders.domain;
+
+/**
+ * READY : 배송 준비
+ * DELIVERY : 배송 중
+ * COMP : 배송 완료
+ */
+public enum DeliveryStatus {
+    READY, DELIVERY, COMP
+}

src/main/java/me/jjeda/mall/orders/domain/Order.java

@@ -0,0 +1,52 @@
+package me.jjeda.mall.orders.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+import me.jjeda.mall.accounts.domain.Account;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Getter @Setter
+@Table(name = "orders", indexes = {@Index(columnList = "orderAt")} )
+public class Order {
+
+    @Id @GeneratedValue
+    @Column(name = "order_id")
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "account_id")
+    private Account account;
+
+    /**
+     * 주로 access 하는 Order를 연관관계의 주인으로 설정
+     */
+    @OneToOne
+    @JoinColumn(name = "delivery_id")
+    private Delivery delivery;
+
+    @OneToMany(mappedBy = "order")
+    @NotNull
+    private List<OrderItem> orderItems;
+
+    private LocalDateTime orderAt;
+
+    @Enumerated(EnumType.STRING)
+    private OrderStatus status;
+}

src/main/java/me/jjeda/mall/orders/domain/OrderItem.java

@@ -0,0 +1,33 @@
+package me.jjeda.mall.orders.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+import me.jjeda.mall.items.domain.Item;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+@Entity
+@Getter @Setter
+public class OrderItem {
+
+    @Id @GeneratedValue
+    @Column(name = "order_item_id")
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "item_id")
+    private Item item;
+
+    @ManyToOne
+    @JoinColumn(name = "order_id")
+    private Order order;
+
+    private int orderPrice;
+
+    private int count;
+}

src/main/java/me/jjeda/mall/orders/domain/OrderStatus.java

@@ -0,0 +1,9 @@
+package me.jjeda.mall.orders.domain;
+
+/**
+ * ORDER : 주문
+ * CANCEL : 주문취소
+ */
+public enum OrderStatus {
+    ORDER, CANCEL
+}

src/main/resources/application-defalut.properties → src/main/resources/application-default.properties

@@ -1,7 +1,8 @@
-spring.datasource.url=jdbc:mysql://localhost:3306/mall
+spring.datasource.url=jdbc:mysql://localhost:3306/mall?serverTimezone=UTC
 spring.datasource.username=root
 spring.datasource.password=root
 
+
 spring.jpa.hibernate.ddl-auto=validate
 
 spring.jpa.show-sql=true

src/main/resources/schema.sql

@@ -1,5 +1,5 @@
 create table account (
-    id bigint not null,
+    account_id bigint not null,
     city varchar(255),
     street varchar(255),
     zip_code varchar(255),
@@ -10,8 +10,64 @@ create table account (
     password varchar(255),
     phone varchar(255),
     status varchar(255),
-    primary key (id));
+    primary key (account_id));
 
 create table account_account_role (
     account_id bigint not null,
-     account_role varchar(255));
+     account_role varchar(255),
+     foreign key (account_account_id) references account (account_id));
+
+ create table category (
+    category_id bigint not null,
+     name varchar(255),
+     primary key (category_id));
+
+ create table item (
+    item_id bigint not null,
+     name varchar(255),
+     price integer not null,
+     stock_quantity integer not null,
+     primary key (item_id));
+
+ create table item_category (
+    item_category_id bigint not null,
+     category_id bigint,
+     item_id bigint,
+     primary key (item_category_id),
+     foreign key (category_id) references category (category_id),
+     foreign key (item_id) references item (item_id));
+
+ create table orders (
+    order_id bigint not null,
+     order_at datetime not null,
+     status varchar(255),
+     account_id bigint,
+     delivery_id bigint,
+     index (order_at),
+     primary key (order_id),
+     foreign key (account_id) references account (account_id)
+     foreign key (delivery_id) references delivery (delivery_id));
+
+ create table order_item (
+    order_item_id bigint not null,
+     count integer not null,
+     order_price integer not null,
+     item_id bigint,
+     order_id bigint,
+     primary key (order_item_id),
+     foreign key (item_id) references item (item_id),
+     foreign key (order_id) references orders (order_id));
+
+ create table delivery (
+    delivery_id bigint not null,
+     city varchar(255),
+     street varchar(255),
+     zip_code varchar(255),
+     status varchar(255),
+     primary key (delivery_id));
+
+
+
+
+
+

src/test/java/me/jjeda/mall/accounts/configs/AuthServerConfigTest.java

@@ -2,7 +2,7 @@
 
 import me.jjeda.mall.accounts.Service.AccountService;
 import me.jjeda.mall.accounts.domain.AccountRole;
-import me.jjeda.mall.accounts.domain.Address;
+import me.jjeda.mall.common.model.Address;
 import me.jjeda.mall.accounts.dto.AccountDto;
 import me.jjeda.mall.common.TestDescription;
 import org.junit.Test;

src/test/java/me/jjeda/mall/accounts/controller/AccountControllerTest.java

@@ -4,7 +4,7 @@
 import me.jjeda.mall.accounts.common.BaseControllerTest;
 import me.jjeda.mall.accounts.domain.Account;
 import me.jjeda.mall.accounts.domain.AccountRole;
-import me.jjeda.mall.accounts.domain.Address;
+import me.jjeda.mall.common.model.Address;
 import me.jjeda.mall.accounts.dto.AccountDto;
 import me.jjeda.mall.accounts.repository.AccountRepository;
 import me.jjeda.mall.common.TestDescription;

src/test/java/me/jjeda/mall/accounts/controller/AdminAccountControllerTest.java

@@ -4,7 +4,7 @@
 import me.jjeda.mall.accounts.common.BaseControllerTest;
 import me.jjeda.mall.accounts.domain.Account;
 import me.jjeda.mall.accounts.domain.AccountRole;
-import me.jjeda.mall.accounts.domain.Address;
+import me.jjeda.mall.common.model.Address;
 import me.jjeda.mall.accounts.dto.AccountDto;
 import me.jjeda.mall.accounts.repository.AccountRepository;
 import me.jjeda.mall.common.TestDescription;