From 4680a3353840f199acae398e6810489150de249c Mon Sep 17 00:00:00 2001 From: Lee ChanMi Date: Sun, 10 Dec 2023 18:01:32 +0900 Subject: [PATCH] =?UTF-8?q?[CHORE]=20=EA=B0=81=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=EC=9D=98=20=ED=8C=A8=ED=82=A4=EC=A7=80=20domain=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD=20->=20model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/util/EntityDtoMapperImpl.java | 321 +++++++++--------- .../dto/request/PatchCustomProcessReq.java | 2 +- .../admin/facade/impl/AdminFacadeImpl.java | 4 +- .../domain/admin/{domain => model}/Admin.java | 2 +- .../{domain => model}/AdminAccessLog.java | 2 +- .../repository/AdminAccessLogRepository.java | 2 +- .../admin/repository/AdminRepositoryImpl.java | 2 +- .../domain/admin/service/AdminService.java | 2 +- .../admin/service/impl/AdminServiceImpl.java | 4 +- .../banner/{domain => model}/Banner.java | 2 +- .../cart/facade/impl/CartFacadeImpl.java | 6 +- .../domain/cart/{domain => model}/Cart.java | 6 +- .../cart/repository/CartRepositoryImpl.java | 6 +- .../domain/cart/service/CartService.java | 6 +- .../cart/service/impl/CartServiceImpl.java | 6 +- .../facade/dto/request/UpdateCustomReq.java | 6 +- .../facade/dto/response/ReadCustomRes.java | 4 +- .../response/ReadCustomSummaryListRes.java | 2 +- .../dto/response/ReadCustomSummaryRes.java | 2 +- .../custom/facade/impl/CustomFacadeImpl.java | 6 +- .../custom/{domain => model}/Custom.java | 6 +- .../custom/{domain => model}/CustomImage.java | 2 +- .../{domain => model}/CustomProcess.java | 2 +- .../custom/{domain => model}/CustomSize.java | 2 +- .../custom/{domain => model}/CustomStyle.java | 4 +- .../custom/{domain => model}/CustomTheme.java | 4 +- .../custom/provider/CustomProvider.java | 2 +- .../provider/impl/CustomProviderImpl.java | 2 +- .../repository/CustomImageRepository.java | 2 +- .../custom/repository/CustomRepository.java | 2 +- .../repository/CustomStyleRepository.java | 2 +- .../repository/CustomThemeRepository.java | 2 +- .../custom/CustomRepositoryCustom.java | 2 +- .../impl/CustomImageRepositoryImpl.java | 2 +- .../repository/impl/CustomRepositoryImpl.java | 4 +- .../impl/CustomStyleRepositoryImpl.java | 2 +- .../impl/CustomThemeRepositoryImpl.java | 2 +- .../custom/service/CustomImageService.java | 2 +- .../domain/custom/service/CustomService.java | 18 +- .../custom/service/CustomStyleService.java | 4 +- .../custom/service/CustomThemeService.java | 4 +- .../service/impl/CustomImageServiceImpl.java | 2 +- .../service/impl/CustomServiceImpl.java | 182 +++++----- .../service/impl/CustomStyleServiceImpl.java | 4 +- .../service/impl/CustomThemeServiceImpl.java | 4 +- .../facade/dto/request/CreateDiscountReq.java | 1 - .../facade/impl/DiscountFacadeImpl.java | 4 +- .../discount/{domain => model}/Discount.java | 2 +- .../discount/provider/DiscountProvider.java | 2 +- .../provider/impl/DiscountProviderImpl.java | 2 +- .../repository/DiscountRepository.java | 2 +- .../impl/DiscountRepositoryImpl.java | 2 +- .../facade/dto/response/ReadMagazineRes.java | 2 +- .../dto/response/ReadMagazineUrlRes.java | 2 +- .../magazine/{domain => model}/Magazine.java | 2 +- .../magazine/provider/MagazineProvider.java | 2 +- .../provider/impl/MagazineProviderImpl.java | 2 +- .../repository/MagazineRepository.java | 2 +- .../impl/MagazineRepositoryImpl.java | 2 +- .../order/controller/OrderController.java | 2 +- .../dto/request/PatchOrderStatusReq.java | 2 +- .../domain/order/facade/OrderFacade.java | 2 +- .../dto/request/UpdateOrderStatusReq.java | 2 +- .../order/facade/impl/OrderFacadeImpl.java | 10 +- .../order/{domain => model}/OrderHistory.java | 4 +- .../order/{domain => model}/OrderStatus.java | 2 +- .../{domain => model}/OrderedProduct.java | 4 +- .../{domain => model}/PurchaseRequest.java | 2 +- .../domain/order/provider/OrderProvider.java | 2 +- .../provider/impl/OrderProviderImpl.java | 2 +- .../repository/impl/OrderRepositoryImpl.java | 2 +- .../impl/OrderedProductRepositoryImpl.java | 2 +- .../domain/order/service/OrderService.java | 2 +- .../order/service/impl/OrderServiceImpl.java | 4 +- .../search/facade/impl/SearchFacadeImpl.java | 2 +- .../dto/response/ReadStickerForUserRes.java | 2 +- .../facade/dto/response/ReadStickerRes.java | 2 +- .../response/ReadStickerSummaryListRes.java | 2 +- .../dto/response/ReadStickerSummaryRes.java | 2 +- .../facade/impl/StickerFacadeImpl.java | 10 +- .../sticker/{domain => model}/Sticker.java | 6 +- .../{domain => model}/StickerImage.java | 2 +- .../{domain => model}/StickerSort.java | 2 +- .../{domain => model}/StickerStyle.java | 4 +- .../{domain => model}/StickerTheme.java | 4 +- .../sticker/provider/StickerProvider.java | 4 +- .../provider/impl/StickerProviderImpl.java | 4 +- .../sticker/provider/vo/StickerOrderInfo.java | 2 +- .../repository/StickerImageRepository.java | 2 +- .../sticker/repository/StickerRepository.java | 2 +- .../repository/StickerStyleRepository.java | 3 +- .../repository/StickerThemeRepository.java | 3 +- .../custom/StickerRepositoryCustom.java | 2 +- .../impl/StickerImageRepositoryImpl.java | 2 +- .../impl/StickerRepositoryImpl.java | 14 +- .../impl/StickerStyleRepositoryImpl.java | 2 +- .../impl/StickerThemeRepositoryImpl.java | 2 +- .../sticker/service/StickerImageService.java | 2 +- .../sticker/service/StickerService.java | 2 +- .../sticker/service/StickerStyleService.java | 2 +- .../sticker/service/StickerThemeService.java | 2 +- .../service/impl/StickerImageServiceImpl.java | 2 +- .../service/impl/StickerServiceImpl.java | 2 +- .../service/impl/StickerStyleServiceImpl.java | 2 +- .../service/impl/StickerThemeServiceImpl.java | 2 +- .../facade/dto/response/ReadStyleListRes.java | 18 +- .../facade/dto/response/ReadStyleRes.java | 2 +- .../dto/response/ReadStyleSummaryListRes.java | 18 +- .../dto/response/ReadStyleSummaryRes.java | 2 +- .../style/facade/impl/StyleFacadeImpl.java | 4 +- .../domain/style/{domain => model}/Style.java | 7 +- .../domain/style/provider/StyleProvider.java | 6 +- .../provider/impl/StyleProviderImpl.java | 22 +- .../style/repository/StyleRepository.java | 6 +- .../repository/impl/StyleRepositoryImpl.java | 6 +- .../facade/dto/response/ReadThemeListRes.java | 18 +- .../facade/dto/response/ReadThemeRes.java | 2 +- .../dto/response/ReadThemeSummaryListRes.java | 18 +- .../dto/response/ReadThemeSummaryRes.java | 2 +- .../theme/facade/impl/ThemeFacadeImpl.java | 4 +- .../domain/theme/{domain => model}/Theme.java | 2 +- .../domain/theme/provider/ThemeProvider.java | 6 +- .../provider/impl/ThemeProviderImpl.java | 24 +- .../theme/repository/ThemeRepository.java | 6 +- .../repository/impl/ThemeRepositoryImpl.java | 2 +- .../user/facade/impl/UserFacadeImpl.java | 4 +- .../user/{domain => model}/ProductLiked.java | 4 +- .../domain/user/{domain => model}/User.java | 2 +- .../user/{domain => model}/UserRole.java | 2 +- .../UserShippingAddress.java | 10 +- .../user/provider/ProductLikedProvider.java | 2 +- .../domain/user/provider/UserProvider.java | 2 +- .../impl/ProductLikedProviderImpl.java | 2 +- .../user/provider/impl/UserProviderImpl.java | 2 +- .../impl/ProductLikedRepositoryImpl.java | 4 +- .../repository/impl/UserRepositoryImpl.java | 2 +- .../UserShippingAddressRepositoryImpl.java | 3 +- .../domain/user/service/UserService.java | 2 +- .../service/impl/ProductLikedServiceImpl.java | 50 +-- .../user/service/impl/UserServiceImpl.java | 2 +- .../impl/UserShippingAddressServiceImpl.java | 4 +- .../interceptors/AdminRoleInterceptor.java | 2 +- .../config/resolver/UserIdResolver.java | 2 +- .../server/global/util/EntityDtoMapper.java | 12 +- .../resquest/CustomApplyDiscordMessage.java | 4 +- .../dto/resquest/DiscordMessageReq.java | 2 +- .../resquest/OrderStickerDiscordMessage.java | 2 +- .../resquest/PointChargeDiscordMessage.java | 2 +- .../service/DiscordMessageService.java | 6 +- .../domain/PhoneNumberVerificationCode.java | 2 +- 150 files changed, 564 insertions(+), 568 deletions(-) rename server/src/main/java/org/tattour/server/domain/admin/{domain => model}/Admin.java (94%) rename server/src/main/java/org/tattour/server/domain/admin/{domain => model}/AdminAccessLog.java (95%) rename server/src/main/java/org/tattour/server/domain/banner/{domain => model}/Banner.java (93%) rename server/src/main/java/org/tattour/server/domain/cart/{domain => model}/Cart.java (86%) rename server/src/main/java/org/tattour/server/domain/custom/{domain => model}/Custom.java (96%) rename server/src/main/java/org/tattour/server/domain/custom/{domain => model}/CustomImage.java (95%) rename server/src/main/java/org/tattour/server/domain/custom/{domain => model}/CustomProcess.java (95%) rename server/src/main/java/org/tattour/server/domain/custom/{domain => model}/CustomSize.java (95%) rename server/src/main/java/org/tattour/server/domain/custom/{domain => model}/CustomStyle.java (91%) rename server/src/main/java/org/tattour/server/domain/custom/{domain => model}/CustomTheme.java (91%) rename server/src/main/java/org/tattour/server/domain/discount/{domain => model}/Discount.java (96%) rename server/src/main/java/org/tattour/server/domain/magazine/{domain => model}/Magazine.java (94%) rename server/src/main/java/org/tattour/server/domain/order/{domain => model}/OrderHistory.java (95%) rename server/src/main/java/org/tattour/server/domain/order/{domain => model}/OrderStatus.java (88%) rename server/src/main/java/org/tattour/server/domain/order/{domain => model}/OrderedProduct.java (92%) rename server/src/main/java/org/tattour/server/domain/order/{domain => model}/PurchaseRequest.java (95%) rename server/src/main/java/org/tattour/server/domain/sticker/{domain => model}/Sticker.java (94%) rename server/src/main/java/org/tattour/server/domain/sticker/{domain => model}/StickerImage.java (95%) rename server/src/main/java/org/tattour/server/domain/sticker/{domain => model}/StickerSort.java (93%) rename server/src/main/java/org/tattour/server/domain/sticker/{domain => model}/StickerStyle.java (91%) rename server/src/main/java/org/tattour/server/domain/sticker/{domain => model}/StickerTheme.java (91%) rename server/src/main/java/org/tattour/server/domain/style/{domain => model}/Style.java (69%) rename server/src/main/java/org/tattour/server/domain/theme/{domain => model}/Theme.java (92%) rename server/src/main/java/org/tattour/server/domain/user/{domain => model}/ProductLiked.java (92%) rename server/src/main/java/org/tattour/server/domain/user/{domain => model}/User.java (98%) rename server/src/main/java/org/tattour/server/domain/user/{domain => model}/UserRole.java (80%) rename server/src/main/java/org/tattour/server/domain/user/{domain => model}/UserShippingAddress.java (83%) diff --git a/server/src/main/generated/org/tattour/server/global/util/EntityDtoMapperImpl.java b/server/src/main/generated/org/tattour/server/global/util/EntityDtoMapperImpl.java index 927cd923..ed4f69c6 100644 --- a/server/src/main/generated/org/tattour/server/global/util/EntityDtoMapperImpl.java +++ b/server/src/main/generated/org/tattour/server/global/util/EntityDtoMapperImpl.java @@ -5,34 +5,34 @@ import javax.annotation.processing.Generated; import org.springframework.data.domain.Page; import org.springframework.stereotype.Component; -import org.tattour.server.domain.custom.domain.Custom; +import org.tattour.server.domain.custom.model.Custom; import org.tattour.server.domain.custom.facade.dto.response.CreateCustomSummaryRes; import org.tattour.server.domain.custom.facade.dto.response.ReadCustomSummaryRes; -import org.tattour.server.domain.order.domain.Order; -import org.tattour.server.domain.order.domain.OrderStatus; +import org.tattour.server.domain.order.model.Order; +import org.tattour.server.domain.order.model.OrderStatus; import org.tattour.server.domain.order.provider.vo.OrderHistoryInfo; import org.tattour.server.domain.order.provider.vo.UserOrderHistoryInfo; import org.tattour.server.domain.point.domain.PointChargeRequest; import org.tattour.server.domain.point.provider.vo.PointChargeRequestInfo; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; import org.tattour.server.domain.sticker.provider.vo.StickerLikedInfo; -import org.tattour.server.domain.user.domain.ProductLiked; -import org.tattour.server.domain.user.domain.User; +import org.tattour.server.domain.user.model.ProductLiked; +import org.tattour.server.domain.user.model.User; import org.tattour.server.domain.user.provider.vo.HomeUserInfo; import org.tattour.server.domain.user.provider.vo.UserContactInfo; import org.tattour.server.domain.user.provider.vo.UserProfileInfo; @Generated( - value = "org.mapstruct.ap.MappingProcessor", - date = "2023-08-20T21:01:59+0900", - comments = "version: 1.5.4.Final, compiler: javac, environment: Java 17.0.6 (Amazon.com Inc.)" + value = "org.mapstruct.ap.MappingProcessor", + date = "2023-08-20T21:01:59+0900", + comments = "version: 1.5.4.Final, compiler: javac, environment: Java 17.0.6 (Amazon.com Inc.)" ) @Component public class EntityDtoMapperImpl implements EntityDtoMapper { @Override public HomeUserInfo toHomeUserInfo(User user) { - if ( user == null ) { + if (user == null) { return null; } @@ -42,46 +42,46 @@ public HomeUserInfo toHomeUserInfo(User user) { name = user.getName(); point = user.getPoint(); - HomeUserInfo homeUserInfo = new HomeUserInfo( name, point ); + HomeUserInfo homeUserInfo = new HomeUserInfo(name, point); return homeUserInfo; } @Override public UserContactInfo toUserContactInfo(User user) { - if ( user == null ) { + if (user == null) { return null; } UserContactInfo userContactInfo = new UserContactInfo(); - userContactInfo.setId( user.getId() ); - userContactInfo.setName( user.getName() ); - userContactInfo.setPhoneNumber( user.getPhoneNumber() ); + userContactInfo.setId(user.getId()); + userContactInfo.setName(user.getName()); + userContactInfo.setPhoneNumber(user.getPhoneNumber()); return userContactInfo; } @Override public UserProfileInfo toUserProfileInfo(User user) { - if ( user == null ) { + if (user == null) { return null; } UserProfileInfo.UserProfileInfoBuilder userProfileInfo = UserProfileInfo.builder(); - if ( user.getId() != null ) { - userProfileInfo.id( user.getId() ); + if (user.getId() != null) { + userProfileInfo.id(user.getId()); } - userProfileInfo.name( user.getName() ); - userProfileInfo.phoneNumber( user.getPhoneNumber() ); + userProfileInfo.name(user.getName()); + userProfileInfo.phoneNumber(user.getPhoneNumber()); return userProfileInfo.build(); } @Override public StickerLikedInfo toStickerLikedInfo(ProductLiked productLiked) { - if ( productLiked == null ) { + if (productLiked == null) { return null; } @@ -91,29 +91,33 @@ public StickerLikedInfo toStickerLikedInfo(ProductLiked productLiked) { String mainImageUrl = null; Integer id = null; - stickerId = productLikedStickerId( productLiked ); - name = productLikedStickerName( productLiked ); - price = productLikedStickerPrice( productLiked ); - mainImageUrl = productLikedStickerMainImageUrl( productLiked ); + stickerId = productLikedStickerId(productLiked); + name = productLikedStickerName(productLiked); + price = productLikedStickerPrice(productLiked); + mainImageUrl = productLikedStickerMainImageUrl(productLiked); id = productLiked.getId(); - Integer discountPrice = productLiked.getSticker().getDiscount() != null ? productLiked.getSticker().getPrice() * (100 - productLiked.getSticker().getDiscount().getDiscountRate()) / 100 : null; - Integer discountRate = productLiked.getSticker().getDiscount() != null ? productLiked.getSticker().getDiscount().getDiscountRate() : null; + Integer discountPrice = productLiked.getSticker().getDiscount() != null ? + productLiked.getSticker().getPrice() * (100 - productLiked.getSticker().getDiscount().getDiscountRate()) + / 100 : null; + Integer discountRate = productLiked.getSticker().getDiscount() != null ? productLiked.getSticker().getDiscount() + .getDiscountRate() : null; - StickerLikedInfo stickerLikedInfo = new StickerLikedInfo( id, stickerId, name, price, discountRate, discountPrice, mainImageUrl ); + StickerLikedInfo stickerLikedInfo = new StickerLikedInfo(id, stickerId, name, price, discountRate, + discountPrice, mainImageUrl); return stickerLikedInfo; } @Override public List toStickerLikedInfoList(List productLiked) { - if ( productLiked == null ) { + if (productLiked == null) { return null; } - List list = new ArrayList( productLiked.size() ); - for ( ProductLiked productLiked1 : productLiked ) { - list.add( toStickerLikedInfo( productLiked1 ) ); + List list = new ArrayList(productLiked.size()); + for (ProductLiked productLiked1 : productLiked) { + list.add(toStickerLikedInfo(productLiked1)); } return list; @@ -121,59 +125,59 @@ public List toStickerLikedInfoList(List productL @Override public UserOrderHistoryInfo toGetUserOrderHistoryRes(Order order) { - if ( order == null ) { + if (order == null) { return null; } UserOrderHistoryInfo userOrderHistoryInfo = new UserOrderHistoryInfo(); - Integer id = orderUserId( order ); - if ( id != null ) { - userOrderHistoryInfo.setUserId( id ); + Integer id = orderUserId(order); + if (id != null) { + userOrderHistoryInfo.setUserId(id); } - Integer id1 = orderStickerId( order ); - if ( id1 != null ) { - userOrderHistoryInfo.setStickerId( id1 ); + Integer id1 = orderStickerId(order); + if (id1 != null) { + userOrderHistoryInfo.setStickerId(id1); } - if ( order.getId() != null ) { - userOrderHistoryInfo.setId( order.getId() ); + if (order.getId() != null) { + userOrderHistoryInfo.setId(order.getId()); } - userOrderHistoryInfo.setProductName( order.getProductName() ); - userOrderHistoryInfo.setProductSize( order.getProductSize() ); - userOrderHistoryInfo.setProductImageUrl( order.getProductImageUrl() ); - if ( order.getProductAmount() != null ) { - userOrderHistoryInfo.setProductAmount( order.getProductAmount() ); + userOrderHistoryInfo.setProductName(order.getProductName()); + userOrderHistoryInfo.setProductSize(order.getProductSize()); + userOrderHistoryInfo.setProductImageUrl(order.getProductImageUrl()); + if (order.getProductAmount() != null) { + userOrderHistoryInfo.setProductAmount(order.getProductAmount()); } - if ( order.getProductCount() != null ) { - userOrderHistoryInfo.setProductCount( order.getProductCount() ); + if (order.getProductCount() != null) { + userOrderHistoryInfo.setProductCount(order.getProductCount()); } - if ( order.getShippingFee() != null ) { - userOrderHistoryInfo.setShippingFee( order.getShippingFee() ); + if (order.getShippingFee() != null) { + userOrderHistoryInfo.setShippingFee(order.getShippingFee()); } - if ( order.getTotalAmount() != null ) { - userOrderHistoryInfo.setTotalAmount( order.getTotalAmount() ); + if (order.getTotalAmount() != null) { + userOrderHistoryInfo.setTotalAmount(order.getTotalAmount()); } - userOrderHistoryInfo.setRecipientName( order.getRecipientName() ); - userOrderHistoryInfo.setContact( order.getContact() ); - userOrderHistoryInfo.setMailingAddress( order.getMailingAddress() ); - userOrderHistoryInfo.setBaseAddress( order.getBaseAddress() ); - userOrderHistoryInfo.setDetailAddress( order.getDetailAddress() ); - userOrderHistoryInfo.setCreatedAt( order.getCreatedAt() ); - userOrderHistoryInfo.setLastUpdatedAt( order.getLastUpdatedAt() ); - userOrderHistoryInfo.setState( order.getState() ); + userOrderHistoryInfo.setRecipientName(order.getRecipientName()); + userOrderHistoryInfo.setContact(order.getContact()); + userOrderHistoryInfo.setMailingAddress(order.getMailingAddress()); + userOrderHistoryInfo.setBaseAddress(order.getBaseAddress()); + userOrderHistoryInfo.setDetailAddress(order.getDetailAddress()); + userOrderHistoryInfo.setCreatedAt(order.getCreatedAt()); + userOrderHistoryInfo.setLastUpdatedAt(order.getLastUpdatedAt()); + userOrderHistoryInfo.setState(order.getState()); return userOrderHistoryInfo; } @Override public List toGetUserOrderHistoryListRes(List orderList) { - if ( orderList == null ) { + if (orderList == null) { return null; } - List list = new ArrayList( orderList.size() ); - for ( Order order : orderList ) { - list.add( toGetUserOrderHistoryRes( order ) ); + List list = new ArrayList(orderList.size()); + for (Order order : orderList) { + list.add(toGetUserOrderHistoryRes(order)); } return list; @@ -181,60 +185,60 @@ public List toGetUserOrderHistoryListRes(List order @Override public OrderHistoryInfo toOrderHistoryInfo(Order order) { - if ( order == null ) { + if (order == null) { return null; } OrderHistoryInfo orderHistoryInfo = new OrderHistoryInfo(); - Integer id = orderUserId( order ); - if ( id != null ) { - orderHistoryInfo.setUserId( id ); + Integer id = orderUserId(order); + if (id != null) { + orderHistoryInfo.setUserId(id); } - Integer id1 = orderStickerId( order ); - if ( id1 != null ) { - orderHistoryInfo.setStickerId( id1 ); + Integer id1 = orderStickerId(order); + if (id1 != null) { + orderHistoryInfo.setStickerId(id1); } - orderHistoryInfo.setOrderStatus( orderOrderStatusValue( order ) ); - if ( order.getId() != null ) { - orderHistoryInfo.setId( order.getId() ); + orderHistoryInfo.setOrderStatus(orderOrderStatusValue(order)); + if (order.getId() != null) { + orderHistoryInfo.setId(order.getId()); } - orderHistoryInfo.setProductName( order.getProductName() ); - orderHistoryInfo.setProductSize( order.getProductSize() ); - orderHistoryInfo.setProductImageUrl( order.getProductImageUrl() ); - if ( order.getProductAmount() != null ) { - orderHistoryInfo.setProductAmount( order.getProductAmount() ); + orderHistoryInfo.setProductName(order.getProductName()); + orderHistoryInfo.setProductSize(order.getProductSize()); + orderHistoryInfo.setProductImageUrl(order.getProductImageUrl()); + if (order.getProductAmount() != null) { + orderHistoryInfo.setProductAmount(order.getProductAmount()); } - if ( order.getProductCount() != null ) { - orderHistoryInfo.setProductCount( order.getProductCount() ); + if (order.getProductCount() != null) { + orderHistoryInfo.setProductCount(order.getProductCount()); } - if ( order.getShippingFee() != null ) { - orderHistoryInfo.setShippingFee( order.getShippingFee() ); + if (order.getShippingFee() != null) { + orderHistoryInfo.setShippingFee(order.getShippingFee()); } - if ( order.getTotalAmount() != null ) { - orderHistoryInfo.setTotalAmount( order.getTotalAmount() ); + if (order.getTotalAmount() != null) { + orderHistoryInfo.setTotalAmount(order.getTotalAmount()); } - orderHistoryInfo.setRecipientName( order.getRecipientName() ); - orderHistoryInfo.setContact( order.getContact() ); - orderHistoryInfo.setMailingAddress( order.getMailingAddress() ); - orderHistoryInfo.setBaseAddress( order.getBaseAddress() ); - orderHistoryInfo.setDetailAddress( order.getDetailAddress() ); - orderHistoryInfo.setCreatedAt( order.getCreatedAt() ); - orderHistoryInfo.setLastUpdatedAt( order.getLastUpdatedAt() ); - orderHistoryInfo.setState( order.getState() ); + orderHistoryInfo.setRecipientName(order.getRecipientName()); + orderHistoryInfo.setContact(order.getContact()); + orderHistoryInfo.setMailingAddress(order.getMailingAddress()); + orderHistoryInfo.setBaseAddress(order.getBaseAddress()); + orderHistoryInfo.setDetailAddress(order.getDetailAddress()); + orderHistoryInfo.setCreatedAt(order.getCreatedAt()); + orderHistoryInfo.setLastUpdatedAt(order.getLastUpdatedAt()); + orderHistoryInfo.setState(order.getState()); return orderHistoryInfo; } @Override public List toOrderHistoryInfoPage(Page orderPage) { - if ( orderPage == null ) { + if (orderPage == null) { return null; } List list = new ArrayList(); - for ( Order order : orderPage ) { - list.add( toOrderHistoryInfo( order ) ); + for (Order order : orderPage) { + list.add(toOrderHistoryInfo(order)); } return list; @@ -242,41 +246,42 @@ public List toOrderHistoryInfoPage(Page orderPage) { @Override public PointChargeRequestInfo toGetPointChargeRequestRes(PointChargeRequest pointChargeRequest) { - if ( pointChargeRequest == null ) { + if (pointChargeRequest == null) { return null; } PointChargeRequestInfo.PointChargeRequestInfoBuilder pointChargeRequestInfo = PointChargeRequestInfo.builder(); - Integer id = pointChargeRequestUserId( pointChargeRequest ); - if ( id != null ) { - pointChargeRequestInfo.userId( id ); + Integer id = pointChargeRequestUserId(pointChargeRequest); + if (id != null) { + pointChargeRequestInfo.userId(id); } - if ( pointChargeRequest.getId() != null ) { - pointChargeRequestInfo.id( pointChargeRequest.getId() ); + if (pointChargeRequest.getId() != null) { + pointChargeRequestInfo.id(pointChargeRequest.getId()); } - pointChargeRequestInfo.chargeAmount( pointChargeRequest.getChargeAmount() ); - pointChargeRequestInfo.transferredAmount( pointChargeRequest.getTransferredAmount() ); - pointChargeRequestInfo.isDeposited( pointChargeRequest.getIsDeposited() ); - pointChargeRequestInfo.isAmountMatched( pointChargeRequest.getIsAmountMatched() ); - pointChargeRequestInfo.isApproved( pointChargeRequest.getIsApproved() ); - pointChargeRequestInfo.isCompleted( pointChargeRequest.getIsCompleted() ); - pointChargeRequestInfo.createdAt( pointChargeRequest.getCreatedAt() ); - pointChargeRequestInfo.lastUpdatedAt( pointChargeRequest.getLastUpdatedAt() ); - pointChargeRequestInfo.state( pointChargeRequest.getState() ); + pointChargeRequestInfo.chargeAmount(pointChargeRequest.getChargeAmount()); + pointChargeRequestInfo.transferredAmount(pointChargeRequest.getTransferredAmount()); + pointChargeRequestInfo.isDeposited(pointChargeRequest.getIsDeposited()); + pointChargeRequestInfo.isAmountMatched(pointChargeRequest.getIsAmountMatched()); + pointChargeRequestInfo.isApproved(pointChargeRequest.getIsApproved()); + pointChargeRequestInfo.isCompleted(pointChargeRequest.getIsCompleted()); + pointChargeRequestInfo.createdAt(pointChargeRequest.getCreatedAt()); + pointChargeRequestInfo.lastUpdatedAt(pointChargeRequest.getLastUpdatedAt()); + pointChargeRequestInfo.state(pointChargeRequest.getState()); return pointChargeRequestInfo.build(); } @Override - public List toGetPointChargeRequestResList(List pointChargeRequestList) { - if ( pointChargeRequestList == null ) { + public List toGetPointChargeRequestResList( + List pointChargeRequestList) { + if (pointChargeRequestList == null) { return null; } - List list = new ArrayList( pointChargeRequestList.size() ); - for ( PointChargeRequest pointChargeRequest : pointChargeRequestList ) { - list.add( toGetPointChargeRequestRes( pointChargeRequest ) ); + List list = new ArrayList(pointChargeRequestList.size()); + for (PointChargeRequest pointChargeRequest : pointChargeRequestList) { + list.add(toGetPointChargeRequestRes(pointChargeRequest)); } return list; @@ -284,30 +289,30 @@ public List toGetPointChargeRequestResList(List toCustomApplySummaryInfoList(List customList) { - if ( customList == null ) { + if (customList == null) { return null; } - List list = new ArrayList( customList.size() ); - for ( Custom custom : customList ) { - list.add( toCustomApplySummaryInfo( custom ) ); + List list = new ArrayList(customList.size()); + for (Custom custom : customList) { + list.add(toCustomApplySummaryInfo(custom)); } return list; @@ -315,148 +320,148 @@ public List toCustomApplySummaryInfoList(List cu @Override public ReadCustomSummaryRes toReadCustomSummaryRes(Custom custom) { - if ( custom == null ) { + if (custom == null) { return null; } ReadCustomSummaryRes.ReadCustomSummaryResBuilder readCustomSummaryRes = ReadCustomSummaryRes.builder(); - readCustomSummaryRes.imageUrl( custom.getMainImageUrl() ); - readCustomSummaryRes.id( custom.getId() ); - readCustomSummaryRes.name( custom.getName() ); + readCustomSummaryRes.imageUrl(custom.getMainImageUrl()); + readCustomSummaryRes.id(custom.getId()); + readCustomSummaryRes.name(custom.getName()); return readCustomSummaryRes.build(); } @Override public List toReadCustomSummaryResList(List customList) { - if ( customList == null ) { + if (customList == null) { return null; } - List list = new ArrayList( customList.size() ); - for ( Custom custom : customList ) { - list.add( toReadCustomSummaryRes( custom ) ); + List list = new ArrayList(customList.size()); + for (Custom custom : customList) { + list.add(toReadCustomSummaryRes(custom)); } return list; } private Integer productLikedStickerId(ProductLiked productLiked) { - if ( productLiked == null ) { + if (productLiked == null) { return null; } Sticker sticker = productLiked.getSticker(); - if ( sticker == null ) { + if (sticker == null) { return null; } Integer id = sticker.getId(); - if ( id == null ) { + if (id == null) { return null; } return id; } private String productLikedStickerName(ProductLiked productLiked) { - if ( productLiked == null ) { + if (productLiked == null) { return null; } Sticker sticker = productLiked.getSticker(); - if ( sticker == null ) { + if (sticker == null) { return null; } String name = sticker.getName(); - if ( name == null ) { + if (name == null) { return null; } return name; } private Integer productLikedStickerPrice(ProductLiked productLiked) { - if ( productLiked == null ) { + if (productLiked == null) { return null; } Sticker sticker = productLiked.getSticker(); - if ( sticker == null ) { + if (sticker == null) { return null; } Integer price = sticker.getPrice(); - if ( price == null ) { + if (price == null) { return null; } return price; } private String productLikedStickerMainImageUrl(ProductLiked productLiked) { - if ( productLiked == null ) { + if (productLiked == null) { return null; } Sticker sticker = productLiked.getSticker(); - if ( sticker == null ) { + if (sticker == null) { return null; } String mainImageUrl = sticker.getMainImageUrl(); - if ( mainImageUrl == null ) { + if (mainImageUrl == null) { return null; } return mainImageUrl; } private Integer orderUserId(Order order) { - if ( order == null ) { + if (order == null) { return null; } User user = order.getUser(); - if ( user == null ) { + if (user == null) { return null; } Integer id = user.getId(); - if ( id == null ) { + if (id == null) { return null; } return id; } private Integer orderStickerId(Order order) { - if ( order == null ) { + if (order == null) { return null; } Sticker sticker = order.getSticker(); - if ( sticker == null ) { + if (sticker == null) { return null; } Integer id = sticker.getId(); - if ( id == null ) { + if (id == null) { return null; } return id; } private String orderOrderStatusValue(Order order) { - if ( order == null ) { + if (order == null) { return null; } OrderStatus orderStatus = order.getOrderStatus(); - if ( orderStatus == null ) { + if (orderStatus == null) { return null; } String value = orderStatus.getValue(); - if ( value == null ) { + if (value == null) { return null; } return value; } private Integer pointChargeRequestUserId(PointChargeRequest pointChargeRequest) { - if ( pointChargeRequest == null ) { + if (pointChargeRequest == null) { return null; } User user = pointChargeRequest.getUser(); - if ( user == null ) { + if (user == null) { return null; } Integer id = user.getId(); - if ( id == null ) { + if (id == null) { return null; } return id; diff --git a/server/src/main/java/org/tattour/server/domain/admin/controller/dto/request/PatchCustomProcessReq.java b/server/src/main/java/org/tattour/server/domain/admin/controller/dto/request/PatchCustomProcessReq.java index a888ff72..dc90e334 100644 --- a/server/src/main/java/org/tattour/server/domain/admin/controller/dto/request/PatchCustomProcessReq.java +++ b/server/src/main/java/org/tattour/server/domain/admin/controller/dto/request/PatchCustomProcessReq.java @@ -4,7 +4,7 @@ import javax.validation.constraints.NotNull; import lombok.Getter; import lombok.NoArgsConstructor; -import org.tattour.server.domain.custom.domain.CustomProcess; +import org.tattour.server.domain.custom.model.CustomProcess; import org.tattour.server.domain.custom.facade.dto.request.UpdateCustomReq; @Getter diff --git a/server/src/main/java/org/tattour/server/domain/admin/facade/impl/AdminFacadeImpl.java b/server/src/main/java/org/tattour/server/domain/admin/facade/impl/AdminFacadeImpl.java index 6b991981..113ea3a9 100644 --- a/server/src/main/java/org/tattour/server/domain/admin/facade/impl/AdminFacadeImpl.java +++ b/server/src/main/java/org/tattour/server/domain/admin/facade/impl/AdminFacadeImpl.java @@ -5,10 +5,10 @@ import org.springframework.transaction.annotation.Transactional; import org.tattour.server.domain.admin.controller.dto.request.AdminLoginReq; import org.tattour.server.domain.admin.controller.dto.response.AdminLoginRes; -import org.tattour.server.domain.admin.domain.Admin; import org.tattour.server.domain.admin.facade.AdminFacade; +import org.tattour.server.domain.admin.model.Admin; import org.tattour.server.domain.admin.service.AdminService; -import org.tattour.server.domain.user.domain.UserRole; +import org.tattour.server.domain.user.model.UserRole; import org.tattour.server.global.config.jwt.JwtService; import org.tattour.server.global.exception.BusinessException; import org.tattour.server.global.exception.ErrorType; diff --git a/server/src/main/java/org/tattour/server/domain/admin/domain/Admin.java b/server/src/main/java/org/tattour/server/domain/admin/model/Admin.java similarity index 94% rename from server/src/main/java/org/tattour/server/domain/admin/domain/Admin.java rename to server/src/main/java/org/tattour/server/domain/admin/model/Admin.java index 0a404774..fa501f30 100644 --- a/server/src/main/java/org/tattour/server/domain/admin/domain/Admin.java +++ b/server/src/main/java/org/tattour/server/domain/admin/model/Admin.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.admin.domain; +package org.tattour.server.domain.admin.model; import java.sql.Timestamp; import javax.persistence.Column; diff --git a/server/src/main/java/org/tattour/server/domain/admin/domain/AdminAccessLog.java b/server/src/main/java/org/tattour/server/domain/admin/model/AdminAccessLog.java similarity index 95% rename from server/src/main/java/org/tattour/server/domain/admin/domain/AdminAccessLog.java rename to server/src/main/java/org/tattour/server/domain/admin/model/AdminAccessLog.java index ef8fa8df..123b7ecb 100644 --- a/server/src/main/java/org/tattour/server/domain/admin/domain/AdminAccessLog.java +++ b/server/src/main/java/org/tattour/server/domain/admin/model/AdminAccessLog.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.admin.domain; +package org.tattour.server.domain.admin.model; import java.sql.Timestamp; import javax.persistence.Entity; diff --git a/server/src/main/java/org/tattour/server/domain/admin/repository/AdminAccessLogRepository.java b/server/src/main/java/org/tattour/server/domain/admin/repository/AdminAccessLogRepository.java index 42dad336..ece522a7 100644 --- a/server/src/main/java/org/tattour/server/domain/admin/repository/AdminAccessLogRepository.java +++ b/server/src/main/java/org/tattour/server/domain/admin/repository/AdminAccessLogRepository.java @@ -2,7 +2,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import org.tattour.server.domain.admin.domain.AdminAccessLog; +import org.tattour.server.domain.admin.model.AdminAccessLog; @Repository public interface AdminAccessLogRepository extends JpaRepository { diff --git a/server/src/main/java/org/tattour/server/domain/admin/repository/AdminRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/admin/repository/AdminRepositoryImpl.java index f581f22b..f068bb59 100644 --- a/server/src/main/java/org/tattour/server/domain/admin/repository/AdminRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/admin/repository/AdminRepositoryImpl.java @@ -3,7 +3,7 @@ import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import org.tattour.server.domain.admin.domain.Admin; +import org.tattour.server.domain.admin.model.Admin; @Repository public interface AdminRepositoryImpl extends JpaRepository { diff --git a/server/src/main/java/org/tattour/server/domain/admin/service/AdminService.java b/server/src/main/java/org/tattour/server/domain/admin/service/AdminService.java index c95f86ea..9cf2aad2 100644 --- a/server/src/main/java/org/tattour/server/domain/admin/service/AdminService.java +++ b/server/src/main/java/org/tattour/server/domain/admin/service/AdminService.java @@ -1,6 +1,6 @@ package org.tattour.server.domain.admin.service; -import org.tattour.server.domain.admin.domain.Admin; +import org.tattour.server.domain.admin.model.Admin; public interface AdminService { diff --git a/server/src/main/java/org/tattour/server/domain/admin/service/impl/AdminServiceImpl.java b/server/src/main/java/org/tattour/server/domain/admin/service/impl/AdminServiceImpl.java index 9376d029..e60fbdda 100644 --- a/server/src/main/java/org/tattour/server/domain/admin/service/impl/AdminServiceImpl.java +++ b/server/src/main/java/org/tattour/server/domain/admin/service/impl/AdminServiceImpl.java @@ -3,8 +3,8 @@ import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; -import org.tattour.server.domain.admin.domain.Admin; -import org.tattour.server.domain.admin.domain.AdminAccessLog; +import org.tattour.server.domain.admin.model.Admin; +import org.tattour.server.domain.admin.model.AdminAccessLog; import org.tattour.server.domain.admin.repository.AdminAccessLogRepository; import org.tattour.server.domain.admin.repository.AdminRepositoryImpl; import org.tattour.server.domain.admin.service.AdminService; diff --git a/server/src/main/java/org/tattour/server/domain/banner/domain/Banner.java b/server/src/main/java/org/tattour/server/domain/banner/model/Banner.java similarity index 93% rename from server/src/main/java/org/tattour/server/domain/banner/domain/Banner.java rename to server/src/main/java/org/tattour/server/domain/banner/model/Banner.java index cd78c834..8a947975 100644 --- a/server/src/main/java/org/tattour/server/domain/banner/domain/Banner.java +++ b/server/src/main/java/org/tattour/server/domain/banner/model/Banner.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.banner.domain; +package org.tattour.server.domain.banner.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/server/src/main/java/org/tattour/server/domain/cart/facade/impl/CartFacadeImpl.java b/server/src/main/java/org/tattour/server/domain/cart/facade/impl/CartFacadeImpl.java index 7478057a..a0970e06 100644 --- a/server/src/main/java/org/tattour/server/domain/cart/facade/impl/CartFacadeImpl.java +++ b/server/src/main/java/org/tattour/server/domain/cart/facade/impl/CartFacadeImpl.java @@ -9,13 +9,13 @@ import org.tattour.server.domain.cart.controller.dto.request.CartItemReq; import org.tattour.server.domain.cart.controller.dto.request.UpdateCartCountReq; import org.tattour.server.domain.cart.controller.dto.response.CartItemsRes; -import org.tattour.server.domain.cart.domain.Cart; import org.tattour.server.domain.cart.facade.CartFacade; +import org.tattour.server.domain.cart.model.Cart; import org.tattour.server.domain.cart.service.CartService; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; import org.tattour.server.domain.sticker.provider.StickerProvider; import org.tattour.server.domain.sticker.provider.vo.StickerOrderInfo; -import org.tattour.server.domain.user.domain.User; +import org.tattour.server.domain.user.model.User; import org.tattour.server.domain.user.service.UserService; import org.tattour.server.global.util.EntityDtoMapper; diff --git a/server/src/main/java/org/tattour/server/domain/cart/domain/Cart.java b/server/src/main/java/org/tattour/server/domain/cart/model/Cart.java similarity index 86% rename from server/src/main/java/org/tattour/server/domain/cart/domain/Cart.java rename to server/src/main/java/org/tattour/server/domain/cart/model/Cart.java index a55cc83e..68d6150d 100644 --- a/server/src/main/java/org/tattour/server/domain/cart/domain/Cart.java +++ b/server/src/main/java/org/tattour/server/domain/cart/model/Cart.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.cart.domain; +package org.tattour.server.domain.cart.model; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -12,8 +12,8 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.tattour.server.domain.sticker.domain.Sticker; -import org.tattour.server.domain.user.domain.User; +import org.tattour.server.domain.sticker.model.Sticker; +import org.tattour.server.domain.user.model.User; @Entity @Builder diff --git a/server/src/main/java/org/tattour/server/domain/cart/repository/CartRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/cart/repository/CartRepositoryImpl.java index 9c3840ba..170df17e 100644 --- a/server/src/main/java/org/tattour/server/domain/cart/repository/CartRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/cart/repository/CartRepositoryImpl.java @@ -4,9 +4,9 @@ import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import org.tattour.server.domain.cart.domain.Cart; -import org.tattour.server.domain.sticker.domain.Sticker; -import org.tattour.server.domain.user.domain.User; +import org.tattour.server.domain.cart.model.Cart; +import org.tattour.server.domain.sticker.model.Sticker; +import org.tattour.server.domain.user.model.User; @Repository public interface CartRepositoryImpl extends JpaRepository { diff --git a/server/src/main/java/org/tattour/server/domain/cart/service/CartService.java b/server/src/main/java/org/tattour/server/domain/cart/service/CartService.java index cd1dcd3b..b67bb46f 100644 --- a/server/src/main/java/org/tattour/server/domain/cart/service/CartService.java +++ b/server/src/main/java/org/tattour/server/domain/cart/service/CartService.java @@ -2,9 +2,9 @@ import java.util.List; import java.util.Optional; -import org.tattour.server.domain.cart.domain.Cart; -import org.tattour.server.domain.sticker.domain.Sticker; -import org.tattour.server.domain.user.domain.User; +import org.tattour.server.domain.cart.model.Cart; +import org.tattour.server.domain.sticker.model.Sticker; +import org.tattour.server.domain.user.model.User; public interface CartService { List findByUserId(int userId); diff --git a/server/src/main/java/org/tattour/server/domain/cart/service/impl/CartServiceImpl.java b/server/src/main/java/org/tattour/server/domain/cart/service/impl/CartServiceImpl.java index 654fcde5..10933b12 100644 --- a/server/src/main/java/org/tattour/server/domain/cart/service/impl/CartServiceImpl.java +++ b/server/src/main/java/org/tattour/server/domain/cart/service/impl/CartServiceImpl.java @@ -4,11 +4,11 @@ import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.tattour.server.domain.cart.domain.Cart; +import org.tattour.server.domain.cart.model.Cart; import org.tattour.server.domain.cart.repository.CartRepositoryImpl; import org.tattour.server.domain.cart.service.CartService; -import org.tattour.server.domain.sticker.domain.Sticker; -import org.tattour.server.domain.user.domain.User; +import org.tattour.server.domain.sticker.model.Sticker; +import org.tattour.server.domain.user.model.User; import org.tattour.server.global.exception.BusinessException; import org.tattour.server.global.exception.ErrorType; diff --git a/server/src/main/java/org/tattour/server/domain/custom/facade/dto/request/UpdateCustomReq.java b/server/src/main/java/org/tattour/server/domain/custom/facade/dto/request/UpdateCustomReq.java index 100dfee5..0fb23c05 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/facade/dto/request/UpdateCustomReq.java +++ b/server/src/main/java/org/tattour/server/domain/custom/facade/dto/request/UpdateCustomReq.java @@ -5,9 +5,9 @@ import lombok.Builder; import lombok.Getter; import org.springframework.web.multipart.MultipartFile; -import org.tattour.server.domain.custom.domain.Custom; -import org.tattour.server.domain.custom.domain.CustomProcess; -import org.tattour.server.domain.custom.domain.CustomSize; +import org.tattour.server.domain.custom.model.Custom; +import org.tattour.server.domain.custom.model.CustomProcess; +import org.tattour.server.domain.custom.model.CustomSize; @Getter @Builder(access = AccessLevel.PRIVATE) diff --git a/server/src/main/java/org/tattour/server/domain/custom/facade/dto/response/ReadCustomRes.java b/server/src/main/java/org/tattour/server/domain/custom/facade/dto/response/ReadCustomRes.java index f6a5fbce..42ae1b08 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/facade/dto/response/ReadCustomRes.java +++ b/server/src/main/java/org/tattour/server/domain/custom/facade/dto/response/ReadCustomRes.java @@ -6,8 +6,8 @@ import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; -import org.tattour.server.domain.custom.domain.Custom; -import org.tattour.server.domain.custom.domain.CustomImage; +import org.tattour.server.domain.custom.model.Custom; +import org.tattour.server.domain.custom.model.CustomImage; @Getter @Builder(access = AccessLevel.PRIVATE) diff --git a/server/src/main/java/org/tattour/server/domain/custom/facade/dto/response/ReadCustomSummaryListRes.java b/server/src/main/java/org/tattour/server/domain/custom/facade/dto/response/ReadCustomSummaryListRes.java index b225cbb1..bb8dc0f8 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/facade/dto/response/ReadCustomSummaryListRes.java +++ b/server/src/main/java/org/tattour/server/domain/custom/facade/dto/response/ReadCustomSummaryListRes.java @@ -5,7 +5,7 @@ import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -import org.tattour.server.domain.custom.domain.Custom; +import org.tattour.server.domain.custom.model.Custom; @Getter @AllArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/server/src/main/java/org/tattour/server/domain/custom/facade/dto/response/ReadCustomSummaryRes.java b/server/src/main/java/org/tattour/server/domain/custom/facade/dto/response/ReadCustomSummaryRes.java index 78ef84ac..7e5e30b0 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/facade/dto/response/ReadCustomSummaryRes.java +++ b/server/src/main/java/org/tattour/server/domain/custom/facade/dto/response/ReadCustomSummaryRes.java @@ -2,7 +2,7 @@ import lombok.Builder; import lombok.Getter; -import org.tattour.server.domain.custom.domain.Custom; +import org.tattour.server.domain.custom.model.Custom; @Getter @Builder diff --git a/server/src/main/java/org/tattour/server/domain/custom/facade/impl/CustomFacadeImpl.java b/server/src/main/java/org/tattour/server/domain/custom/facade/impl/CustomFacadeImpl.java index 55cc38d6..d46dba54 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/facade/impl/CustomFacadeImpl.java +++ b/server/src/main/java/org/tattour/server/domain/custom/facade/impl/CustomFacadeImpl.java @@ -7,18 +7,18 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import org.tattour.server.domain.custom.domain.Custom; -import org.tattour.server.domain.custom.domain.CustomImage; import org.tattour.server.domain.custom.facade.CustomFacade; import org.tattour.server.domain.custom.facade.dto.request.UpdateCustomReq; import org.tattour.server.domain.custom.facade.dto.response.ReadCustomRes; import org.tattour.server.domain.custom.facade.dto.response.ReadCustomSummaryListRes; +import org.tattour.server.domain.custom.model.Custom; +import org.tattour.server.domain.custom.model.CustomImage; import org.tattour.server.domain.custom.provider.impl.CustomProviderImpl; import org.tattour.server.domain.custom.service.CustomImageService; import org.tattour.server.domain.custom.service.CustomService; import org.tattour.server.domain.custom.service.CustomStyleService; import org.tattour.server.domain.custom.service.CustomThemeService; -import org.tattour.server.domain.user.domain.User; +import org.tattour.server.domain.user.model.User; import org.tattour.server.domain.user.service.UserService; import org.tattour.server.infra.discord.service.DiscordMessageService; import org.tattour.server.infra.s3.S3Service; diff --git a/server/src/main/java/org/tattour/server/domain/custom/domain/Custom.java b/server/src/main/java/org/tattour/server/domain/custom/model/Custom.java similarity index 96% rename from server/src/main/java/org/tattour/server/domain/custom/domain/Custom.java rename to server/src/main/java/org/tattour/server/domain/custom/model/Custom.java index cea9e8fd..6edc106d 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/domain/Custom.java +++ b/server/src/main/java/org/tattour/server/domain/custom/model/Custom.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.custom.domain; +package org.tattour.server.domain.custom.model; import java.util.ArrayList; import java.util.List; @@ -22,8 +22,8 @@ import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.tattour.server.domain.sticker.domain.Sticker; -import org.tattour.server.domain.user.domain.User; +import org.tattour.server.domain.sticker.model.Sticker; +import org.tattour.server.domain.user.model.User; import org.tattour.server.global.util.AuditingTimeEntity; @Getter diff --git a/server/src/main/java/org/tattour/server/domain/custom/domain/CustomImage.java b/server/src/main/java/org/tattour/server/domain/custom/model/CustomImage.java similarity index 95% rename from server/src/main/java/org/tattour/server/domain/custom/domain/CustomImage.java rename to server/src/main/java/org/tattour/server/domain/custom/model/CustomImage.java index ba21288f..fcb05773 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/domain/CustomImage.java +++ b/server/src/main/java/org/tattour/server/domain/custom/model/CustomImage.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.custom.domain; +package org.tattour.server.domain.custom.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/server/src/main/java/org/tattour/server/domain/custom/domain/CustomProcess.java b/server/src/main/java/org/tattour/server/domain/custom/model/CustomProcess.java similarity index 95% rename from server/src/main/java/org/tattour/server/domain/custom/domain/CustomProcess.java rename to server/src/main/java/org/tattour/server/domain/custom/model/CustomProcess.java index 734e29d4..952b8121 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/domain/CustomProcess.java +++ b/server/src/main/java/org/tattour/server/domain/custom/model/CustomProcess.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.custom.domain; +package org.tattour.server.domain.custom.model; import lombok.AccessLevel; import lombok.Getter; diff --git a/server/src/main/java/org/tattour/server/domain/custom/domain/CustomSize.java b/server/src/main/java/org/tattour/server/domain/custom/model/CustomSize.java similarity index 95% rename from server/src/main/java/org/tattour/server/domain/custom/domain/CustomSize.java rename to server/src/main/java/org/tattour/server/domain/custom/model/CustomSize.java index d9fee3dc..23f98f3f 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/domain/CustomSize.java +++ b/server/src/main/java/org/tattour/server/domain/custom/model/CustomSize.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.custom.domain; +package org.tattour.server.domain.custom.model; import lombok.AccessLevel; import lombok.Getter; diff --git a/server/src/main/java/org/tattour/server/domain/custom/domain/CustomStyle.java b/server/src/main/java/org/tattour/server/domain/custom/model/CustomStyle.java similarity index 91% rename from server/src/main/java/org/tattour/server/domain/custom/domain/CustomStyle.java rename to server/src/main/java/org/tattour/server/domain/custom/model/CustomStyle.java index 6cfdfba6..feaf383b 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/domain/CustomStyle.java +++ b/server/src/main/java/org/tattour/server/domain/custom/model/CustomStyle.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.custom.domain; +package org.tattour.server.domain.custom.model; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -13,7 +13,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.tattour.server.domain.style.domain.Style; +import org.tattour.server.domain.style.model.Style; @Getter @Table(name = "custom_style") diff --git a/server/src/main/java/org/tattour/server/domain/custom/domain/CustomTheme.java b/server/src/main/java/org/tattour/server/domain/custom/model/CustomTheme.java similarity index 91% rename from server/src/main/java/org/tattour/server/domain/custom/domain/CustomTheme.java rename to server/src/main/java/org/tattour/server/domain/custom/model/CustomTheme.java index 76a5092c..48db4ac9 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/domain/CustomTheme.java +++ b/server/src/main/java/org/tattour/server/domain/custom/model/CustomTheme.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.custom.domain; +package org.tattour.server.domain.custom.model; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -14,7 +14,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; -import org.tattour.server.domain.theme.domain.Theme; +import org.tattour.server.domain.theme.model.Theme; @Getter @Table(name = "custom_theme") diff --git a/server/src/main/java/org/tattour/server/domain/custom/provider/CustomProvider.java b/server/src/main/java/org/tattour/server/domain/custom/provider/CustomProvider.java index e3c42c3f..59201969 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/provider/CustomProvider.java +++ b/server/src/main/java/org/tattour/server/domain/custom/provider/CustomProvider.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.custom.provider; import java.util.List; -import org.tattour.server.domain.custom.domain.Custom; +import org.tattour.server.domain.custom.model.Custom; public interface CustomProvider { diff --git a/server/src/main/java/org/tattour/server/domain/custom/provider/impl/CustomProviderImpl.java b/server/src/main/java/org/tattour/server/domain/custom/provider/impl/CustomProviderImpl.java index db852b26..76009b25 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/provider/impl/CustomProviderImpl.java +++ b/server/src/main/java/org/tattour/server/domain/custom/provider/impl/CustomProviderImpl.java @@ -4,7 +4,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.tattour.server.domain.custom.domain.Custom; +import org.tattour.server.domain.custom.model.Custom; import org.tattour.server.domain.custom.exception.NotFoundCustomException; import org.tattour.server.domain.custom.provider.CustomProvider; import org.tattour.server.domain.custom.repository.CustomRepository; diff --git a/server/src/main/java/org/tattour/server/domain/custom/repository/CustomImageRepository.java b/server/src/main/java/org/tattour/server/domain/custom/repository/CustomImageRepository.java index e9440c80..0541ec74 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/repository/CustomImageRepository.java +++ b/server/src/main/java/org/tattour/server/domain/custom/repository/CustomImageRepository.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.custom.repository; import java.util.List; -import org.tattour.server.domain.custom.domain.CustomImage; +import org.tattour.server.domain.custom.model.CustomImage; public interface CustomImageRepository { diff --git a/server/src/main/java/org/tattour/server/domain/custom/repository/CustomRepository.java b/server/src/main/java/org/tattour/server/domain/custom/repository/CustomRepository.java index 76885e68..941c2cb5 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/repository/CustomRepository.java +++ b/server/src/main/java/org/tattour/server/domain/custom/repository/CustomRepository.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Optional; import org.springframework.data.repository.Repository; -import org.tattour.server.domain.custom.domain.Custom; +import org.tattour.server.domain.custom.model.Custom; import org.tattour.server.domain.custom.repository.custom.CustomRepositoryCustom; public interface CustomRepository extends diff --git a/server/src/main/java/org/tattour/server/domain/custom/repository/CustomStyleRepository.java b/server/src/main/java/org/tattour/server/domain/custom/repository/CustomStyleRepository.java index 0b47d432..2632eb1d 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/repository/CustomStyleRepository.java +++ b/server/src/main/java/org/tattour/server/domain/custom/repository/CustomStyleRepository.java @@ -2,7 +2,7 @@ import java.util.List; import java.util.Optional; -import org.tattour.server.domain.custom.domain.CustomStyle; +import org.tattour.server.domain.custom.model.CustomStyle; public interface CustomStyleRepository { diff --git a/server/src/main/java/org/tattour/server/domain/custom/repository/CustomThemeRepository.java b/server/src/main/java/org/tattour/server/domain/custom/repository/CustomThemeRepository.java index 682fdab0..7f3dac20 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/repository/CustomThemeRepository.java +++ b/server/src/main/java/org/tattour/server/domain/custom/repository/CustomThemeRepository.java @@ -2,7 +2,7 @@ import java.util.List; import java.util.Optional; -import org.tattour.server.domain.custom.domain.CustomTheme; +import org.tattour.server.domain.custom.model.CustomTheme; public interface CustomThemeRepository { diff --git a/server/src/main/java/org/tattour/server/domain/custom/repository/custom/CustomRepositoryCustom.java b/server/src/main/java/org/tattour/server/domain/custom/repository/custom/CustomRepositoryCustom.java index 4c587772..94a8f343 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/repository/custom/CustomRepositoryCustom.java +++ b/server/src/main/java/org/tattour/server/domain/custom/repository/custom/CustomRepositoryCustom.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.custom.repository.custom; import java.util.List; -import org.tattour.server.domain.custom.domain.Custom; +import org.tattour.server.domain.custom.model.Custom; public interface CustomRepositoryCustom { diff --git a/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomImageRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomImageRepositoryImpl.java index c68df074..0e3fd38d 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomImageRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomImageRepositoryImpl.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.custom.repository.impl; import org.springframework.data.repository.Repository; -import org.tattour.server.domain.custom.domain.CustomImage; +import org.tattour.server.domain.custom.model.CustomImage; import org.tattour.server.domain.custom.repository.CustomImageRepository; public interface CustomImageRepositoryImpl extends diff --git a/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomRepositoryImpl.java index ce9f4586..17d6ab88 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomRepositoryImpl.java @@ -1,11 +1,11 @@ package org.tattour.server.domain.custom.repository.impl; -import static org.tattour.server.domain.custom.domain.QCustom.*; +import static org.tattour.server.domain.custom.model.QCustom.*; import com.querydsl.jpa.impl.JPAQueryFactory; import java.util.List; import lombok.RequiredArgsConstructor; -import org.tattour.server.domain.custom.domain.Custom; +import org.tattour.server.domain.custom.model.Custom; import org.tattour.server.domain.custom.repository.custom.CustomRepositoryCustom; @RequiredArgsConstructor diff --git a/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomStyleRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomStyleRepositoryImpl.java index 645f192d..d97a215a 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomStyleRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomStyleRepositoryImpl.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.custom.repository.impl; import org.springframework.data.repository.Repository; -import org.tattour.server.domain.custom.domain.CustomStyle; +import org.tattour.server.domain.custom.model.CustomStyle; import org.tattour.server.domain.custom.repository.CustomStyleRepository; public interface CustomStyleRepositoryImpl extends diff --git a/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomThemeRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomThemeRepositoryImpl.java index 7be4175e..2f1e64f2 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomThemeRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/custom/repository/impl/CustomThemeRepositoryImpl.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.custom.repository.impl; import org.springframework.data.repository.Repository; -import org.tattour.server.domain.custom.domain.CustomTheme; +import org.tattour.server.domain.custom.model.CustomTheme; import org.tattour.server.domain.custom.repository.CustomThemeRepository; public interface CustomThemeRepositoryImpl extends diff --git a/server/src/main/java/org/tattour/server/domain/custom/service/CustomImageService.java b/server/src/main/java/org/tattour/server/domain/custom/service/CustomImageService.java index 7ea9f1fc..ea5e4543 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/service/CustomImageService.java +++ b/server/src/main/java/org/tattour/server/domain/custom/service/CustomImageService.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.custom.service; import java.util.List; -import org.tattour.server.domain.custom.domain.CustomImage; +import org.tattour.server.domain.custom.model.CustomImage; public interface CustomImageService { diff --git a/server/src/main/java/org/tattour/server/domain/custom/service/CustomService.java b/server/src/main/java/org/tattour/server/domain/custom/service/CustomService.java index ca7f3b04..e40a2d38 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/service/CustomService.java +++ b/server/src/main/java/org/tattour/server/domain/custom/service/CustomService.java @@ -1,21 +1,21 @@ package org.tattour.server.domain.custom.service; import org.springframework.web.multipart.MultipartFile; -import org.tattour.server.domain.custom.domain.Custom; -import org.tattour.server.domain.custom.domain.CustomProcess; -import org.tattour.server.domain.user.domain.User; +import org.tattour.server.domain.custom.model.Custom; +import org.tattour.server.domain.custom.model.CustomProcess; +import org.tattour.server.domain.user.model.User; public interface CustomService { - Custom save(Custom custom); + Custom save(Custom custom); - Custom createInitCustom(User user, Boolean haveDesign); + Custom createInitCustom(User user, Boolean haveDesign); - Custom updateCustom(Custom custom, Custom updateCustomInfo); + Custom updateCustom(Custom custom, Custom updateCustomInfo); - Custom updateCustomProcess(Custom updateCustom, CustomProcess customProcess); + Custom updateCustomProcess(Custom updateCustom, CustomProcess customProcess); - void setHandDrawingImage(Custom updateCustom, MultipartFile handDrawingImage); + void setHandDrawingImage(Custom updateCustom, MultipartFile handDrawingImage); - void setMainImageUrl(Custom updateCustom, MultipartFile mainImage); + void setMainImageUrl(Custom updateCustom, MultipartFile mainImage); } diff --git a/server/src/main/java/org/tattour/server/domain/custom/service/CustomStyleService.java b/server/src/main/java/org/tattour/server/domain/custom/service/CustomStyleService.java index 3e11e4a6..385a66c5 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/service/CustomStyleService.java +++ b/server/src/main/java/org/tattour/server/domain/custom/service/CustomStyleService.java @@ -1,8 +1,8 @@ package org.tattour.server.domain.custom.service; import java.util.List; -import org.tattour.server.domain.custom.domain.Custom; -import org.tattour.server.domain.custom.domain.CustomStyle; +import org.tattour.server.domain.custom.model.Custom; +import org.tattour.server.domain.custom.model.CustomStyle; public interface CustomStyleService { diff --git a/server/src/main/java/org/tattour/server/domain/custom/service/CustomThemeService.java b/server/src/main/java/org/tattour/server/domain/custom/service/CustomThemeService.java index ebbff90c..9185de16 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/service/CustomThemeService.java +++ b/server/src/main/java/org/tattour/server/domain/custom/service/CustomThemeService.java @@ -1,8 +1,8 @@ package org.tattour.server.domain.custom.service; import java.util.List; -import org.tattour.server.domain.custom.domain.Custom; -import org.tattour.server.domain.custom.domain.CustomTheme; +import org.tattour.server.domain.custom.model.Custom; +import org.tattour.server.domain.custom.model.CustomTheme; public interface CustomThemeService { diff --git a/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomImageServiceImpl.java b/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomImageServiceImpl.java index c7579936..32865502 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomImageServiceImpl.java +++ b/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomImageServiceImpl.java @@ -3,7 +3,7 @@ import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.tattour.server.domain.custom.domain.CustomImage; +import org.tattour.server.domain.custom.model.CustomImage; import org.tattour.server.domain.custom.repository.CustomImageRepository; import org.tattour.server.domain.custom.service.CustomImageService; diff --git a/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomServiceImpl.java b/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomServiceImpl.java index 2334ed6e..5a7894d7 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomServiceImpl.java +++ b/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomServiceImpl.java @@ -6,13 +6,13 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import org.tattour.server.domain.custom.domain.Custom; -import org.tattour.server.domain.custom.domain.CustomProcess; import org.tattour.server.domain.custom.exception.InvalidCustomCompletedException; import org.tattour.server.domain.custom.exception.InvalidCustomPriceException; +import org.tattour.server.domain.custom.model.Custom; +import org.tattour.server.domain.custom.model.CustomProcess; import org.tattour.server.domain.custom.repository.CustomRepository; import org.tattour.server.domain.custom.service.CustomService; -import org.tattour.server.domain.user.domain.User; +import org.tattour.server.domain.user.model.User; import org.tattour.server.infra.s3.S3Service; @Slf4j @@ -20,100 +20,100 @@ @RequiredArgsConstructor public class CustomServiceImpl implements CustomService { - private final CustomRepository customRepository; - private final S3Service s3Service; + private final CustomRepository customRepository; + private final S3Service s3Service; - @Value("${image.default.custom}") - private String defaultImageUrl; - private static final String directoryPath = "custom"; + @Value("${image.default.custom}") + private String defaultImageUrl; + private static final String directoryPath = "custom"; - @Override - public Custom save(Custom custom) { - return customRepository.save(custom); - } + @Override + public Custom save(Custom custom) { + return customRepository.save(custom); + } - @Override - public Custom createInitCustom(User user, Boolean haveDesign) { - return Custom.of( - user, - haveDesign, - "임시 저장", - defaultImageUrl, - false, - 0); - } + @Override + public Custom createInitCustom(User user, Boolean haveDesign) { + return Custom.of( + user, + haveDesign, + "임시 저장", + defaultImageUrl, + false, + 0); + } - @Override - public Custom updateCustom(Custom custom, Custom updateCustom) { - if(!Objects.isNull(updateCustom.getMainImageUrl())) { - custom.setMainImageUrl(updateCustom.getMainImageUrl()); - } - if(!Objects.isNull(updateCustom.getHandDrawingImageUrl())) { - custom.setHandDrawingImageUrl(updateCustom.getHandDrawingImageUrl()); - } - if (!Objects.isNull(updateCustom.getSize())) { - custom.setSize(updateCustom.getSize()); - } - if (!Objects.isNull(updateCustom.getName())) { - custom.setName(updateCustom.getName()); - } - if (!Objects.isNull(updateCustom.getDescription())) { - custom.setDescription(updateCustom.getDescription()); - } - if (!Objects.isNull(updateCustom.getDemand())) { - custom.setDemand(updateCustom.getDemand()); - } - if (!Objects.isNull(updateCustom.getCount())) { - custom.setCount(updateCustom.getCount()); - } - if (!Objects.isNull(updateCustom.getIsColored())) { - custom.setColored(updateCustom.getIsColored()); - } - if (!Objects.isNull(updateCustom.getIsPublic())) { - custom.setPublic(updateCustom.getIsPublic()); - } - if (!Objects.isNull(updateCustom.getViewCount())) { - custom.setViewCount(updateCustom.getViewCount()); - } - if (!Objects.isNull(updateCustom.getIsCompleted())) { - if (updateCustom.getIsCompleted()) { - if (!custom.calPrice().equals(updateCustom.getPrice())) { - throw new InvalidCustomPriceException(); - } - custom.setPrice(updateCustom.getPrice()); - custom.setCompleted(updateCustom.getIsCompleted()); - custom.setCustomProcess(CustomProcess.RECEIVING); - } - } - return customRepository.save(custom); - } + @Override + public Custom updateCustom(Custom custom, Custom updateCustom) { + if (!Objects.isNull(updateCustom.getMainImageUrl())) { + custom.setMainImageUrl(updateCustom.getMainImageUrl()); + } + if (!Objects.isNull(updateCustom.getHandDrawingImageUrl())) { + custom.setHandDrawingImageUrl(updateCustom.getHandDrawingImageUrl()); + } + if (!Objects.isNull(updateCustom.getSize())) { + custom.setSize(updateCustom.getSize()); + } + if (!Objects.isNull(updateCustom.getName())) { + custom.setName(updateCustom.getName()); + } + if (!Objects.isNull(updateCustom.getDescription())) { + custom.setDescription(updateCustom.getDescription()); + } + if (!Objects.isNull(updateCustom.getDemand())) { + custom.setDemand(updateCustom.getDemand()); + } + if (!Objects.isNull(updateCustom.getCount())) { + custom.setCount(updateCustom.getCount()); + } + if (!Objects.isNull(updateCustom.getIsColored())) { + custom.setColored(updateCustom.getIsColored()); + } + if (!Objects.isNull(updateCustom.getIsPublic())) { + custom.setPublic(updateCustom.getIsPublic()); + } + if (!Objects.isNull(updateCustom.getViewCount())) { + custom.setViewCount(updateCustom.getViewCount()); + } + if (!Objects.isNull(updateCustom.getIsCompleted())) { + if (updateCustom.getIsCompleted()) { + if (!custom.calPrice().equals(updateCustom.getPrice())) { + throw new InvalidCustomPriceException(); + } + custom.setPrice(updateCustom.getPrice()); + custom.setCompleted(updateCustom.getIsCompleted()); + custom.setCustomProcess(CustomProcess.RECEIVING); + } + } + return customRepository.save(custom); + } - @Override - public Custom updateCustomProcess(Custom custom, CustomProcess customProcess) { - if(Objects.isNull(custom.getIsCompleted())) { - throw new InvalidCustomCompletedException(); - } - if (!custom.getIsCompleted()) { - throw new InvalidCustomCompletedException(); - } - custom.setCustomProcess(customProcess); - return custom; - } + @Override + public Custom updateCustomProcess(Custom custom, CustomProcess customProcess) { + if (Objects.isNull(custom.getIsCompleted())) { + throw new InvalidCustomCompletedException(); + } + if (!custom.getIsCompleted()) { + throw new InvalidCustomCompletedException(); + } + custom.setCustomProcess(customProcess); + return custom; + } - @Override - public void setHandDrawingImage(Custom updateCustom, MultipartFile handDrawingImage) { - updateCustom.setHandDrawingImageUrl( - s3Service.uploadImage( - handDrawingImage, - directoryPath)); - } + @Override + public void setHandDrawingImage(Custom updateCustom, MultipartFile handDrawingImage) { + updateCustom.setHandDrawingImageUrl( + s3Service.uploadImage( + handDrawingImage, + directoryPath)); + } - @Override - public void setMainImageUrl(Custom updateCustom, MultipartFile mainImage) { - updateCustom.setMainImageUrl( - s3Service.uploadImage( - mainImage, - directoryPath)); - } + @Override + public void setMainImageUrl(Custom updateCustom, MultipartFile mainImage) { + updateCustom.setMainImageUrl( + s3Service.uploadImage( + mainImage, + directoryPath)); + } } diff --git a/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomStyleServiceImpl.java b/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomStyleServiceImpl.java index af843b56..28edd6f3 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomStyleServiceImpl.java +++ b/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomStyleServiceImpl.java @@ -5,8 +5,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.tattour.server.domain.custom.domain.Custom; -import org.tattour.server.domain.custom.domain.CustomStyle; +import org.tattour.server.domain.custom.model.Custom; +import org.tattour.server.domain.custom.model.CustomStyle; import org.tattour.server.domain.custom.repository.CustomStyleRepository; import org.tattour.server.domain.custom.service.CustomStyleService; import org.tattour.server.domain.style.provider.StyleProvider; diff --git a/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomThemeServiceImpl.java b/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomThemeServiceImpl.java index fcaac305..1ed57935 100644 --- a/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomThemeServiceImpl.java +++ b/server/src/main/java/org/tattour/server/domain/custom/service/impl/CustomThemeServiceImpl.java @@ -5,8 +5,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.tattour.server.domain.custom.domain.Custom; -import org.tattour.server.domain.custom.domain.CustomTheme; +import org.tattour.server.domain.custom.model.Custom; +import org.tattour.server.domain.custom.model.CustomTheme; import org.tattour.server.domain.custom.repository.CustomThemeRepository; import org.tattour.server.domain.custom.service.CustomThemeService; import org.tattour.server.domain.theme.provider.ThemeProvider; diff --git a/server/src/main/java/org/tattour/server/domain/discount/facade/dto/request/CreateDiscountReq.java b/server/src/main/java/org/tattour/server/domain/discount/facade/dto/request/CreateDiscountReq.java index 466e24b5..e5fd7b23 100644 --- a/server/src/main/java/org/tattour/server/domain/discount/facade/dto/request/CreateDiscountReq.java +++ b/server/src/main/java/org/tattour/server/domain/discount/facade/dto/request/CreateDiscountReq.java @@ -4,7 +4,6 @@ import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; -import org.tattour.server.domain.discount.domain.Discount; @Getter @Builder(access = AccessLevel.PRIVATE) diff --git a/server/src/main/java/org/tattour/server/domain/discount/facade/impl/DiscountFacadeImpl.java b/server/src/main/java/org/tattour/server/domain/discount/facade/impl/DiscountFacadeImpl.java index 3b24b5ff..701ac782 100644 --- a/server/src/main/java/org/tattour/server/domain/discount/facade/impl/DiscountFacadeImpl.java +++ b/server/src/main/java/org/tattour/server/domain/discount/facade/impl/DiscountFacadeImpl.java @@ -3,12 +3,12 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.tattour.server.domain.discount.domain.Discount; +import org.tattour.server.domain.discount.model.Discount; import org.tattour.server.domain.discount.provider.DiscountProvider; import org.tattour.server.domain.discount.repository.DiscountRepository; import org.tattour.server.domain.discount.facade.DiscountFacade; import org.tattour.server.domain.discount.facade.dto.request.CreateDiscountReq; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; import org.tattour.server.domain.sticker.facade.dto.response.ReadStickerRes; import org.tattour.server.domain.sticker.provider.StickerProvider; diff --git a/server/src/main/java/org/tattour/server/domain/discount/domain/Discount.java b/server/src/main/java/org/tattour/server/domain/discount/model/Discount.java similarity index 96% rename from server/src/main/java/org/tattour/server/domain/discount/domain/Discount.java rename to server/src/main/java/org/tattour/server/domain/discount/model/Discount.java index 6dfb8b17..f897318f 100644 --- a/server/src/main/java/org/tattour/server/domain/discount/domain/Discount.java +++ b/server/src/main/java/org/tattour/server/domain/discount/model/Discount.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.discount.domain; +package org.tattour.server.domain.discount.model; import java.time.LocalDateTime; import javax.persistence.Column; diff --git a/server/src/main/java/org/tattour/server/domain/discount/provider/DiscountProvider.java b/server/src/main/java/org/tattour/server/domain/discount/provider/DiscountProvider.java index e0352594..8d808d86 100644 --- a/server/src/main/java/org/tattour/server/domain/discount/provider/DiscountProvider.java +++ b/server/src/main/java/org/tattour/server/domain/discount/provider/DiscountProvider.java @@ -1,6 +1,6 @@ package org.tattour.server.domain.discount.provider; -import org.tattour.server.domain.discount.domain.Discount; +import org.tattour.server.domain.discount.model.Discount; public interface DiscountProvider { diff --git a/server/src/main/java/org/tattour/server/domain/discount/provider/impl/DiscountProviderImpl.java b/server/src/main/java/org/tattour/server/domain/discount/provider/impl/DiscountProviderImpl.java index 1fd5be82..0ade7ae0 100644 --- a/server/src/main/java/org/tattour/server/domain/discount/provider/impl/DiscountProviderImpl.java +++ b/server/src/main/java/org/tattour/server/domain/discount/provider/impl/DiscountProviderImpl.java @@ -2,7 +2,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import org.tattour.server.domain.discount.domain.Discount; +import org.tattour.server.domain.discount.model.Discount; import org.tattour.server.domain.discount.exception.NotFoundDiscountException; import org.tattour.server.domain.discount.provider.DiscountProvider; import org.tattour.server.domain.discount.repository.DiscountRepository; diff --git a/server/src/main/java/org/tattour/server/domain/discount/repository/DiscountRepository.java b/server/src/main/java/org/tattour/server/domain/discount/repository/DiscountRepository.java index 4cbd95c5..54616691 100644 --- a/server/src/main/java/org/tattour/server/domain/discount/repository/DiscountRepository.java +++ b/server/src/main/java/org/tattour/server/domain/discount/repository/DiscountRepository.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.discount.repository; import java.util.Optional; -import org.tattour.server.domain.discount.domain.Discount; +import org.tattour.server.domain.discount.model.Discount; public interface DiscountRepository { diff --git a/server/src/main/java/org/tattour/server/domain/discount/repository/impl/DiscountRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/discount/repository/impl/DiscountRepositoryImpl.java index 133d1101..06e5a4ad 100644 --- a/server/src/main/java/org/tattour/server/domain/discount/repository/impl/DiscountRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/discount/repository/impl/DiscountRepositoryImpl.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.discount.repository.impl; import org.springframework.data.repository.Repository; -import org.tattour.server.domain.discount.domain.Discount; +import org.tattour.server.domain.discount.model.Discount; import org.tattour.server.domain.discount.repository.DiscountRepository; public interface DiscountRepositoryImpl extends diff --git a/server/src/main/java/org/tattour/server/domain/magazine/facade/dto/response/ReadMagazineRes.java b/server/src/main/java/org/tattour/server/domain/magazine/facade/dto/response/ReadMagazineRes.java index 836e0f75..5e91fe51 100644 --- a/server/src/main/java/org/tattour/server/domain/magazine/facade/dto/response/ReadMagazineRes.java +++ b/server/src/main/java/org/tattour/server/domain/magazine/facade/dto/response/ReadMagazineRes.java @@ -3,7 +3,7 @@ import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -import org.tattour.server.domain.magazine.domain.Magazine; +import org.tattour.server.domain.magazine.model.Magazine; @Getter @AllArgsConstructor(access = AccessLevel.PACKAGE) diff --git a/server/src/main/java/org/tattour/server/domain/magazine/facade/dto/response/ReadMagazineUrlRes.java b/server/src/main/java/org/tattour/server/domain/magazine/facade/dto/response/ReadMagazineUrlRes.java index f5c726a2..e65c8da7 100644 --- a/server/src/main/java/org/tattour/server/domain/magazine/facade/dto/response/ReadMagazineUrlRes.java +++ b/server/src/main/java/org/tattour/server/domain/magazine/facade/dto/response/ReadMagazineUrlRes.java @@ -2,7 +2,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; -import org.tattour.server.domain.magazine.domain.Magazine; +import org.tattour.server.domain.magazine.model.Magazine; @Getter @AllArgsConstructor diff --git a/server/src/main/java/org/tattour/server/domain/magazine/domain/Magazine.java b/server/src/main/java/org/tattour/server/domain/magazine/model/Magazine.java similarity index 94% rename from server/src/main/java/org/tattour/server/domain/magazine/domain/Magazine.java rename to server/src/main/java/org/tattour/server/domain/magazine/model/Magazine.java index 4aed715f..a2ce32ce 100644 --- a/server/src/main/java/org/tattour/server/domain/magazine/domain/Magazine.java +++ b/server/src/main/java/org/tattour/server/domain/magazine/model/Magazine.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.magazine.domain; +package org.tattour.server.domain.magazine.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/server/src/main/java/org/tattour/server/domain/magazine/provider/MagazineProvider.java b/server/src/main/java/org/tattour/server/domain/magazine/provider/MagazineProvider.java index 79d8e0d3..d043da87 100644 --- a/server/src/main/java/org/tattour/server/domain/magazine/provider/MagazineProvider.java +++ b/server/src/main/java/org/tattour/server/domain/magazine/provider/MagazineProvider.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.magazine.provider; import java.util.List; -import org.tattour.server.domain.magazine.domain.Magazine; +import org.tattour.server.domain.magazine.model.Magazine; public interface MagazineProvider { diff --git a/server/src/main/java/org/tattour/server/domain/magazine/provider/impl/MagazineProviderImpl.java b/server/src/main/java/org/tattour/server/domain/magazine/provider/impl/MagazineProviderImpl.java index 14cd22c1..3367b2f5 100644 --- a/server/src/main/java/org/tattour/server/domain/magazine/provider/impl/MagazineProviderImpl.java +++ b/server/src/main/java/org/tattour/server/domain/magazine/provider/impl/MagazineProviderImpl.java @@ -3,7 +3,7 @@ import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import org.tattour.server.domain.magazine.domain.Magazine; +import org.tattour.server.domain.magazine.model.Magazine; import org.tattour.server.domain.magazine.exception.NotFoundMagazineException; import org.tattour.server.domain.magazine.provider.MagazineProvider; import org.tattour.server.domain.magazine.repository.MagazineRepository; diff --git a/server/src/main/java/org/tattour/server/domain/magazine/repository/MagazineRepository.java b/server/src/main/java/org/tattour/server/domain/magazine/repository/MagazineRepository.java index 222002e0..3c7b228d 100644 --- a/server/src/main/java/org/tattour/server/domain/magazine/repository/MagazineRepository.java +++ b/server/src/main/java/org/tattour/server/domain/magazine/repository/MagazineRepository.java @@ -2,7 +2,7 @@ import java.util.List; import java.util.Optional; -import org.tattour.server.domain.magazine.domain.Magazine; +import org.tattour.server.domain.magazine.model.Magazine; public interface MagazineRepository { diff --git a/server/src/main/java/org/tattour/server/domain/magazine/repository/impl/MagazineRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/magazine/repository/impl/MagazineRepositoryImpl.java index 7f01d6a1..61477459 100644 --- a/server/src/main/java/org/tattour/server/domain/magazine/repository/impl/MagazineRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/magazine/repository/impl/MagazineRepositoryImpl.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.magazine.repository.impl; import org.springframework.data.repository.Repository; -import org.tattour.server.domain.magazine.domain.Magazine; +import org.tattour.server.domain.magazine.model.Magazine; import org.tattour.server.domain.magazine.repository.MagazineRepository; public interface MagazineRepositoryImpl extends diff --git a/server/src/main/java/org/tattour/server/domain/order/controller/OrderController.java b/server/src/main/java/org/tattour/server/domain/order/controller/OrderController.java index cd1ee33f..81a3d545 100644 --- a/server/src/main/java/org/tattour/server/domain/order/controller/OrderController.java +++ b/server/src/main/java/org/tattour/server/domain/order/controller/OrderController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; import org.tattour.server.domain.order.controller.dto.request.OrderReq; import org.tattour.server.domain.order.controller.dto.response.ReadOrderSheetRes; -import org.tattour.server.domain.order.domain.PurchaseRequest; +import org.tattour.server.domain.order.model.PurchaseRequest; import org.tattour.server.domain.order.facade.dto.request.CreateOrderReq; import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderHistoryListRes; import org.tattour.server.domain.order.facade.impl.OrderFacadeImpl; diff --git a/server/src/main/java/org/tattour/server/domain/order/controller/dto/request/PatchOrderStatusReq.java b/server/src/main/java/org/tattour/server/domain/order/controller/dto/request/PatchOrderStatusReq.java index 1e231095..5bd5e82d 100644 --- a/server/src/main/java/org/tattour/server/domain/order/controller/dto/request/PatchOrderStatusReq.java +++ b/server/src/main/java/org/tattour/server/domain/order/controller/dto/request/PatchOrderStatusReq.java @@ -3,7 +3,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import javax.validation.constraints.NotNull; import lombok.Getter; -import org.tattour.server.domain.order.domain.OrderStatus; +import org.tattour.server.domain.order.model.OrderStatus; @Schema(description = "주문상태 갱신 Request (PREPARATION / CANCEL / ACCEPT / DELIVERING / DELIVERED)") @Getter diff --git a/server/src/main/java/org/tattour/server/domain/order/facade/OrderFacade.java b/server/src/main/java/org/tattour/server/domain/order/facade/OrderFacade.java index 8a9cb2b1..e29f156d 100644 --- a/server/src/main/java/org/tattour/server/domain/order/facade/OrderFacade.java +++ b/server/src/main/java/org/tattour/server/domain/order/facade/OrderFacade.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.order.facade; import org.tattour.server.domain.order.controller.dto.response.ReadOrderSheetRes; -import org.tattour.server.domain.order.domain.PurchaseRequest; +import org.tattour.server.domain.order.model.PurchaseRequest; import org.tattour.server.domain.order.facade.dto.request.CreateOrderReq; import org.tattour.server.domain.order.facade.dto.request.UpdateOrderStatusReq; import org.tattour.server.domain.order.facade.dto.response.ReadOrderHistoryListRes; diff --git a/server/src/main/java/org/tattour/server/domain/order/facade/dto/request/UpdateOrderStatusReq.java b/server/src/main/java/org/tattour/server/domain/order/facade/dto/request/UpdateOrderStatusReq.java index d0830c07..31159825 100644 --- a/server/src/main/java/org/tattour/server/domain/order/facade/dto/request/UpdateOrderStatusReq.java +++ b/server/src/main/java/org/tattour/server/domain/order/facade/dto/request/UpdateOrderStatusReq.java @@ -3,7 +3,7 @@ import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -import org.tattour.server.domain.order.domain.OrderStatus; +import org.tattour.server.domain.order.model.OrderStatus; @Getter @AllArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/server/src/main/java/org/tattour/server/domain/order/facade/impl/OrderFacadeImpl.java b/server/src/main/java/org/tattour/server/domain/order/facade/impl/OrderFacadeImpl.java index 600a74a5..dcbeb863 100644 --- a/server/src/main/java/org/tattour/server/domain/order/facade/impl/OrderFacadeImpl.java +++ b/server/src/main/java/org/tattour/server/domain/order/facade/impl/OrderFacadeImpl.java @@ -5,25 +5,25 @@ import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.tattour.server.domain.cart.domain.Cart; +import org.tattour.server.domain.cart.model.Cart; import org.tattour.server.domain.cart.service.CartService; import org.tattour.server.domain.order.controller.dto.response.OrderSheetStickerRes; import org.tattour.server.domain.order.controller.dto.response.ReadOrderSheetRes; -import org.tattour.server.domain.order.domain.OrderHistory; -import org.tattour.server.domain.order.domain.OrderStatus; -import org.tattour.server.domain.order.domain.PurchaseRequest; import org.tattour.server.domain.order.facade.OrderFacade; import org.tattour.server.domain.order.facade.dto.request.CreateOrderReq; import org.tattour.server.domain.order.facade.dto.request.UpdateOrderStatusReq; import org.tattour.server.domain.order.facade.dto.response.ReadOrderHistoryListRes; import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderHistoryListRes; +import org.tattour.server.domain.order.model.OrderHistory; +import org.tattour.server.domain.order.model.OrderStatus; +import org.tattour.server.domain.order.model.PurchaseRequest; import org.tattour.server.domain.order.provider.impl.OrderProviderImpl; import org.tattour.server.domain.order.provider.vo.OrderAmountDetailRes; import org.tattour.server.domain.order.provider.vo.OrderHistoryPageInfo; import org.tattour.server.domain.order.service.impl.OrderServiceImpl; import org.tattour.server.domain.sticker.provider.impl.StickerProviderImpl; import org.tattour.server.domain.sticker.provider.vo.StickerOrderInfo; -import org.tattour.server.domain.user.domain.User; +import org.tattour.server.domain.user.model.User; import org.tattour.server.domain.user.provider.impl.UserProviderImpl; import org.tattour.server.domain.user.provider.vo.UserProfileRes; import org.tattour.server.global.exception.BusinessException; diff --git a/server/src/main/java/org/tattour/server/domain/order/domain/OrderHistory.java b/server/src/main/java/org/tattour/server/domain/order/model/OrderHistory.java similarity index 95% rename from server/src/main/java/org/tattour/server/domain/order/domain/OrderHistory.java rename to server/src/main/java/org/tattour/server/domain/order/model/OrderHistory.java index 825cb2c5..7972e0d6 100644 --- a/server/src/main/java/org/tattour/server/domain/order/domain/OrderHistory.java +++ b/server/src/main/java/org/tattour/server/domain/order/model/OrderHistory.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.order.domain; +package org.tattour.server.domain.order.model; import javax.persistence.Column; import javax.persistence.Entity; @@ -16,7 +16,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; -import org.tattour.server.domain.user.domain.User; +import org.tattour.server.domain.user.model.User; @Entity @Table(name = "order_history") diff --git a/server/src/main/java/org/tattour/server/domain/order/domain/OrderStatus.java b/server/src/main/java/org/tattour/server/domain/order/model/OrderStatus.java similarity index 88% rename from server/src/main/java/org/tattour/server/domain/order/domain/OrderStatus.java rename to server/src/main/java/org/tattour/server/domain/order/model/OrderStatus.java index 615f9236..2a84a7f2 100644 --- a/server/src/main/java/org/tattour/server/domain/order/domain/OrderStatus.java +++ b/server/src/main/java/org/tattour/server/domain/order/model/OrderStatus.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.order.domain; +package org.tattour.server.domain.order.model; import lombok.AccessLevel; import lombok.Getter; diff --git a/server/src/main/java/org/tattour/server/domain/order/domain/OrderedProduct.java b/server/src/main/java/org/tattour/server/domain/order/model/OrderedProduct.java similarity index 92% rename from server/src/main/java/org/tattour/server/domain/order/domain/OrderedProduct.java rename to server/src/main/java/org/tattour/server/domain/order/model/OrderedProduct.java index 63c2c1f3..7c1ec309 100644 --- a/server/src/main/java/org/tattour/server/domain/order/domain/OrderedProduct.java +++ b/server/src/main/java/org/tattour/server/domain/order/model/OrderedProduct.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.order.domain; +package org.tattour.server.domain.order.model; import javax.persistence.Column; import javax.persistence.Entity; @@ -12,7 +12,7 @@ import lombok.AccessLevel; import lombok.Builder; import lombok.NoArgsConstructor; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; @Entity @Table(name = "ordered_product") diff --git a/server/src/main/java/org/tattour/server/domain/order/domain/PurchaseRequest.java b/server/src/main/java/org/tattour/server/domain/order/model/PurchaseRequest.java similarity index 95% rename from server/src/main/java/org/tattour/server/domain/order/domain/PurchaseRequest.java rename to server/src/main/java/org/tattour/server/domain/order/model/PurchaseRequest.java index 818f43be..dce93639 100644 --- a/server/src/main/java/org/tattour/server/domain/order/domain/PurchaseRequest.java +++ b/server/src/main/java/org/tattour/server/domain/order/model/PurchaseRequest.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.order.domain; +package org.tattour.server.domain.order.model; import lombok.Getter; import org.tattour.server.global.exception.BusinessException; diff --git a/server/src/main/java/org/tattour/server/domain/order/provider/OrderProvider.java b/server/src/main/java/org/tattour/server/domain/order/provider/OrderProvider.java index 1a217f91..d46eb26a 100644 --- a/server/src/main/java/org/tattour/server/domain/order/provider/OrderProvider.java +++ b/server/src/main/java/org/tattour/server/domain/order/provider/OrderProvider.java @@ -2,7 +2,7 @@ import java.util.List; import org.springframework.data.domain.Page; -import org.tattour.server.domain.order.domain.OrderHistory; +import org.tattour.server.domain.order.model.OrderHistory; import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderHistoryListRes; import org.tattour.server.domain.order.provider.vo.UserOrderHistoryInfo; diff --git a/server/src/main/java/org/tattour/server/domain/order/provider/impl/OrderProviderImpl.java b/server/src/main/java/org/tattour/server/domain/order/provider/impl/OrderProviderImpl.java index 5ce64abf..bbc81237 100644 --- a/server/src/main/java/org/tattour/server/domain/order/provider/impl/OrderProviderImpl.java +++ b/server/src/main/java/org/tattour/server/domain/order/provider/impl/OrderProviderImpl.java @@ -6,7 +6,7 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; -import org.tattour.server.domain.order.domain.OrderHistory; +import org.tattour.server.domain.order.model.OrderHistory; import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderHistoryListRes; import org.tattour.server.domain.order.provider.OrderProvider; import org.tattour.server.domain.order.provider.vo.UserOrderHistoryInfo; diff --git a/server/src/main/java/org/tattour/server/domain/order/repository/impl/OrderRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/order/repository/impl/OrderRepositoryImpl.java index 4a94b61e..b0ffc789 100644 --- a/server/src/main/java/org/tattour/server/domain/order/repository/impl/OrderRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/order/repository/impl/OrderRepositoryImpl.java @@ -3,7 +3,7 @@ import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import org.tattour.server.domain.order.domain.OrderHistory; +import org.tattour.server.domain.order.model.OrderHistory; @Repository public interface OrderRepositoryImpl extends JpaRepository { diff --git a/server/src/main/java/org/tattour/server/domain/order/repository/impl/OrderedProductRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/order/repository/impl/OrderedProductRepositoryImpl.java index 666c3e86..38d2d77d 100644 --- a/server/src/main/java/org/tattour/server/domain/order/repository/impl/OrderedProductRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/order/repository/impl/OrderedProductRepositoryImpl.java @@ -2,7 +2,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import org.tattour.server.domain.order.domain.OrderedProduct; +import org.tattour.server.domain.order.model.OrderedProduct; @Repository public interface OrderedProductRepositoryImpl extends JpaRepository { diff --git a/server/src/main/java/org/tattour/server/domain/order/service/OrderService.java b/server/src/main/java/org/tattour/server/domain/order/service/OrderService.java index e13ff1d3..1e13428a 100644 --- a/server/src/main/java/org/tattour/server/domain/order/service/OrderService.java +++ b/server/src/main/java/org/tattour/server/domain/order/service/OrderService.java @@ -1,6 +1,6 @@ package org.tattour.server.domain.order.service; -import org.tattour.server.domain.order.domain.OrderHistory; +import org.tattour.server.domain.order.model.OrderHistory; import org.tattour.server.domain.sticker.provider.vo.StickerOrderInfo; public interface OrderService { diff --git a/server/src/main/java/org/tattour/server/domain/order/service/impl/OrderServiceImpl.java b/server/src/main/java/org/tattour/server/domain/order/service/impl/OrderServiceImpl.java index 42f2144c..9b972c03 100644 --- a/server/src/main/java/org/tattour/server/domain/order/service/impl/OrderServiceImpl.java +++ b/server/src/main/java/org/tattour/server/domain/order/service/impl/OrderServiceImpl.java @@ -5,8 +5,8 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.tattour.server.domain.order.domain.OrderHistory; -import org.tattour.server.domain.order.domain.OrderedProduct; +import org.tattour.server.domain.order.model.OrderHistory; +import org.tattour.server.domain.order.model.OrderedProduct; import org.tattour.server.domain.order.repository.impl.OrderRepositoryImpl; import org.tattour.server.domain.order.repository.impl.OrderedProductRepositoryImpl; import org.tattour.server.domain.order.service.OrderService; diff --git a/server/src/main/java/org/tattour/server/domain/search/facade/impl/SearchFacadeImpl.java b/server/src/main/java/org/tattour/server/domain/search/facade/impl/SearchFacadeImpl.java index 3466d811..2fee11dc 100644 --- a/server/src/main/java/org/tattour/server/domain/search/facade/impl/SearchFacadeImpl.java +++ b/server/src/main/java/org/tattour/server/domain/search/facade/impl/SearchFacadeImpl.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.tattour.server.domain.search.facade.SearchFacade; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; import org.tattour.server.domain.sticker.provider.StickerProvider; import org.tattour.server.domain.sticker.facade.dto.response.ReadStickerSummaryListRes; diff --git a/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerForUserRes.java b/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerForUserRes.java index b07acc2d..8ac70681 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerForUserRes.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerForUserRes.java @@ -7,7 +7,7 @@ import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; @Getter @Builder(access = AccessLevel.PRIVATE) diff --git a/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerRes.java b/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerRes.java index 2f57ee57..cb568041 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerRes.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerRes.java @@ -7,7 +7,7 @@ import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; @Getter @Builder(access = AccessLevel.PRIVATE) diff --git a/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerSummaryListRes.java b/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerSummaryListRes.java index ba92c1cb..fc245f6e 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerSummaryListRes.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerSummaryListRes.java @@ -5,7 +5,7 @@ import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; @Getter @AllArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerSummaryRes.java b/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerSummaryRes.java index 98855bdd..a4c6fcdd 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerSummaryRes.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/facade/dto/response/ReadStickerSummaryRes.java @@ -4,7 +4,7 @@ import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; @Getter @Builder(access = AccessLevel.PRIVATE) diff --git a/server/src/main/java/org/tattour/server/domain/sticker/facade/impl/StickerFacadeImpl.java b/server/src/main/java/org/tattour/server/domain/sticker/facade/impl/StickerFacadeImpl.java index f381e2fe..e4777695 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/facade/impl/StickerFacadeImpl.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/facade/impl/StickerFacadeImpl.java @@ -9,11 +9,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import org.tattour.server.domain.sticker.domain.Sticker; -import org.tattour.server.domain.sticker.domain.StickerImage; -import org.tattour.server.domain.sticker.domain.StickerSort; -import org.tattour.server.domain.sticker.domain.StickerStyle; -import org.tattour.server.domain.sticker.domain.StickerTheme; +import org.tattour.server.domain.sticker.model.Sticker; +import org.tattour.server.domain.sticker.model.StickerImage; +import org.tattour.server.domain.sticker.model.StickerSort; +import org.tattour.server.domain.sticker.model.StickerStyle; +import org.tattour.server.domain.sticker.model.StickerTheme; import org.tattour.server.domain.sticker.exception.NotFoundStickerSortException; import org.tattour.server.domain.sticker.facade.StickerFacade; import org.tattour.server.domain.sticker.facade.dto.request.CreateStickerReq; diff --git a/server/src/main/java/org/tattour/server/domain/sticker/domain/Sticker.java b/server/src/main/java/org/tattour/server/domain/sticker/model/Sticker.java similarity index 94% rename from server/src/main/java/org/tattour/server/domain/sticker/domain/Sticker.java rename to server/src/main/java/org/tattour/server/domain/sticker/model/Sticker.java index f39034d5..af8f8736 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/domain/Sticker.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/model/Sticker.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.sticker.domain; +package org.tattour.server.domain.sticker.model; import java.util.ArrayList; import java.util.List; @@ -20,8 +20,8 @@ import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.tattour.server.domain.discount.domain.Discount; -import org.tattour.server.domain.order.domain.OrderedProduct; +import org.tattour.server.domain.discount.model.Discount; +import org.tattour.server.domain.order.model.OrderedProduct; import org.tattour.server.global.util.AuditingTimeEntity; @Table(name = "sticker") diff --git a/server/src/main/java/org/tattour/server/domain/sticker/domain/StickerImage.java b/server/src/main/java/org/tattour/server/domain/sticker/model/StickerImage.java similarity index 95% rename from server/src/main/java/org/tattour/server/domain/sticker/domain/StickerImage.java rename to server/src/main/java/org/tattour/server/domain/sticker/model/StickerImage.java index e2d21d06..2a1da7c0 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/domain/StickerImage.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/model/StickerImage.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.sticker.domain; +package org.tattour.server.domain.sticker.model; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/server/src/main/java/org/tattour/server/domain/sticker/domain/StickerSort.java b/server/src/main/java/org/tattour/server/domain/sticker/model/StickerSort.java similarity index 93% rename from server/src/main/java/org/tattour/server/domain/sticker/domain/StickerSort.java rename to server/src/main/java/org/tattour/server/domain/sticker/model/StickerSort.java index 81333ce4..306983d1 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/domain/StickerSort.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/model/StickerSort.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.sticker.domain; +package org.tattour.server.domain.sticker.model; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/server/src/main/java/org/tattour/server/domain/sticker/domain/StickerStyle.java b/server/src/main/java/org/tattour/server/domain/sticker/model/StickerStyle.java similarity index 91% rename from server/src/main/java/org/tattour/server/domain/sticker/domain/StickerStyle.java rename to server/src/main/java/org/tattour/server/domain/sticker/model/StickerStyle.java index c1163dff..5d7d21be 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/domain/StickerStyle.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/model/StickerStyle.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.sticker.domain; +package org.tattour.server.domain.sticker.model; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -13,7 +13,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.tattour.server.domain.style.domain.Style; +import org.tattour.server.domain.style.model.Style; @Getter @Table(name = "sticker_style") diff --git a/server/src/main/java/org/tattour/server/domain/sticker/domain/StickerTheme.java b/server/src/main/java/org/tattour/server/domain/sticker/model/StickerTheme.java similarity index 91% rename from server/src/main/java/org/tattour/server/domain/sticker/domain/StickerTheme.java rename to server/src/main/java/org/tattour/server/domain/sticker/model/StickerTheme.java index 596945b3..b7ec70bf 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/domain/StickerTheme.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/model/StickerTheme.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.sticker.domain; +package org.tattour.server.domain.sticker.model; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -13,7 +13,7 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.tattour.server.domain.theme.domain.Theme; +import org.tattour.server.domain.theme.model.Theme; @Getter @Table(name = "sticker_theme") diff --git a/server/src/main/java/org/tattour/server/domain/sticker/provider/StickerProvider.java b/server/src/main/java/org/tattour/server/domain/sticker/provider/StickerProvider.java index 57c16d79..5973ddaa 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/provider/StickerProvider.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/provider/StickerProvider.java @@ -1,8 +1,8 @@ package org.tattour.server.domain.sticker.provider; import java.util.List; -import org.tattour.server.domain.cart.domain.Cart; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.cart.model.Cart; +import org.tattour.server.domain.sticker.model.Sticker; import org.tattour.server.domain.sticker.provider.vo.StickerOrderInfo; public interface StickerProvider { diff --git a/server/src/main/java/org/tattour/server/domain/sticker/provider/impl/StickerProviderImpl.java b/server/src/main/java/org/tattour/server/domain/sticker/provider/impl/StickerProviderImpl.java index 66c9614b..4160e08e 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/provider/impl/StickerProviderImpl.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/provider/impl/StickerProviderImpl.java @@ -8,8 +8,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.tattour.server.domain.cart.domain.Cart; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.cart.model.Cart; +import org.tattour.server.domain.sticker.model.Sticker; import org.tattour.server.domain.sticker.exception.NotFoundStickerException; import org.tattour.server.domain.sticker.provider.StickerProvider; import org.tattour.server.domain.sticker.provider.vo.StickerOrderInfo; diff --git a/server/src/main/java/org/tattour/server/domain/sticker/provider/vo/StickerOrderInfo.java b/server/src/main/java/org/tattour/server/domain/sticker/provider/vo/StickerOrderInfo.java index 30c1d85e..dd1d3e74 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/provider/vo/StickerOrderInfo.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/provider/vo/StickerOrderInfo.java @@ -4,7 +4,7 @@ import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; @Getter @AllArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerImageRepository.java b/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerImageRepository.java index 157ffc00..4d154881 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerImageRepository.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerImageRepository.java @@ -1,6 +1,6 @@ package org.tattour.server.domain.sticker.repository; -import org.tattour.server.domain.sticker.domain.StickerImage; +import org.tattour.server.domain.sticker.model.StickerImage; public interface StickerImageRepository { diff --git a/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerRepository.java b/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerRepository.java index b44cf359..0c80798e 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerRepository.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerRepository.java @@ -2,7 +2,7 @@ import java.util.Optional; import org.springframework.data.repository.Repository; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; import org.tattour.server.domain.sticker.repository.custom.StickerRepositoryCustom; public interface StickerRepository extends diff --git a/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerStyleRepository.java b/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerStyleRepository.java index 6e8dd0f9..9ea548de 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerStyleRepository.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerStyleRepository.java @@ -1,7 +1,6 @@ package org.tattour.server.domain.sticker.repository; -import java.util.List; -import org.tattour.server.domain.sticker.domain.StickerStyle; +import org.tattour.server.domain.sticker.model.StickerStyle; public interface StickerStyleRepository { diff --git a/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerThemeRepository.java b/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerThemeRepository.java index 1c857180..98215cc0 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerThemeRepository.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/repository/StickerThemeRepository.java @@ -1,7 +1,6 @@ package org.tattour.server.domain.sticker.repository; -import java.util.List; -import org.tattour.server.domain.sticker.domain.StickerTheme; +import org.tattour.server.domain.sticker.model.StickerTheme; public interface StickerThemeRepository { diff --git a/server/src/main/java/org/tattour/server/domain/sticker/repository/custom/StickerRepositoryCustom.java b/server/src/main/java/org/tattour/server/domain/sticker/repository/custom/StickerRepositoryCustom.java index 90704a93..7ac78d36 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/repository/custom/StickerRepositoryCustom.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/repository/custom/StickerRepositoryCustom.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.sticker.repository.custom; import java.util.List; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; public interface StickerRepositoryCustom { diff --git a/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerImageRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerImageRepositoryImpl.java index da66c7ec..a3440d5a 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerImageRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerImageRepositoryImpl.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.sticker.repository.impl; import org.springframework.data.repository.Repository; -import org.tattour.server.domain.sticker.domain.StickerImage; +import org.tattour.server.domain.sticker.model.StickerImage; import org.tattour.server.domain.sticker.repository.StickerImageRepository; public interface StickerImageRepositoryImpl extends diff --git a/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerRepositoryImpl.java index 89d49eb8..e953958f 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerRepositoryImpl.java @@ -1,17 +1,17 @@ package org.tattour.server.domain.sticker.repository.impl; -import static org.tattour.server.domain.order.domain.QOrderedProduct.*; -import static org.tattour.server.domain.sticker.domain.QSticker.*; -import static org.tattour.server.domain.sticker.domain.QStickerStyle.*; -import static org.tattour.server.domain.sticker.domain.QStickerTheme.*; -import static org.tattour.server.domain.style.domain.QStyle.*; -import static org.tattour.server.domain.theme.domain.QTheme.*; +import static org.tattour.server.domain.order.model.QOrderedProduct.orderedProduct; +import static org.tattour.server.domain.sticker.model.QSticker.sticker; +import static org.tattour.server.domain.sticker.model.QStickerStyle.stickerStyle; +import static org.tattour.server.domain.sticker.model.QStickerTheme.stickerTheme; +import static org.tattour.server.domain.style.model.QStyle.style; +import static org.tattour.server.domain.theme.model.QTheme.theme; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQueryFactory; import java.util.List; import lombok.RequiredArgsConstructor; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; import org.tattour.server.domain.sticker.repository.custom.StickerRepositoryCustom; @RequiredArgsConstructor diff --git a/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerStyleRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerStyleRepositoryImpl.java index 5542751f..526c0993 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerStyleRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerStyleRepositoryImpl.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.sticker.repository.impl; import org.springframework.data.repository.Repository; -import org.tattour.server.domain.sticker.domain.StickerStyle; +import org.tattour.server.domain.sticker.model.StickerStyle; import org.tattour.server.domain.sticker.repository.StickerStyleRepository; public interface StickerStyleRepositoryImpl extends diff --git a/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerThemeRepositoryImpl.java b/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerThemeRepositoryImpl.java index 1560af94..66fe47a5 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerThemeRepositoryImpl.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/repository/impl/StickerThemeRepositoryImpl.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.sticker.repository.impl; import org.springframework.data.repository.Repository; -import org.tattour.server.domain.sticker.domain.StickerTheme; +import org.tattour.server.domain.sticker.model.StickerTheme; import org.tattour.server.domain.sticker.repository.StickerThemeRepository; public interface StickerThemeRepositoryImpl extends diff --git a/server/src/main/java/org/tattour/server/domain/sticker/service/StickerImageService.java b/server/src/main/java/org/tattour/server/domain/sticker/service/StickerImageService.java index 739bb223..d5f2d217 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/service/StickerImageService.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/service/StickerImageService.java @@ -1,6 +1,6 @@ package org.tattour.server.domain.sticker.service; -import org.tattour.server.domain.sticker.domain.StickerImage; +import org.tattour.server.domain.sticker.model.StickerImage; public interface StickerImageService { diff --git a/server/src/main/java/org/tattour/server/domain/sticker/service/StickerService.java b/server/src/main/java/org/tattour/server/domain/sticker/service/StickerService.java index 7e4d2f69..07ae0e64 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/service/StickerService.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/service/StickerService.java @@ -1,7 +1,7 @@ package org.tattour.server.domain.sticker.service; import java.util.List; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; public interface StickerService { diff --git a/server/src/main/java/org/tattour/server/domain/sticker/service/StickerStyleService.java b/server/src/main/java/org/tattour/server/domain/sticker/service/StickerStyleService.java index 39558d93..2226df7b 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/service/StickerStyleService.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/service/StickerStyleService.java @@ -1,6 +1,6 @@ package org.tattour.server.domain.sticker.service; -import org.tattour.server.domain.sticker.domain.StickerStyle; +import org.tattour.server.domain.sticker.model.StickerStyle; public interface StickerStyleService { diff --git a/server/src/main/java/org/tattour/server/domain/sticker/service/StickerThemeService.java b/server/src/main/java/org/tattour/server/domain/sticker/service/StickerThemeService.java index b8644275..089cac79 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/service/StickerThemeService.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/service/StickerThemeService.java @@ -1,6 +1,6 @@ package org.tattour.server.domain.sticker.service; -import org.tattour.server.domain.sticker.domain.StickerTheme; +import org.tattour.server.domain.sticker.model.StickerTheme; public interface StickerThemeService { diff --git a/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerImageServiceImpl.java b/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerImageServiceImpl.java index 790e96de..f3f7fadf 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerImageServiceImpl.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerImageServiceImpl.java @@ -2,7 +2,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.tattour.server.domain.sticker.domain.StickerImage; +import org.tattour.server.domain.sticker.model.StickerImage; import org.tattour.server.domain.sticker.repository.StickerImageRepository; import org.tattour.server.domain.sticker.service.StickerImageService; diff --git a/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerServiceImpl.java b/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerServiceImpl.java index c4427e93..ad434f62 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerServiceImpl.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerServiceImpl.java @@ -3,7 +3,7 @@ import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.tattour.server.domain.sticker.domain.Sticker; +import org.tattour.server.domain.sticker.model.Sticker; import org.tattour.server.domain.sticker.repository.StickerRepository; import org.tattour.server.domain.sticker.service.StickerService; diff --git a/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerStyleServiceImpl.java b/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerStyleServiceImpl.java index 136bad13..54c3772f 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerStyleServiceImpl.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerStyleServiceImpl.java @@ -2,7 +2,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.tattour.server.domain.sticker.domain.StickerStyle; +import org.tattour.server.domain.sticker.model.StickerStyle; import org.tattour.server.domain.sticker.repository.StickerStyleRepository; import org.tattour.server.domain.sticker.service.StickerStyleService; diff --git a/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerThemeServiceImpl.java b/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerThemeServiceImpl.java index 4c23306d..5b81e34b 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerThemeServiceImpl.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/service/impl/StickerThemeServiceImpl.java @@ -2,7 +2,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.tattour.server.domain.sticker.domain.StickerTheme; +import org.tattour.server.domain.sticker.model.StickerTheme; import org.tattour.server.domain.sticker.repository.StickerThemeRepository; import org.tattour.server.domain.sticker.service.StickerThemeService; diff --git a/server/src/main/java/org/tattour/server/domain/style/facade/dto/response/ReadStyleListRes.java b/server/src/main/java/org/tattour/server/domain/style/facade/dto/response/ReadStyleListRes.java index 6e923425..f80d0881 100644 --- a/server/src/main/java/org/tattour/server/domain/style/facade/dto/response/ReadStyleListRes.java +++ b/server/src/main/java/org/tattour/server/domain/style/facade/dto/response/ReadStyleListRes.java @@ -5,20 +5,20 @@ import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -import org.tattour.server.domain.style.domain.Style; +import org.tattour.server.domain.style.model.Style; @Getter @AllArgsConstructor(access = AccessLevel.PRIVATE) public class ReadStyleListRes { - List readStyleRes; + List readStyleRes; - public static ReadStyleListRes from(List