From 49c067ef18dab242d5893a161082af453be4ff93 Mon Sep 17 00:00:00 2001 From: jjeda Date: Sun, 29 Sep 2019 04:59:19 +0900 Subject: [PATCH 1/2] [#23] create Entity, schema about Item & Order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 아이템 도메인 생성 ( 카테고리, 아이템 다대다 매핑) - 주문 도메인 생성 ( delivery <-> order 1:1 매핑 / Order <-> item n:m 매핑 / Account <-> order 1:n 매핑) - 스키마 생성 --- .../jjeda/mall/accounts/domain/Account.java | 3 ++ .../jjeda/mall/accounts/dto/AccountDto.java | 2 +- .../{accounts/domain => common}/Address.java | 4 +- .../me/jjeda/mall/items/domain/Category.java | 20 ++++++++ .../java/me/jjeda/mall/items/domain/Item.java | 31 ++++++++++++ .../jjeda/mall/items/domain/ItemCategory.java | 29 +++++++++++ .../me/jjeda/mall/orders/domain/Delivery.java | 34 +++++++++++++ .../mall/orders/domain/DeliveryStatus.java | 10 ++++ .../me/jjeda/mall/orders/domain/Order.java | 49 +++++++++++++++++++ .../jjeda/mall/orders/domain/OrderItem.java | 33 +++++++++++++ .../jjeda/mall/orders/domain/OrderStatus.java | 9 ++++ ...perties => application-default.properties} | 3 +- src/main/resources/schema.sql | 44 ++++++++++++++++- .../configs/AuthServerConfigTest.java | 2 +- .../controller/AccountControllerTest.java | 2 +- .../AdminAccountControllerTest.java | 2 +- 16 files changed, 270 insertions(+), 7 deletions(-) rename src/main/java/me/jjeda/mall/{accounts/domain => common}/Address.java (81%) create mode 100644 src/main/java/me/jjeda/mall/items/domain/Category.java create mode 100644 src/main/java/me/jjeda/mall/items/domain/Item.java create mode 100644 src/main/java/me/jjeda/mall/items/domain/ItemCategory.java create mode 100644 src/main/java/me/jjeda/mall/orders/domain/Delivery.java create mode 100644 src/main/java/me/jjeda/mall/orders/domain/DeliveryStatus.java create mode 100644 src/main/java/me/jjeda/mall/orders/domain/Order.java create mode 100644 src/main/java/me/jjeda/mall/orders/domain/OrderItem.java create mode 100644 src/main/java/me/jjeda/mall/orders/domain/OrderStatus.java rename src/main/resources/{application-defalut.properties => application-default.properties} (70%) diff --git a/src/main/java/me/jjeda/mall/accounts/domain/Account.java b/src/main/java/me/jjeda/mall/accounts/domain/Account.java index 28b4e7f..acfa471 100644 --- a/src/main/java/me/jjeda/mall/accounts/domain/Account.java +++ b/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.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; diff --git a/src/main/java/me/jjeda/mall/accounts/dto/AccountDto.java b/src/main/java/me/jjeda/mall/accounts/dto/AccountDto.java index 120ce3f..f0ed9f4 100644 --- a/src/main/java/me/jjeda/mall/accounts/dto/AccountDto.java +++ b/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.Address; import javax.persistence.Column; import javax.validation.constraints.Email; diff --git a/src/main/java/me/jjeda/mall/accounts/domain/Address.java b/src/main/java/me/jjeda/mall/common/Address.java similarity index 81% rename from src/main/java/me/jjeda/mall/accounts/domain/Address.java rename to src/main/java/me/jjeda/mall/common/Address.java index e85f01f..54e02c9 100644 --- a/src/main/java/me/jjeda/mall/accounts/domain/Address.java +++ b/src/main/java/me/jjeda/mall/common/Address.java @@ -1,6 +1,7 @@ -package me.jjeda.mall.accounts.domain; +package me.jjeda.mall.common; import lombok.AllArgsConstructor; +import lombok.Getter; import lombok.NoArgsConstructor; import javax.persistence.Embeddable; @@ -8,6 +9,7 @@ @Embeddable @AllArgsConstructor @NoArgsConstructor +@Getter public class Address { private String city; diff --git a/src/main/java/me/jjeda/mall/items/domain/Category.java b/src/main/java/me/jjeda/mall/items/domain/Category.java new file mode 100644 index 0000000..f25287a --- /dev/null +++ b/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; +} diff --git a/src/main/java/me/jjeda/mall/items/domain/Item.java b/src/main/java/me/jjeda/mall/items/domain/Item.java new file mode 100644 index 0000000..917be6a --- /dev/null +++ b/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 itemCategories = new ArrayList<>(); +} diff --git a/src/main/java/me/jjeda/mall/items/domain/ItemCategory.java b/src/main/java/me/jjeda/mall/items/domain/ItemCategory.java new file mode 100644 index 0000000..25ce21b --- /dev/null +++ b/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; + +} diff --git a/src/main/java/me/jjeda/mall/orders/domain/Delivery.java b/src/main/java/me/jjeda/mall/orders/domain/Delivery.java new file mode 100644 index 0000000..8dce910 --- /dev/null +++ b/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.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; + +} diff --git a/src/main/java/me/jjeda/mall/orders/domain/DeliveryStatus.java b/src/main/java/me/jjeda/mall/orders/domain/DeliveryStatus.java new file mode 100644 index 0000000..90876f8 --- /dev/null +++ b/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 +} diff --git a/src/main/java/me/jjeda/mall/orders/domain/Order.java b/src/main/java/me/jjeda/mall/orders/domain/Order.java new file mode 100644 index 0000000..0026707 --- /dev/null +++ b/src/main/java/me/jjeda/mall/orders/domain/Order.java @@ -0,0 +1,49 @@ +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.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter @Setter +@Table(name = "orders") +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") + private List orderItems = new ArrayList<>(); + + private LocalDateTime orderAt; + + @Enumerated(EnumType.STRING) + private OrderStatus status; +} diff --git a/src/main/java/me/jjeda/mall/orders/domain/OrderItem.java b/src/main/java/me/jjeda/mall/orders/domain/OrderItem.java new file mode 100644 index 0000000..b612b9f --- /dev/null +++ b/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; +} diff --git a/src/main/java/me/jjeda/mall/orders/domain/OrderStatus.java b/src/main/java/me/jjeda/mall/orders/domain/OrderStatus.java new file mode 100644 index 0000000..1aeb537 --- /dev/null +++ b/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 +} diff --git a/src/main/resources/application-defalut.properties b/src/main/resources/application-default.properties similarity index 70% rename from src/main/resources/application-defalut.properties rename to src/main/resources/application-default.properties index 26a6b7b..0732352 100644 --- a/src/main/resources/application-defalut.properties +++ b/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 diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql index 97887ac..3fbaed2 100644 --- a/src/main/resources/schema.sql +++ b/src/main/resources/schema.sql @@ -10,8 +10,50 @@ 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)); + + 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)); + + create table orders ( + order_id bigint not null, + order_at datetime, + status varchar(255), + account_id bigint, + delivery_id bigint, + primary key (order_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)); + + 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)); \ No newline at end of file diff --git a/src/test/java/me/jjeda/mall/accounts/configs/AuthServerConfigTest.java b/src/test/java/me/jjeda/mall/accounts/configs/AuthServerConfigTest.java index 671ba74..08b7cec 100644 --- a/src/test/java/me/jjeda/mall/accounts/configs/AuthServerConfigTest.java +++ b/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.Address; import me.jjeda.mall.accounts.dto.AccountDto; import me.jjeda.mall.common.TestDescription; import org.junit.Test; diff --git a/src/test/java/me/jjeda/mall/accounts/controller/AccountControllerTest.java b/src/test/java/me/jjeda/mall/accounts/controller/AccountControllerTest.java index 4b4b493..817a3a0 100644 --- a/src/test/java/me/jjeda/mall/accounts/controller/AccountControllerTest.java +++ b/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.Address; import me.jjeda.mall.accounts.dto.AccountDto; import me.jjeda.mall.accounts.repository.AccountRepository; import me.jjeda.mall.common.TestDescription; diff --git a/src/test/java/me/jjeda/mall/accounts/controller/AdminAccountControllerTest.java b/src/test/java/me/jjeda/mall/accounts/controller/AdminAccountControllerTest.java index 0290933..82f852f 100644 --- a/src/test/java/me/jjeda/mall/accounts/controller/AdminAccountControllerTest.java +++ b/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.Address; import me.jjeda.mall.accounts.dto.AccountDto; import me.jjeda.mall.accounts.repository.AccountRepository; import me.jjeda.mall.common.TestDescription; From 1ddc247887141b76fe40cc78cdc6d0adb590ce65 Mon Sep 17 00:00:00 2001 From: jjeda Date: Mon, 30 Sep 2019 01:33:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[#23]=20=EC=A3=BC=EB=AC=B8,=20=EC=83=81?= =?UTF-8?q?=ED=92=88=20=EA=B4=80=EB=A0=A8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Validation 추가 - schema 에 인덱스 및 외래 키 설정 추가 --- .../jjeda/mall/accounts/domain/Account.java | 2 +- .../jjeda/mall/accounts/dto/AccountDto.java | 2 +- .../mall/common/{ => model}/Address.java | 2 +- .../me/jjeda/mall/orders/domain/Delivery.java | 2 +- .../me/jjeda/mall/orders/domain/Order.java | 7 +- src/main/resources/schema.sql | 102 ++++++++++-------- .../configs/AuthServerConfigTest.java | 2 +- .../controller/AccountControllerTest.java | 2 +- .../AdminAccountControllerTest.java | 2 +- 9 files changed, 70 insertions(+), 53 deletions(-) rename src/main/java/me/jjeda/mall/common/{ => model}/Address.java (89%) diff --git a/src/main/java/me/jjeda/mall/accounts/domain/Account.java b/src/main/java/me/jjeda/mall/accounts/domain/Account.java index acfa471..0a853f0 100644 --- a/src/main/java/me/jjeda/mall/accounts/domain/Account.java +++ b/src/main/java/me/jjeda/mall/accounts/domain/Account.java @@ -6,7 +6,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import me.jjeda.mall.accounts.dto.AccountDto; -import me.jjeda.mall.common.Address; +import me.jjeda.mall.common.model.Address; import javax.persistence.Column; import javax.persistence.ElementCollection; diff --git a/src/main/java/me/jjeda/mall/accounts/dto/AccountDto.java b/src/main/java/me/jjeda/mall/accounts/dto/AccountDto.java index f0ed9f4..7987278 100644 --- a/src/main/java/me/jjeda/mall/accounts/dto/AccountDto.java +++ b/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.common.Address; +import me.jjeda.mall.common.model.Address; import javax.persistence.Column; import javax.validation.constraints.Email; diff --git a/src/main/java/me/jjeda/mall/common/Address.java b/src/main/java/me/jjeda/mall/common/model/Address.java similarity index 89% rename from src/main/java/me/jjeda/mall/common/Address.java rename to src/main/java/me/jjeda/mall/common/model/Address.java index 54e02c9..adc2b32 100644 --- a/src/main/java/me/jjeda/mall/common/Address.java +++ b/src/main/java/me/jjeda/mall/common/model/Address.java @@ -1,4 +1,4 @@ -package me.jjeda.mall.common; +package me.jjeda.mall.common.model; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/me/jjeda/mall/orders/domain/Delivery.java b/src/main/java/me/jjeda/mall/orders/domain/Delivery.java index 8dce910..9362c5e 100644 --- a/src/main/java/me/jjeda/mall/orders/domain/Delivery.java +++ b/src/main/java/me/jjeda/mall/orders/domain/Delivery.java @@ -2,7 +2,7 @@ import lombok.Getter; import lombok.Setter; -import me.jjeda.mall.common.Address; +import me.jjeda.mall.common.model.Address; import javax.persistence.Column; import javax.persistence.Embedded; diff --git a/src/main/java/me/jjeda/mall/orders/domain/Order.java b/src/main/java/me/jjeda/mall/orders/domain/Order.java index 0026707..a2ac20f 100644 --- a/src/main/java/me/jjeda/mall/orders/domain/Order.java +++ b/src/main/java/me/jjeda/mall/orders/domain/Order.java @@ -10,18 +10,20 @@ 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") +@Table(name = "orders", indexes = {@Index(columnList = "orderAt")} ) public class Order { @Id @GeneratedValue @@ -40,7 +42,8 @@ public class Order { private Delivery delivery; @OneToMany(mappedBy = "order") - private List orderItems = new ArrayList<>(); + @NotNull + private List orderItems; private LocalDateTime orderAt; diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql index 3fbaed2..fcff160 100644 --- a/src/main/resources/schema.sql +++ b/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), @@ -14,46 +14,60 @@ create table account ( create table account_account_role ( account_id bigint not null, - account_role varchar(255)); - - 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)); - - create table orders ( - order_id bigint not null, - order_at datetime, - status varchar(255), - account_id bigint, - delivery_id bigint, - primary key (order_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)); - - 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)); \ No newline at end of file + 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)); + + + + + + diff --git a/src/test/java/me/jjeda/mall/accounts/configs/AuthServerConfigTest.java b/src/test/java/me/jjeda/mall/accounts/configs/AuthServerConfigTest.java index 08b7cec..43b68ef 100644 --- a/src/test/java/me/jjeda/mall/accounts/configs/AuthServerConfigTest.java +++ b/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.common.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; diff --git a/src/test/java/me/jjeda/mall/accounts/controller/AccountControllerTest.java b/src/test/java/me/jjeda/mall/accounts/controller/AccountControllerTest.java index 817a3a0..6fe768a 100644 --- a/src/test/java/me/jjeda/mall/accounts/controller/AccountControllerTest.java +++ b/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.common.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; diff --git a/src/test/java/me/jjeda/mall/accounts/controller/AdminAccountControllerTest.java b/src/test/java/me/jjeda/mall/accounts/controller/AdminAccountControllerTest.java index 82f852f..023bd23 100644 --- a/src/test/java/me/jjeda/mall/accounts/controller/AdminAccountControllerTest.java +++ b/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.common.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;