[#75, #72] 패키지 구조 변경, 가상결제 테스트 작성

src/main/java/com/delfood/controller/CartControllelr.java

@@ -2,8 +2,8 @@
 
 import com.delfood.aop.LoginCheck;
 import com.delfood.aop.LoginCheck.UserType;
+import com.delfood.dto.order.item.ItemDTO;
 import com.delfood.aop.MemberLoginCheck;
-import com.delfood.dto.ItemDTO;
 import com.delfood.service.CartService;
 import com.delfood.utils.SessionUtil;
 import java.util.List;

src/main/java/com/delfood/controller/CouponController.java

@@ -1,6 +1,6 @@
 package com.delfood.controller;
 
-import com.delfood.dto.CouponDTO;
+import com.delfood.dto.order.coupon.CouponDTO;
 import com.delfood.service.CouponService;
 import lombok.extern.log4j.Log4j2;
 import java.time.LocalDateTime;

src/main/java/com/delfood/controller/CouponIssueController.java

@@ -2,8 +2,8 @@
 
 import com.delfood.aop.LoginCheck;
 import com.delfood.aop.LoginCheck.UserType;
+import com.delfood.dto.order.coupon.CouponIssueDTO;
 import com.delfood.aop.MemberLoginCheck;
-import com.delfood.dto.CouponIssueDTO;
 import com.delfood.service.CouponIssueService;
 import com.delfood.utils.SessionUtil;
 import java.util.List;

src/main/java/com/delfood/controller/LocationController.java

@@ -3,8 +3,8 @@
 import com.delfood.aop.OwnerShopCheck;
 import com.delfood.controller.reqeust.GetAddressByZipRequest;
 import com.delfood.controller.reqeust.GetAddressesByRoadRequest;
-import com.delfood.dto.AddressDTO;
-import com.delfood.dto.DeliveryLocationDTO;
+import com.delfood.dto.address.AddressDTO;
+import com.delfood.dto.address.DeliveryLocationDTO;
 import com.delfood.service.AddressService;
 import com.delfood.service.ShopService;
 import java.util.List;

src/main/java/com/delfood/controller/MemberController.java

@@ -2,8 +2,8 @@
 
 import com.delfood.aop.LoginCheck;
 import com.delfood.aop.LoginCheck.UserType;
+import com.delfood.dto.member.MemberDTO;
 import com.delfood.aop.MemberLoginCheck;
-import com.delfood.dto.MemberDTO;
 import com.delfood.error.exception.DuplicateIdException;
 import com.delfood.service.MemberService;
 import com.delfood.service.PushService;

src/main/java/com/delfood/controller/MenuController.java

@@ -1,7 +1,7 @@
 package com.delfood.controller;
 
-import com.delfood.dto.MenuDTO;
-import com.delfood.dto.OptionDTO;
+import com.delfood.dto.menu.MenuDTO;
+import com.delfood.dto.menu.OptionDTO;
 import com.delfood.service.MenuService;
 import com.delfood.service.OptionService;
 import java.util.List;

src/main/java/com/delfood/controller/MenuGroupController.java

@@ -1,7 +1,7 @@
 package com.delfood.controller;
 
-import com.delfood.dto.MenuGroupDTO;
-import com.delfood.dto.ShopDTO;
+import com.delfood.dto.menu.MenuGroupDTO;
+import com.delfood.dto.shop.ShopDTO;
 import com.delfood.service.MenuGroupService;
 import com.delfood.service.ShopService;
 import com.delfood.utils.SessionUtil;

src/main/java/com/delfood/controller/OrderController.java

@@ -5,12 +5,12 @@
 import com.delfood.aop.MemberLoginCheck;
 import com.delfood.aop.OwnerLoginCheck;
 import com.delfood.controller.response.OrderResponse;
-import com.delfood.dto.ItemsBillDTO;
-import com.delfood.dto.OrderDTO;
-import com.delfood.dto.OrderItemDTO;
+import com.delfood.dto.order.OrderDTO;
+import com.delfood.dto.order.bill.ItemsBillDTO;
+import com.delfood.dto.order.bill.OrderBillDTO;
+import com.delfood.dto.order.item.OrderItemDTO;
 import com.delfood.error.exception.coupon.IssuedCouponExistException;
 import com.delfood.error.exception.order.TotalPriceMismatchException;
-import com.delfood.dto.OrderBillDTO;
 import com.delfood.service.CouponIssueService;
 import com.delfood.service.OrderService;
 import com.delfood.service.PushService;

src/main/java/com/delfood/controller/OwnerController.java

@@ -2,10 +2,10 @@
 
 import com.delfood.aop.LoginCheck;
 import com.delfood.aop.LoginCheck.UserType;
+import com.delfood.dto.owner.OwnerDTO;
+import com.delfood.dto.owner.OwnerDTO.Status;
 import com.delfood.aop.MemberLoginCheck;
 import com.delfood.aop.OwnerLoginCheck;
-import com.delfood.dto.OwnerDTO;
-import com.delfood.dto.OwnerDTO.Status;
 import com.delfood.error.exception.DuplicateIdException;
 import com.delfood.service.OwnerService;
 import com.delfood.service.PushService;

src/main/java/com/delfood/controller/ShopController.java

@@ -19,11 +19,11 @@
 import com.delfood.aop.OwnerLoginCheck;
 import com.delfood.aop.OwnerShopCheck;
 import com.delfood.aop.LoginCheck.UserType;
-import com.delfood.dto.AddressDTO;
-import com.delfood.dto.DeliveryLocationDTO;
-import com.delfood.dto.OwnerDTO;
-import com.delfood.dto.ShopDTO;
-import com.delfood.dto.ShopUpdateDTO;
+import com.delfood.dto.address.AddressDTO;
+import com.delfood.dto.address.DeliveryLocationDTO;
+import com.delfood.dto.owner.OwnerDTO;
+import com.delfood.dto.shop.ShopDTO;
+import com.delfood.dto.shop.ShopUpdateDTO;
 import com.delfood.service.ShopService;
 import com.delfood.utils.SessionUtil;
 import lombok.AllArgsConstructor;

src/main/java/com/delfood/controller/ShopSearchController.java

@@ -3,8 +3,8 @@
 import com.delfood.aop.LoginCheck;
 import com.delfood.aop.LoginCheck.UserType;
 import com.delfood.aop.MemberLoginCheck;
-import com.delfood.dto.ShopCategoryDTO;
-import com.delfood.dto.ShopDTO;
+import com.delfood.dto.shop.ShopCategoryDTO;
+import com.delfood.dto.shop.ShopDTO;
 import com.delfood.service.MemberService;
 import com.delfood.service.ShopSearchService;
 import com.delfood.service.ShopService;

src/main/java/com/delfood/controller/response/OrderResponse.java

@@ -1,6 +1,6 @@
 package com.delfood.controller.response;
 
-import com.delfood.dto.ItemsBillDTO;
+import com.delfood.dto.order.bill.ItemsBillDTO;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

src/main/java/com/delfood/dao/CartDao.java

@@ -1,6 +1,6 @@
 package com.delfood.dao;
 
-import com.delfood.dto.ItemDTO;
+import com.delfood.dto.order.item.ItemDTO;
 import com.delfood.utils.RedisKeyFactory;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.List;

src/main/java/com/delfood/dao/deliveery/DeliveryDao.java

@@ -1,7 +1,7 @@
 package com.delfood.dao.deliveery;
 
-import com.delfood.dto.OrderDTO.OrderStatus;
 import com.delfood.dto.address.Position;
+import com.delfood.dto.order.OrderDTO.OrderStatus;
 import com.delfood.dto.rider.DeliveryRiderDTO;
 import lombok.NonNull;
 import java.util.List;

src/main/java/com/delfood/dao/deliveery/LocalMemoryDeliveryDao.java

@@ -1,7 +1,7 @@
 package com.delfood.dao.deliveery;
 
-import com.delfood.dto.OrderDTO.OrderStatus;
 import com.delfood.dto.address.Position;
+import com.delfood.dto.order.OrderDTO.OrderStatus;
 import com.delfood.dto.rider.DeliveryRiderDTO;
 import com.delfood.service.OrderService;
 import lombok.extern.log4j.Log4j2;

src/main/java/com/delfood/dto/AddressDTO.java → src/main/java/com/delfood/dto/address/AddressDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.address;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/delfood/dto/DeliveryLocationDTO.java → src/main/java/com/delfood/dto/address/DeliveryLocationDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.address;
 
 import java.time.LocalDateTime;
 import lombok.Getter;

src/main/java/com/delfood/dto/MemberDTO.java → src/main/java/com/delfood/dto/member/MemberDTO.java

@@ -1,11 +1,12 @@
-package com.delfood.dto;
+package com.delfood.dto.member;
 
 import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
 import lombok.ToString;
 import org.springframework.lang.Nullable;
+import com.delfood.dto.address.AddressDTO;
 
 // 고객
 @Getter

src/main/java/com/delfood/dto/MenuCategoryDTO.java → src/main/java/com/delfood/dto/menu/MenuCategoryDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.menu;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/delfood/dto/MenuDTO.java → src/main/java/com/delfood/dto/menu/MenuDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.menu;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/com/delfood/dto/MenuGroupDTO.java → src/main/java/com/delfood/dto/menu/MenuGroupDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.menu;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/com/delfood/dto/OptionDTO.java → src/main/java/com/delfood/dto/menu/OptionDTO.java

@@ -1,6 +1,4 @@
-package com.delfood.dto;
-
-import com.delfood.dto.MenuDTO.Status;
+package com.delfood.dto.menu;
 
 import java.time.LocalDateTime;
 import lombok.EqualsAndHashCode;
@@ -10,6 +8,7 @@
 import lombok.ToString;
 
 import org.apache.ibatis.type.Alias;
+import com.delfood.dto.menu.MenuDTO.Status;
 
 @Getter
 @Setter

src/main/java/com/delfood/dto/OrderDTO.java → src/main/java/com/delfood/dto/order/OrderDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.order;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -11,6 +11,8 @@
 
 import org.apache.ibatis.type.Alias;
 import org.codehaus.commons.nullanalysis.Nullable;
+import com.delfood.dto.order.coupon.SimpleCouponInfo;
+import com.delfood.dto.order.item.OrderItemDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 @Getter

src/main/java/com/delfood/dto/ItemsBillDTO.java → src/main/java/com/delfood/dto/order/bill/ItemsBillDTO.java

@@ -1,11 +1,14 @@
-package com.delfood.dto;
+package com.delfood.dto.order.bill;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.codehaus.jackson.annotate.JsonIgnore;
+import com.delfood.dto.address.AddressDTO;
+import com.delfood.dto.order.coupon.CouponDTO;
+import com.delfood.dto.order.item.OrderItemDTO;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/com/delfood/dto/OrderBillDTO.java → src/main/java/com/delfood/dto/order/bill/OrderBillDTO.java

@@ -1,7 +1,9 @@
-package com.delfood.dto;
+package com.delfood.dto.order.bill;
 
-import com.delfood.dto.ItemsBillDTO.MenuInfo;
-import com.delfood.dto.OrderDTO.OrderStatus;
+import com.delfood.dto.order.OrderDTO;
+import com.delfood.dto.order.OrderDTO.OrderStatus;
+import com.delfood.dto.order.bill.ItemsBillDTO.MenuInfo;
+import com.delfood.dto.order.coupon.SimpleCouponInfo;
 import java.time.LocalDateTime;
 import java.util.List;
 import lombok.Getter;

src/main/java/com/delfood/dto/CouponDTO.java → src/main/java/com/delfood/dto/order/coupon/CouponDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.order.coupon;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;

src/main/java/com/delfood/dto/CouponIssueDTO.java → src/main/java/com/delfood/dto/order/coupon/CouponIssueDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.order.coupon;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 

src/main/java/com/delfood/dto/SimpleCouponInfo.java → src/main/java/com/delfood/dto/order/coupon/SimpleCouponInfo.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.order.coupon;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/com/delfood/dto/ItemDTO.java → src/main/java/com/delfood/dto/order/item/ItemDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.order.item;
 
 import java.util.List;
 import lombok.AllArgsConstructor;

src/main/java/com/delfood/dto/OrderItemDTO.java → src/main/java/com/delfood/dto/order/item/OrderItemDTO.java

@@ -1,8 +1,8 @@
-package com.delfood.dto;
+package com.delfood.dto.order.item;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import com.delfood.dto.OrderDTO.OrderStatus;
+import com.delfood.dto.order.OrderDTO.OrderStatus;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;

src/main/java/com/delfood/dto/OrderItemOptionDTO.java → src/main/java/com/delfood/dto/order/item/OrderItemOptionDTO.java

@@ -1,8 +1,8 @@
-package com.delfood.dto;
+package com.delfood.dto.order.item;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import com.delfood.dto.OrderDTO.OrderStatus;
+import com.delfood.dto.order.OrderDTO.OrderStatus;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;

src/main/java/com/delfood/dto/OrdersItemDTO.java → src/main/java/com/delfood/dto/order/item/OrdersItemDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.order.item;
 
 import java.util.List;
 import lombok.EqualsAndHashCode;

src/main/java/com/delfood/dto/OrdersItemOptionDTO.java → src/main/java/com/delfood/dto/order/item/OrdersItemOptionDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.order.item;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

src/main/java/com/delfood/dto/OwnerDTO.java → src/main/java/com/delfood/dto/owner/OwnerDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.owner;
 
 import java.time.LocalDateTime;
 import lombok.Builder;

src/main/java/com/delfood/dto/PaymentDTO.java → src/main/java/com/delfood/dto/pay/PaymentDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.pay;
 
 import java.time.LocalDateTime;
 import lombok.Builder;

src/main/java/com/delfood/dto/rider/DeliveryInfoDTO.java

@@ -1,7 +1,7 @@
 package com.delfood.dto.rider;
 
-import com.delfood.dto.OrderBillDTO.SimpleAddressInfo;
-import com.delfood.dto.SimpleShopInfo;
+import com.delfood.dto.order.bill.OrderBillDTO.SimpleAddressInfo;
+import com.delfood.dto.shop.SimpleShopInfo;
 import java.time.LocalDateTime;
 import javax.annotation.Nullable;
 import lombok.Builder;

src/main/java/com/delfood/dto/rider/DeliveryOrderInfo.java

@@ -1,6 +1,6 @@
 package com.delfood.dto.rider;
 
-import com.delfood.dto.OrderDTO.OrderStatus;
+import com.delfood.dto.order.OrderDTO.OrderStatus;
 import lombok.Getter;
 
 @Getter

src/main/java/com/delfood/dto/ShopCategoryDTO.java → src/main/java/com/delfood/dto/shop/ShopCategoryDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.shop;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/delfood/dto/ShopDTO.java → src/main/java/com/delfood/dto/shop/ShopDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.shop;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/com/delfood/dto/ShopUpdateDTO.java → src/main/java/com/delfood/dto/shop/ShopUpdateDTO.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.shop;
 
 import lombok.Getter;
 import lombok.NonNull;

src/main/java/com/delfood/dto/SimpleShopInfo.java → src/main/java/com/delfood/dto/shop/SimpleShopInfo.java

@@ -1,4 +1,4 @@
-package com.delfood.dto;
+package com.delfood.dto.shop;
 
 import lombok.Builder;
 import lombok.Getter;

src/main/java/com/delfood/mapper/AddressMapper.java

@@ -2,7 +2,7 @@
 
 import com.delfood.controller.reqeust.GetAddressByZipRequest;
 import com.delfood.controller.reqeust.GetAddressesByRoadRequest;
-import com.delfood.dto.AddressDTO;
+import com.delfood.dto.address.AddressDTO;
 import com.delfood.dto.address.Position;
 import java.util.List;
 import org.springframework.stereotype.Repository;

src/main/java/com/delfood/mapper/CouponIssueMapper.java

@@ -2,8 +2,8 @@
 
 import java.util.List;
 import org.springframework.stereotype.Repository;
-import com.delfood.dto.CouponIssueDTO;
-import com.delfood.dto.ItemsBillDTO.CouponInfo;
+import com.delfood.dto.order.bill.ItemsBillDTO.CouponInfo;
+import com.delfood.dto.order.coupon.CouponIssueDTO;
 
 @Repository
 public interface CouponIssueMapper {