From 6fb1bfd1f2cf8b001651af5b7364abfcbf434226 Mon Sep 17 00:00:00 2001 From: Lee ChanMi Date: Wed, 9 Aug 2023 20:39:26 +0900 Subject: [PATCH] #57 [REFACTOR] Point dto rename, refactor --- .../global/util/EntityDtoMapperImpl.java | 247 +++++++++++------- .../admin/controller/AdminController.java | 15 +- .../order/controller/OrderController.java | 7 +- .../dto/response/GetOrderSheetRes.java | 27 -- .../dto/response/ReadOrderSheetRes.java | 27 ++ .../domain/order/facade/OrderFacade.java | 4 +- .../dto/response/ReadOrderHistoryListRes.java | 12 +- .../response/ReadUserOrderHistoryListRes.java | 7 +- .../order/facade/impl/OrderFacadeImpl.java | 26 +- .../domain/order/provider/OrderProvider.java | 4 +- .../provider/impl/OrderProviderImpl.java | 26 +- .../vo/OrderAmountInfo.java} | 8 +- .../vo/OrderHistoryInfo.java} | 4 +- .../vo/OrderHistoryPageInfo.java} | 10 +- .../vo/UserOrderHistoryInfo.java} | 4 +- .../server/domain/point/dao/PointDao.java | 12 +- .../ReadPointChargeRequestListRes.java | 21 ++ .../dto/response/ReadPointLogListRes.java | 18 ++ .../domain/point/provider/PointProvider.java | 12 +- .../GetPointChargeRequestAfterDate.java | 17 -- .../dto/request/GetPointLogListReq.java | 17 -- .../GetPointChargeRequestListRes.java | 20 -- .../dto/response/GetPointLogListRes.java | 17 -- .../provider/impl/PointProviderImpl.java | 27 +- .../PointChargeRequestInfo.java} | 4 +- .../PointLogInfo.java} | 4 +- .../ConfirmPointChargeResponseDto.java | 8 +- .../point/service/impl/PointServiceImpl.java | 15 +- .../sticker/provider/StickerProvider.java | 2 +- .../provider/impl/StickerProviderImpl.java | 2 +- .../ReadOrderSheetStickerInfo.java | 2 +- .../response => vo}/StickerLikedInfo.java | 2 +- .../{LoginReq.java => PostLoginReq.java} | 6 +- .../dto/response/ProductLikedListRes.java | 4 +- .../provider/vo/UserPointAfterOrderInfo.java} | 8 +- .../server/global/util/EntityDtoMapper.java | 22 +- 36 files changed, 338 insertions(+), 330 deletions(-) delete mode 100644 server/src/main/java/org/tattour/server/domain/order/controller/dto/response/GetOrderSheetRes.java create mode 100644 server/src/main/java/org/tattour/server/domain/order/controller/dto/response/ReadOrderSheetRes.java rename server/src/main/java/org/tattour/server/domain/order/{facade/dto/response/ReadOrderAmountRes.java => provider/vo/OrderAmountInfo.java} (66%) rename server/src/main/java/org/tattour/server/domain/order/{facade/dto/response/ReadOrderHistoryRes.java => provider/vo/OrderHistoryInfo.java} (87%) rename server/src/main/java/org/tattour/server/domain/order/{facade/dto/response/PageInfoRes.java => provider/vo/OrderHistoryPageInfo.java} (53%) rename server/src/main/java/org/tattour/server/domain/order/{facade/dto/response/ReadUserOrderHistoryRes.java => provider/vo/UserOrderHistoryInfo.java} (90%) create mode 100644 server/src/main/java/org/tattour/server/domain/point/facade/dto/response/ReadPointChargeRequestListRes.java create mode 100644 server/src/main/java/org/tattour/server/domain/point/facade/dto/response/ReadPointLogListRes.java delete mode 100644 server/src/main/java/org/tattour/server/domain/point/provider/dto/request/GetPointChargeRequestAfterDate.java delete mode 100644 server/src/main/java/org/tattour/server/domain/point/provider/dto/request/GetPointLogListReq.java delete mode 100644 server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointChargeRequestListRes.java delete mode 100644 server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointLogListRes.java rename server/src/main/java/org/tattour/server/domain/point/provider/{dto/response/GetPointChargeRequestRes.java => vo/PointChargeRequestInfo.java} (92%) rename server/src/main/java/org/tattour/server/domain/point/provider/{dto/response/GetPointLogRes.java => vo/PointLogInfo.java} (80%) rename server/src/main/java/org/tattour/server/domain/sticker/provider/{dto/response => vo}/ReadOrderSheetStickerInfo.java (95%) rename server/src/main/java/org/tattour/server/domain/sticker/provider/{dto/response => vo}/StickerLikedInfo.java (93%) rename server/src/main/java/org/tattour/server/domain/user/controller/dto/request/{LoginReq.java => PostLoginReq.java} (80%) rename server/src/main/java/org/tattour/server/domain/{order/facade/dto/response/ReadUserOrderPointRes.java => user/provider/vo/UserPointAfterOrderInfo.java} (67%) 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 89694667..c298a179 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 @@ -8,20 +8,21 @@ import org.tattour.server.domain.custom.domain.Custom; import org.tattour.server.domain.custom.service.dto.response.CustomApplySummaryInfo; import org.tattour.server.domain.order.domain.Order; -import org.tattour.server.domain.order.facade.dto.response.ReadOrderHistoryRes; -import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderHistoryRes; +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.dto.response.GetPointChargeRequestRes; +import org.tattour.server.domain.point.provider.vo.PointChargeRequestInfo; import org.tattour.server.domain.sticker.domain.Sticker; -import org.tattour.server.domain.sticker.provider.dto.response.StickerLikedInfo; +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.provider.dto.response.GetUserInfoDto; import org.tattour.server.domain.user.provider.dto.response.GetUserProfileRes; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-07-20T23:05:33+0900", - comments = "version: 1.5.4.Final, compiler: javac, environment: Java 17.0.6 (Amazon.com Inc.)" + date = "2023-08-09T16:50:16+0900", + comments = "version: 1.5.4.Final, compiler: javac, environment: Java 11.0.19 (Amazon.com Inc.)" ) @Component public class EntityDtoMapperImpl implements EntityDtoMapper { @@ -59,98 +60,98 @@ public GetUserInfoDto toGetUserInfoDto(User user) { } @Override - public StickerLikedInfo toStickerLikedInfo(Sticker sticker) { - if ( sticker == null ) { + public StickerLikedInfo toStickerLikedInfo(ProductLiked productLiked) { + if ( productLiked == null ) { return null; } - Integer id = null; + Integer stickerId = null; String name = null; Integer price = null; String mainImageUrl = null; + Integer id = null; - id = sticker.getId(); - name = sticker.getName(); - price = sticker.getPrice(); - mainImageUrl = sticker.getMainImageUrl(); + stickerId = productLikedStickerId( productLiked ); + name = productLikedStickerName( productLiked ); + price = productLikedStickerPrice( productLiked ); + mainImageUrl = productLikedStickerMainImageUrl( productLiked ); + id = productLiked.getId(); - Integer discountPrice = sticker.getDiscount() != null ? sticker.getPrice() * (100 - sticker.getDiscount().getDiscountRate()) / 100 : null; - Integer discountRate = sticker.getDiscount() != null ? sticker.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, name, price, discountRate, discountPrice, mainImageUrl ); + StickerLikedInfo stickerLikedInfo = new StickerLikedInfo( id, stickerId, name, price, discountRate, discountPrice, mainImageUrl ); return stickerLikedInfo; } @Override - public List toStickerLikedInfoList(List stickerList) { - if ( stickerList == null ) { + public List toStickerLikedInfoList(List productLiked) { + if ( productLiked == null ) { return null; } - List list = new ArrayList( stickerList.size() ); - for ( Sticker sticker : stickerList ) { - list.add( toStickerLikedInfo( sticker ) ); + List list = new ArrayList( productLiked.size() ); + for ( ProductLiked productLiked1 : productLiked ) { + list.add( toStickerLikedInfo( productLiked1 ) ); } return list; } @Override - public ReadUserOrderHistoryRes toGetUserOrderHistoryRes(Order order) { + public UserOrderHistoryInfo toGetUserOrderHistoryRes(Order order) { if ( order == null ) { return null; } - GetUserOrderHistoryRes readUserOrderHistoryRes = new ReadUserOrderHistoryRes(); + UserOrderHistoryInfo userOrderHistoryInfo = new UserOrderHistoryInfo(); Integer id = orderUserId( order ); if ( id != null ) { - readUserOrderHistoryRes.setUserId( id ); + userOrderHistoryInfo.setUserId( id ); } Integer id1 = orderStickerId( order ); if ( id1 != null ) { - readUserOrderHistoryRes.setStickerId( id1 ); + userOrderHistoryInfo.setStickerId( id1 ); } if ( order.getId() != null ) { - readUserOrderHistoryRes.setId( order.getId() ); + userOrderHistoryInfo.setId( order.getId() ); } - readUserOrderHistoryRes.setProductName( order.getProductName() ); - readUserOrderHistoryRes.setProductSize( order.getProductSize() ); - readUserOrderHistoryRes.setProductImageUrl( order.getProductImageUrl() ); + userOrderHistoryInfo.setProductName( order.getProductName() ); + userOrderHistoryInfo.setProductSize( order.getProductSize() ); + userOrderHistoryInfo.setProductImageUrl( order.getProductImageUrl() ); if ( order.getProductAmount() != null ) { - readUserOrderHistoryRes.setProductAmount( order.getProductAmount() ); + userOrderHistoryInfo.setProductAmount( order.getProductAmount() ); } if ( order.getProductCount() != null ) { - readUserOrderHistoryRes.setProductCount( order.getProductCount() ); + userOrderHistoryInfo.setProductCount( order.getProductCount() ); } if ( order.getShippingFee() != null ) { - readUserOrderHistoryRes.setShippingFee( order.getShippingFee() ); + userOrderHistoryInfo.setShippingFee( order.getShippingFee() ); } if ( order.getTotalAmount() != null ) { - readUserOrderHistoryRes.setTotalAmount( order.getTotalAmount() ); - } - readUserOrderHistoryRes.setRecipientName( order.getRecipientName() ); - readUserOrderHistoryRes.setContact( order.getContact() ); - readUserOrderHistoryRes.setMailingAddress( order.getMailingAddress() ); - readUserOrderHistoryRes.setBaseAddress( order.getBaseAddress() ); - readUserOrderHistoryRes.setDetailAddress( order.getDetailAddress() ); - readUserOrderHistoryRes.setCreatedAt( order.getCreatedAt() ); - readUserOrderHistoryRes.setLastUpdatedAt( order.getLastUpdatedAt() ); - if ( order.getState() != null ) { - readUserOrderHistoryRes.setState( order.getState() ); - } - - return readUserOrderHistoryRes; + 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() ); + + return userOrderHistoryInfo; } @Override - public List toGetUserOrderHistoryListRes(List orderList) { + public List toGetUserOrderHistoryListRes(List orderList) { if ( orderList == null ) { return null; } - List list = new ArrayList( orderList.size() ); + List list = new ArrayList( orderList.size() ); for ( Order order : orderList ) { list.add( toGetUserOrderHistoryRes( order ) ); } @@ -159,60 +160,58 @@ public List toGetUserOrderHistoryListRes(List or } @Override - public ReadOrderHistoryRes toGetOrderHistoryRes(Order order) { + public OrderHistoryInfo toGetOrderHistoryRes(Order order) { if ( order == null ) { return null; } - ReadOrderHistoryRes readOrderHistoryRes = new ReadOrderHistoryRes(); + OrderHistoryInfo orderHistoryInfo = new OrderHistoryInfo(); Integer id = orderUserId( order ); if ( id != null ) { - readOrderHistoryRes.setUserId( id ); + orderHistoryInfo.setUserId( id ); } Integer id1 = orderStickerId( order ); if ( id1 != null ) { - readOrderHistoryRes.setStickerId( id1 ); + orderHistoryInfo.setStickerId( id1 ); } if ( order.getId() != null ) { - readOrderHistoryRes.setId( order.getId() ); + orderHistoryInfo.setId( order.getId() ); } - readOrderHistoryRes.setProductName( order.getProductName() ); - readOrderHistoryRes.setProductSize( order.getProductSize() ); - readOrderHistoryRes.setProductImageUrl( order.getProductImageUrl() ); + orderHistoryInfo.setProductName( order.getProductName() ); + orderHistoryInfo.setProductSize( order.getProductSize() ); + orderHistoryInfo.setProductImageUrl( order.getProductImageUrl() ); if ( order.getProductAmount() != null ) { - readOrderHistoryRes.setProductAmount( order.getProductAmount() ); + orderHistoryInfo.setProductAmount( order.getProductAmount() ); } if ( order.getProductCount() != null ) { - readOrderHistoryRes.setProductCount( order.getProductCount() ); + orderHistoryInfo.setProductCount( order.getProductCount() ); } if ( order.getShippingFee() != null ) { - readOrderHistoryRes.setShippingFee( order.getShippingFee() ); + orderHistoryInfo.setShippingFee( order.getShippingFee() ); } if ( order.getTotalAmount() != null ) { - readOrderHistoryRes.setTotalAmount( order.getTotalAmount() ); - } - readOrderHistoryRes.setRecipientName( order.getRecipientName() ); - readOrderHistoryRes.setContact( order.getContact() ); - readOrderHistoryRes.setMailingAddress( order.getMailingAddress() ); - readOrderHistoryRes.setBaseAddress( order.getBaseAddress() ); - readOrderHistoryRes.setDetailAddress( order.getDetailAddress() ); - readOrderHistoryRes.setCreatedAt( order.getCreatedAt() ); - readOrderHistoryRes.setLastUpdatedAt( order.getLastUpdatedAt() ); - if ( order.getState() != null ) { - readOrderHistoryRes.setState( order.getState() ); - } - - return readOrderHistoryRes; + 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() ); + + return orderHistoryInfo; } @Override - public List toGetOrderHistoryListRes(Page orderList) { + public List toGetOrderHistoryListRes(Page orderList) { if ( orderList == null ) { return null; } - List list = new ArrayList(); + List list = new ArrayList(); for ( Order order : orderList ) { list.add( toGetOrderHistoryRes( order ) ); } @@ -221,42 +220,40 @@ public List toGetOrderHistoryListRes(Page orderList) } @Override - public GetPointChargeRequestRes toGetPointChargeRequestRes(PointChargeRequest pointChargeRequest) { + public PointChargeRequestInfo toGetPointChargeRequestRes(PointChargeRequest pointChargeRequest) { if ( pointChargeRequest == null ) { return null; } - GetPointChargeRequestRes.GetPointChargeRequestResBuilder getPointChargeRequestRes = GetPointChargeRequestRes.builder(); + PointChargeRequestInfo.ReadPointChargeRequestResBuilder readPointChargeRequestRes = PointChargeRequestInfo.builder(); Integer id = pointChargeRequestUserId( pointChargeRequest ); if ( id != null ) { - getPointChargeRequestRes.userId( id ); + readPointChargeRequestRes.userId( id ); } if ( pointChargeRequest.getId() != null ) { - getPointChargeRequestRes.id( pointChargeRequest.getId() ); - } - getPointChargeRequestRes.chargeAmount( pointChargeRequest.getChargeAmount() ); - getPointChargeRequestRes.transferredAmount( pointChargeRequest.getTransferredAmount() ); - getPointChargeRequestRes.isDeposited( pointChargeRequest.getIsDeposited() ); - getPointChargeRequestRes.isAmountMatched( pointChargeRequest.getIsAmountMatched() ); - getPointChargeRequestRes.isApproved( pointChargeRequest.getIsApproved() ); - getPointChargeRequestRes.isCompleted( pointChargeRequest.getIsCompleted() ); - getPointChargeRequestRes.createdAt( pointChargeRequest.getCreatedAt() ); - getPointChargeRequestRes.lastUpdatedAt( pointChargeRequest.getLastUpdatedAt() ); - if ( pointChargeRequest.getState() != null ) { - getPointChargeRequestRes.state( pointChargeRequest.getState() ); - } - - return getPointChargeRequestRes.build(); + readPointChargeRequestRes.id( pointChargeRequest.getId() ); + } + readPointChargeRequestRes.chargeAmount( pointChargeRequest.getChargeAmount() ); + readPointChargeRequestRes.transferredAmount( pointChargeRequest.getTransferredAmount() ); + readPointChargeRequestRes.isDeposited( pointChargeRequest.getIsDeposited() ); + readPointChargeRequestRes.isAmountMatched( pointChargeRequest.getIsAmountMatched() ); + readPointChargeRequestRes.isApproved( pointChargeRequest.getIsApproved() ); + readPointChargeRequestRes.isCompleted( pointChargeRequest.getIsCompleted() ); + readPointChargeRequestRes.createdAt( pointChargeRequest.getCreatedAt() ); + readPointChargeRequestRes.lastUpdatedAt( pointChargeRequest.getLastUpdatedAt() ); + readPointChargeRequestRes.state( pointChargeRequest.getState() ); + + return readPointChargeRequestRes.build(); } @Override - public List toGetPointChargeRequestResList(List pointChargeRequestList) { + public List toGetPointChargeRequestResList(List pointChargeRequestList) { if ( pointChargeRequestList == null ) { return null; } - List list = new ArrayList( pointChargeRequestList.size() ); + List list = new ArrayList( pointChargeRequestList.size() ); for ( PointChargeRequest pointChargeRequest : pointChargeRequestList ) { list.add( toGetPointChargeRequestRes( pointChargeRequest ) ); } @@ -295,6 +292,66 @@ public List toCustomApplySummaryInfoList(List cu return list; } + private Integer productLikedStickerId(ProductLiked productLiked) { + if ( productLiked == null ) { + return null; + } + Sticker sticker = productLiked.getSticker(); + if ( sticker == null ) { + return null; + } + Integer id = sticker.getId(); + if ( id == null ) { + return null; + } + return id; + } + + private String productLikedStickerName(ProductLiked productLiked) { + if ( productLiked == null ) { + return null; + } + Sticker sticker = productLiked.getSticker(); + if ( sticker == null ) { + return null; + } + String name = sticker.getName(); + if ( name == null ) { + return null; + } + return name; + } + + private Integer productLikedStickerPrice(ProductLiked productLiked) { + if ( productLiked == null ) { + return null; + } + Sticker sticker = productLiked.getSticker(); + if ( sticker == null ) { + return null; + } + Integer price = sticker.getPrice(); + if ( price == null ) { + return null; + } + return price; + } + + private String productLikedStickerMainImageUrl(ProductLiked productLiked) { + if ( productLiked == null ) { + return null; + } + Sticker sticker = productLiked.getSticker(); + if ( sticker == null ) { + return null; + } + String mainImageUrl = sticker.getMainImageUrl(); + if ( mainImageUrl == null ) { + return null; + } + return mainImageUrl; + } + private Integer orderUserId(Order order) { if ( order == null ) { return null; diff --git a/server/src/main/java/org/tattour/server/domain/admin/controller/AdminController.java b/server/src/main/java/org/tattour/server/domain/admin/controller/AdminController.java index 643432fe..78fff879 100644 --- a/server/src/main/java/org/tattour/server/domain/admin/controller/AdminController.java +++ b/server/src/main/java/org/tattour/server/domain/admin/controller/AdminController.java @@ -40,9 +40,8 @@ import org.tattour.server.domain.order.controller.dto.request.PatchOrderStatusReq; import org.tattour.server.domain.order.provider.impl.OrderProviderImpl; import org.tattour.server.domain.order.service.impl.OrderServiceImpl; -import org.tattour.server.domain.point.provider.dto.request.GetPointLogListReq; -import org.tattour.server.domain.point.provider.dto.response.GetPointChargeRequestListRes; -import org.tattour.server.domain.point.provider.dto.response.GetPointLogListRes; +import org.tattour.server.domain.point.facade.dto.response.ReadPointChargeRequestListRes; +import org.tattour.server.domain.point.facade.dto.response.ReadPointLogListRes; import org.tattour.server.domain.point.provider.impl.PointProviderImpl; import org.tattour.server.domain.point.service.dto.request.ConfirmPointChargeRequestDto; import org.tattour.server.domain.order.facade.dto.request.UpdateOrderStatusReq; @@ -50,7 +49,7 @@ import org.tattour.server.domain.point.service.impl.PointServiceImpl; import org.tattour.server.domain.sticker.service.StickerService; import org.tattour.server.domain.sticker.service.dto.response.StickerInfo; -import org.tattour.server.domain.user.controller.dto.response.LoginRes; +import org.tattour.server.domain.user.controller.dto.response.PostLoginRes; import org.tattour.server.domain.user.domain.User; import org.tattour.server.domain.user.provider.impl.UserProviderImpl; import org.tattour.server.global.config.jwt.JwtService; @@ -83,7 +82,7 @@ public class AdminController { @ApiResponse( responseCode = "200", description = "조회에 성공했습니다.", - content = @Content(schema = @Schema(implementation = LoginRes.class))), + content = @Content(schema = @Schema(implementation = PostLoginRes.class))), @ApiResponse( responseCode = "400", description = "잘못된 요청입니다.", @@ -106,7 +105,7 @@ public ResponseEntity getOrderHistory( @ApiResponse( responseCode = "200", description = "조회에 성공했습니다.", - content = @Content(schema = @Schema(implementation = GetPointChargeRequestListRes.class))), + content = @Content(schema = @Schema(implementation = ReadPointChargeRequestListRes.class))), @ApiResponse( responseCode = "400", description = "잘못된 요청입니다.", @@ -220,7 +219,7 @@ public ResponseEntity cancelPointChargeRequest( @ApiResponse( responseCode = "200", description = "포인트 로그 조회에 성공했습니다.", - content = @Content(schema = @Schema(implementation = GetPointLogListRes.class))), + content = @Content(schema = @Schema(implementation = ReadPointLogListRes.class))), @ApiResponse( responseCode = "400", description = "잘못된 요청입니다.", @@ -237,7 +236,7 @@ public ResponseEntity getPointLog( ) { return BaseResponse.success( SuccessType.READ_POINT_LOG_SUCCESS, - pointProvider.getPointLog(GetPointLogListReq.of(userId, title))); + pointProvider.getPointLog(userId, title)); } 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 64ed378b..11c171f9 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 @@ -19,19 +19,16 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.tattour.server.domain.order.controller.dto.request.PostOrderReq; -import org.tattour.server.domain.order.controller.dto.response.GetOrderSheetRes; +import org.tattour.server.domain.order.controller.dto.response.ReadOrderSheetRes; import org.tattour.server.domain.order.facade.dto.request.CreateOrderRequest; import org.tattour.server.domain.order.facade.impl.OrderFacadeImpl; import org.tattour.server.domain.order.facade.dto.request.ReadOrderSheetReq; import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderHistoryListRes; -import org.tattour.server.domain.point.facade.impl.PointFacadeImpl; -import org.tattour.server.domain.user.facade.impl.UserFacadeImpl; import org.tattour.server.global.config.resolver.UserId; import org.tattour.server.global.dto.BaseResponse; import org.tattour.server.global.dto.FailResponse; import org.tattour.server.global.dto.SuccessResponse; import org.tattour.server.global.dto.SuccessType; -import org.tattour.server.infra.discord.service.DiscordMessageService; @RestController @RequestMapping("api/v1/order") @@ -47,7 +44,7 @@ public class OrderController { @ApiResponse( responseCode = "200", description = "조회에 성공했습니다.", - content = @Content(schema = @Schema(implementation = GetOrderSheetRes.class))), + content = @Content(schema = @Schema(implementation = ReadOrderSheetRes.class))), @ApiResponse( responseCode = "400", description = "잘못된 요청입니다.", diff --git a/server/src/main/java/org/tattour/server/domain/order/controller/dto/response/GetOrderSheetRes.java b/server/src/main/java/org/tattour/server/domain/order/controller/dto/response/GetOrderSheetRes.java deleted file mode 100644 index 86e1646b..00000000 --- a/server/src/main/java/org/tattour/server/domain/order/controller/dto/response/GetOrderSheetRes.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.tattour.server.domain.order.controller.dto.response; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.tattour.server.domain.order.facade.dto.response.ReadOrderAmountRes; -import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderPointRes; -import org.tattour.server.domain.sticker.provider.dto.response.ReadOrderSheetStickerInfo; -@Schema(description = "결제 페이지 불러오기") -@Getter -@AllArgsConstructor(access = AccessLevel.PRIVATE) -public class GetOrderSheetRes { - private ReadOrderSheetStickerInfo readOrderSheetStickerInfo; - - private ReadOrderAmountRes readOrderAmountRes; - - private ReadUserOrderPointRes readUserOrderPointRes; - - public static GetOrderSheetRes of( - ReadOrderSheetStickerInfo readOrderSheetStickerInfo, - ReadOrderAmountRes readOrderAmountRes, - ReadUserOrderPointRes readUserOrderPointRes) { - return new GetOrderSheetRes(readOrderSheetStickerInfo, readOrderAmountRes, - readUserOrderPointRes); - } -} diff --git a/server/src/main/java/org/tattour/server/domain/order/controller/dto/response/ReadOrderSheetRes.java b/server/src/main/java/org/tattour/server/domain/order/controller/dto/response/ReadOrderSheetRes.java new file mode 100644 index 00000000..7d65e54c --- /dev/null +++ b/server/src/main/java/org/tattour/server/domain/order/controller/dto/response/ReadOrderSheetRes.java @@ -0,0 +1,27 @@ +package org.tattour.server.domain.order.controller.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.tattour.server.domain.order.provider.vo.OrderAmountInfo; +import org.tattour.server.domain.user.provider.vo.UserPointAfterOrderInfo; +import org.tattour.server.domain.sticker.provider.vo.ReadOrderSheetStickerInfo; +@Schema(description = "결제 페이지 불러오기") +@Getter +@AllArgsConstructor(access = AccessLevel.PRIVATE) +public class ReadOrderSheetRes { + private ReadOrderSheetStickerInfo readOrderSheetStickerInfo; + + private OrderAmountInfo orderAmountInfo; + + private UserPointAfterOrderInfo userPointAfterOrderInfo; + + public static ReadOrderSheetRes of( + ReadOrderSheetStickerInfo readOrderSheetStickerInfo, + OrderAmountInfo orderAmountInfo, + UserPointAfterOrderInfo userPointAfterOrderInfo) { + return new ReadOrderSheetRes(readOrderSheetStickerInfo, orderAmountInfo, + userPointAfterOrderInfo); + } +} 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 264a08bb..7de2983f 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,13 +1,13 @@ package org.tattour.server.domain.order.facade; -import org.tattour.server.domain.order.controller.dto.response.GetOrderSheetRes; +import org.tattour.server.domain.order.controller.dto.response.ReadOrderSheetRes; import org.tattour.server.domain.order.facade.dto.request.CreateOrderRequest; import org.tattour.server.domain.order.facade.dto.request.ReadOrderSheetReq; import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderHistoryListRes; public interface OrderFacade { // 결제 시트 불러오기 - GetOrderSheetRes readOrderSheet(ReadOrderSheetReq req); + ReadOrderSheetRes readOrderSheet(ReadOrderSheetReq req); // 주문하기 void createOrder(CreateOrderRequest req); diff --git a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadOrderHistoryListRes.java b/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadOrderHistoryListRes.java index aa4669d3..9326e2d2 100644 --- a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadOrderHistoryListRes.java +++ b/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadOrderHistoryListRes.java @@ -5,17 +5,19 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import org.tattour.server.domain.order.provider.vo.OrderHistoryInfo; +import org.tattour.server.domain.order.provider.vo.OrderHistoryPageInfo; @Getter @NoArgsConstructor(access = AccessLevel.PRIVATE) @AllArgsConstructor(access = AccessLevel.PRIVATE) public class ReadOrderHistoryListRes { - List readOrderHistoryResList; - private PageInfoRes pageInfoRes; + List orderHistoryInfoList; + private OrderHistoryPageInfo orderHistoryPageInfo; - public static ReadOrderHistoryListRes of(List readOrderHistoryResList, - PageInfoRes pageInfoRes) { - return new ReadOrderHistoryListRes(readOrderHistoryResList, pageInfoRes); + public static ReadOrderHistoryListRes of(List orderHistoryInfoList, + OrderHistoryPageInfo orderHistoryPageInfo) { + return new ReadOrderHistoryListRes(orderHistoryInfoList, orderHistoryPageInfo); } } diff --git a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadUserOrderHistoryListRes.java b/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadUserOrderHistoryListRes.java index 1c93ff2c..41ecf44b 100644 --- a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadUserOrderHistoryListRes.java +++ b/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadUserOrderHistoryListRes.java @@ -6,6 +6,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.tattour.server.domain.order.provider.vo.UserOrderHistoryInfo; @Schema(description = "user 결제 내역 리스트 Response") @Getter @@ -14,10 +15,10 @@ @AllArgsConstructor public class ReadUserOrderHistoryListRes { - List readUserOrderHistoryResList; + List userOrderHistoryInfoList; public static ReadUserOrderHistoryListRes of( - List readUserOrderHistoryResList) { - return new ReadUserOrderHistoryListRes(readUserOrderHistoryResList); + List userOrderHistoryInfoList) { + return new ReadUserOrderHistoryListRes(userOrderHistoryInfoList); } } 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 98946ea5..e6dc5a1f 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 @@ -4,18 +4,18 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.tattour.server.domain.order.controller.dto.response.GetOrderSheetRes; +import org.tattour.server.domain.order.controller.dto.response.ReadOrderSheetRes; import org.tattour.server.domain.order.domain.Order; import org.tattour.server.domain.order.facade.OrderFacade; import org.tattour.server.domain.order.facade.dto.request.CreateOrderRequest; import org.tattour.server.domain.order.facade.dto.request.ReadOrderSheetReq; -import org.tattour.server.domain.order.facade.dto.response.ReadOrderAmountRes; -import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderPointRes; +import org.tattour.server.domain.order.provider.vo.OrderAmountInfo; +import org.tattour.server.domain.user.provider.vo.UserPointAfterOrderInfo; import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderHistoryListRes; import org.tattour.server.domain.order.provider.impl.OrderProviderImpl; import org.tattour.server.domain.order.service.impl.OrderServiceImpl; import org.tattour.server.domain.point.service.impl.PointServiceImpl; -import org.tattour.server.domain.sticker.provider.dto.response.ReadOrderSheetStickerInfo; +import org.tattour.server.domain.sticker.provider.vo.ReadOrderSheetStickerInfo; import org.tattour.server.domain.sticker.provider.impl.StickerProviderImpl; import org.tattour.server.domain.user.provider.impl.UserProviderImpl; import org.tattour.server.domain.user.service.impl.UserServiceImpl; @@ -35,11 +35,9 @@ public class OrderFacadeImpl implements OrderFacade { private final PointServiceImpl pointService; private final DiscordMessageService discordMessageService; - - // TODO : 메소드 분리하기 @Override @Transactional - public GetOrderSheetRes readOrderSheet(ReadOrderSheetReq req) { + public ReadOrderSheetRes readOrderSheet(ReadOrderSheetReq req) { // 스티커 정보(배너이미지, 이름, 원래가격, 할인가격) + 개수 ReadOrderSheetStickerInfo readOrderSheetStickerInfo = stickerProvider.readOrderSheetStickerInfo(req.getStickerId()); @@ -47,7 +45,7 @@ public GetOrderSheetRes readOrderSheet(ReadOrderSheetReq req) { // 결제 금액 정보 // 총 결제 금액, 총 상품 금액, 배송비 - ReadOrderAmountRes readOrderAmountRes = + OrderAmountInfo orderAmountInfo = orderProvider.readOrderAmountRes( Objects.isNull(readOrderSheetStickerInfo.getDiscountedPrice()) ? readOrderSheetStickerInfo.getPrice() @@ -57,13 +55,13 @@ public GetOrderSheetRes readOrderSheet(ReadOrderSheetReq req) { // 포인트 // 보유 포인트, 남는 포인트 - ReadUserOrderPointRes readUserOrderPointRes = + UserPointAfterOrderInfo userPointAfterOrderInfo = userProvider.readUserPointAfterOrderInfo( req.getUserId(), - readOrderAmountRes.getTotalAmount()); + orderAmountInfo.getTotalAmount()); - return GetOrderSheetRes.of(readOrderSheetStickerInfo, readOrderAmountRes, - readUserOrderPointRes); + return ReadOrderSheetRes.of(readOrderSheetStickerInfo, orderAmountInfo, + userPointAfterOrderInfo); } @Override @@ -77,9 +75,7 @@ public void createOrder(CreateOrderRequest req) { Order order = orderService.saveOrder(req); // userPoint 수정 - int resultPoint = userService.updateUserPoint( - req.getUserId(), - -req.getTotalAmount()); + int resultPoint = userService.updateUserPoint(req.getUserId(), -req.getTotalAmount()); // 포인트 로그 저장 pointService.savePointLog( 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 75efdcc6..fce00365 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 @@ -1,7 +1,7 @@ package org.tattour.server.domain.order.provider; import org.tattour.server.domain.order.domain.Order; -import org.tattour.server.domain.order.facade.dto.response.ReadOrderAmountRes; +import org.tattour.server.domain.order.provider.vo.OrderAmountInfo; import org.tattour.server.domain.order.facade.dto.response.ReadOrderHistoryListRes; import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderHistoryListRes; @@ -20,7 +20,7 @@ public interface OrderProvider { ReadUserOrderHistoryListRes readOrderHistoryAfterDate(int userId, String date); // 결제 금액정보 가져오기 - ReadOrderAmountRes readOrderAmountRes(int price, int count, int shippingFee); + OrderAmountInfo readOrderAmountRes(int price, int count, int shippingFee); // 상품 금액 계산 int calculateProductAmount(int price, int count); 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 c23c3270..906334ab 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 @@ -7,13 +7,13 @@ import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.tattour.server.domain.order.domain.Order; -import org.tattour.server.domain.order.facade.dto.response.ReadOrderAmountRes; +import org.tattour.server.domain.order.provider.vo.UserOrderHistoryInfo; +import org.tattour.server.domain.order.provider.vo.OrderAmountInfo; import org.tattour.server.domain.order.provider.OrderProvider; import org.tattour.server.domain.order.facade.dto.response.ReadOrderHistoryListRes; -import org.tattour.server.domain.order.facade.dto.response.ReadOrderHistoryRes; +import org.tattour.server.domain.order.provider.vo.OrderHistoryInfo; import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderHistoryListRes; -import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderHistoryRes; -import org.tattour.server.domain.order.facade.dto.response.PageInfoRes; +import org.tattour.server.domain.order.provider.vo.OrderHistoryPageInfo; import org.tattour.server.domain.order.repository.impl.OrderRepositoryImpl; import org.tattour.server.domain.sticker.provider.impl.StickerProviderImpl; import org.tattour.server.domain.user.provider.impl.UserProviderImpl; @@ -42,12 +42,12 @@ public ReadOrderHistoryListRes readOrderHistoryByPage(int page) { page - 1, 10, Sort.by("createdAt"))); - List readOrderHistoryResList = + List orderHistoryInfoList = EntityDtoMapper.INSTANCE.toGetOrderHistoryListRes(getOrderHistoryResPage); return ReadOrderHistoryListRes.of( - readOrderHistoryResList, - PageInfoRes.of( + orderHistoryInfoList, + OrderHistoryPageInfo.of( page, getOrderHistoryResPage.getTotalElements(), getOrderHistoryResPage.getTotalPages())); @@ -55,31 +55,31 @@ public ReadOrderHistoryListRes readOrderHistoryByPage(int page) { @Override public ReadUserOrderHistoryListRes readOrderHistoryByUserId(int userId) { - List readUserOrderHistoryResList = + List userOrderHistoryInfoList = EntityDtoMapper.INSTANCE .toGetUserOrderHistoryListRes(orderRepository.findAllByUser_Id(userId)); - return ReadUserOrderHistoryListRes.of(readUserOrderHistoryResList); + return ReadUserOrderHistoryListRes.of(userOrderHistoryInfoList); } @Override public ReadUserOrderHistoryListRes readOrderHistoryAfterDate(int userId, String date) { - List readUserOrderHistoryResList = + List userOrderHistoryInfoList = EntityDtoMapper.INSTANCE .toGetUserOrderHistoryListRes( orderRepository.findAllByUser_IdAndCreatedAtAfter( userId, date)); - return ReadUserOrderHistoryListRes.of(readUserOrderHistoryResList); + return ReadUserOrderHistoryListRes.of(userOrderHistoryInfoList); } @Override - public ReadOrderAmountRes readOrderAmountRes(int price, int count, int shippingFee) { + public OrderAmountInfo readOrderAmountRes(int price, int count, int shippingFee) { int productAmount = calculateProductAmount(price, count); int totalAmount = calculateTotalAmount(productAmount, shippingFee); - return ReadOrderAmountRes.of(totalAmount, productAmount, shippingFee); + return OrderAmountInfo.of(totalAmount, productAmount, shippingFee); } @Override diff --git a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadOrderAmountRes.java b/server/src/main/java/org/tattour/server/domain/order/provider/vo/OrderAmountInfo.java similarity index 66% rename from server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadOrderAmountRes.java rename to server/src/main/java/org/tattour/server/domain/order/provider/vo/OrderAmountInfo.java index 1d754f6c..814ddf31 100644 --- a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadOrderAmountRes.java +++ b/server/src/main/java/org/tattour/server/domain/order/provider/vo/OrderAmountInfo.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.order.facade.dto.response; +package org.tattour.server.domain.order.provider.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -7,7 +7,7 @@ @Schema(description = "결제 금액 정보") @Getter @AllArgsConstructor -public class ReadOrderAmountRes { +public class OrderAmountInfo { @Schema(description = "총 결제금액", example = "12000") private Integer totalAmount; @@ -18,8 +18,8 @@ public class ReadOrderAmountRes { @Schema(description = "배송비", example = "3000") private Integer shippingFee; - public static ReadOrderAmountRes of(Integer totalAmount, Integer productAmount, + public static OrderAmountInfo of(Integer totalAmount, Integer productAmount, Integer shippingFee) { - return new ReadOrderAmountRes(totalAmount, productAmount, shippingFee); + return new OrderAmountInfo(totalAmount, productAmount, shippingFee); } } diff --git a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadOrderHistoryRes.java b/server/src/main/java/org/tattour/server/domain/order/provider/vo/OrderHistoryInfo.java similarity index 87% rename from server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadOrderHistoryRes.java rename to server/src/main/java/org/tattour/server/domain/order/provider/vo/OrderHistoryInfo.java index 31ca6b79..fa199a0b 100644 --- a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadOrderHistoryRes.java +++ b/server/src/main/java/org/tattour/server/domain/order/provider/vo/OrderHistoryInfo.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.order.facade.dto.response; +package org.tattour.server.domain.order.provider.vo; import lombok.Getter; import lombok.NoArgsConstructor; @@ -7,7 +7,7 @@ @Getter @Setter @NoArgsConstructor -public class ReadOrderHistoryRes { +public class OrderHistoryInfo { private int id; private String productName; diff --git a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/PageInfoRes.java b/server/src/main/java/org/tattour/server/domain/order/provider/vo/OrderHistoryPageInfo.java similarity index 53% rename from server/src/main/java/org/tattour/server/domain/order/facade/dto/response/PageInfoRes.java rename to server/src/main/java/org/tattour/server/domain/order/provider/vo/OrderHistoryPageInfo.java index 591f86fe..8fdc8a0a 100644 --- a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/PageInfoRes.java +++ b/server/src/main/java/org/tattour/server/domain/order/provider/vo/OrderHistoryPageInfo.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.order.facade.dto.response; +package org.tattour.server.domain.order.provider.vo; import lombok.AccessLevel; import lombok.Getter; @@ -6,20 +6,20 @@ @Getter @NoArgsConstructor(access = AccessLevel.PRIVATE) -public class PageInfoRes { +public class OrderHistoryPageInfo { private int page; private final int size = 10; private Long totalElements; private int totalPages; - public PageInfoRes(int page, Long totalElements, int totalPages) { + public OrderHistoryPageInfo(int page, Long totalElements, int totalPages) { this.page = page; this.totalElements = totalElements; this.totalPages = totalPages; } - public static PageInfoRes of(int page, Long totalElements, int totalPages) { - return new PageInfoRes(page, totalElements, totalPages); + public static OrderHistoryPageInfo of(int page, Long totalElements, int totalPages) { + return new OrderHistoryPageInfo(page, totalElements, totalPages); } } diff --git a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadUserOrderHistoryRes.java b/server/src/main/java/org/tattour/server/domain/order/provider/vo/UserOrderHistoryInfo.java similarity index 90% rename from server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadUserOrderHistoryRes.java rename to server/src/main/java/org/tattour/server/domain/order/provider/vo/UserOrderHistoryInfo.java index 43c876af..c285c153 100644 --- a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadUserOrderHistoryRes.java +++ b/server/src/main/java/org/tattour/server/domain/order/provider/vo/UserOrderHistoryInfo.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.order.facade.dto.response; +package org.tattour.server.domain.order.provider.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; @@ -9,7 +9,7 @@ @Getter @Setter @NoArgsConstructor -public class ReadUserOrderHistoryRes { +public class UserOrderHistoryInfo { @Schema(description = "결제 내역 id") private int id; diff --git a/server/src/main/java/org/tattour/server/domain/point/dao/PointDao.java b/server/src/main/java/org/tattour/server/domain/point/dao/PointDao.java index 45b2b0b0..99d8b856 100644 --- a/server/src/main/java/org/tattour/server/domain/point/dao/PointDao.java +++ b/server/src/main/java/org/tattour/server/domain/point/dao/PointDao.java @@ -5,8 +5,8 @@ import javax.sql.DataSource; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Repository; -import org.tattour.server.domain.point.provider.dto.response.GetPointChargeRequestRes; -import org.tattour.server.domain.point.provider.dto.response.GetPointLogRes; +import org.tattour.server.domain.point.provider.vo.PointChargeRequestInfo; +import org.tattour.server.domain.point.provider.vo.PointLogInfo; @Repository public class PointDao { @@ -18,7 +18,7 @@ public PointDao(DataSource dataSource) { } // 조건에 따라 유저 포인트 충전 요청 내역 가져오기 - public List getPointChargeRequestResList(Integer userId, + public List getPointChargeRequestResList(Integer userId, Boolean isCompleted) { String query = "SELECT * " @@ -37,7 +37,7 @@ public List getPointChargeRequestResList(Integer userI } return jdbcTemplate.query(query, - (rs, rownum) -> GetPointChargeRequestRes.builder() + (rs, rownum) -> PointChargeRequestInfo.builder() .id(rs.getInt("id")) .userId(rs.getInt("user_id")) .chargeAmount(rs.getInt("charge_amount")) @@ -53,7 +53,7 @@ public List getPointChargeRequestResList(Integer userI } // 조건에 따라 포인트 로그 불러오기 - public List getPointLogResList(Integer userId, String title) { + public List getPointLogResList(Integer userId, String title) { String query = "SELECT * FROM user_point_log " + "WHERE 1=1 "; @@ -70,7 +70,7 @@ public List getPointLogResList(Integer userId, String title) { } return jdbcTemplate.query(query, - (rs, rownum) -> GetPointLogRes.builder() + (rs, rownum) -> PointLogInfo.builder() .id(rs.getInt("id")) .userId(rs.getInt("user_id")) .title(rs.getString("title")) diff --git a/server/src/main/java/org/tattour/server/domain/point/facade/dto/response/ReadPointChargeRequestListRes.java b/server/src/main/java/org/tattour/server/domain/point/facade/dto/response/ReadPointChargeRequestListRes.java new file mode 100644 index 00000000..8a3607ad --- /dev/null +++ b/server/src/main/java/org/tattour/server/domain/point/facade/dto/response/ReadPointChargeRequestListRes.java @@ -0,0 +1,21 @@ +package org.tattour.server.domain.point.facade.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.tattour.server.domain.point.provider.vo.PointChargeRequestInfo; + +@Schema(description = "포인트 충전 요청 내역 리스트 Response") +@Getter +@AllArgsConstructor(access = AccessLevel.PRIVATE) +public class ReadPointChargeRequestListRes { + + List pointChargeRequestInfoList; + + public static ReadPointChargeRequestListRes of( + List pointChargeRequestInfoList) { + return new ReadPointChargeRequestListRes(pointChargeRequestInfoList); + } +} diff --git a/server/src/main/java/org/tattour/server/domain/point/facade/dto/response/ReadPointLogListRes.java b/server/src/main/java/org/tattour/server/domain/point/facade/dto/response/ReadPointLogListRes.java new file mode 100644 index 00000000..9be910fe --- /dev/null +++ b/server/src/main/java/org/tattour/server/domain/point/facade/dto/response/ReadPointLogListRes.java @@ -0,0 +1,18 @@ +package org.tattour.server.domain.point.facade.dto.response; + +import java.util.List; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.tattour.server.domain.point.provider.vo.PointLogInfo; + +@Getter +@AllArgsConstructor(access = AccessLevel.PRIVATE) +public class ReadPointLogListRes { + + List pointLogInfoList; + + public static ReadPointLogListRes of(List pointLogInfoList) { + return new ReadPointLogListRes(pointLogInfoList); + } +} diff --git a/server/src/main/java/org/tattour/server/domain/point/provider/PointProvider.java b/server/src/main/java/org/tattour/server/domain/point/provider/PointProvider.java index 04a7d441..7b7250da 100644 --- a/server/src/main/java/org/tattour/server/domain/point/provider/PointProvider.java +++ b/server/src/main/java/org/tattour/server/domain/point/provider/PointProvider.java @@ -1,10 +1,8 @@ package org.tattour.server.domain.point.provider; import org.tattour.server.domain.point.domain.PointChargeRequest; -import org.tattour.server.domain.point.provider.dto.request.GetPointChargeRequestAfterDate; -import org.tattour.server.domain.point.provider.dto.request.GetPointLogListReq; -import org.tattour.server.domain.point.provider.dto.response.GetPointChargeRequestListRes; -import org.tattour.server.domain.point.provider.dto.response.GetPointLogListRes; +import org.tattour.server.domain.point.facade.dto.response.ReadPointChargeRequestListRes; +import org.tattour.server.domain.point.facade.dto.response.ReadPointLogListRes; public interface PointProvider { @@ -12,11 +10,11 @@ public interface PointProvider { PointChargeRequest getPointChargeRequestById(Integer id); // id와 날짜로 포인트 충전 요청 가져오기 - GetPointChargeRequestListRes getPointChargeRequestAfterDate(GetPointChargeRequestAfterDate req); + ReadPointChargeRequestListRes getPointChargeRequestAfterDate(int userId, String date); // 조건에 따라 포인트 충전 요청 가져오기 - GetPointChargeRequestListRes getAllPointChargeRequest(Integer userId, Boolean isComplete); + ReadPointChargeRequestListRes getAllPointChargeRequest(Integer userId, Boolean isComplete); // 조건에 따라 포인트 로그 가져오기 - GetPointLogListRes getPointLog(GetPointLogListReq req); + ReadPointLogListRes getPointLog(Integer userId, String title); } diff --git a/server/src/main/java/org/tattour/server/domain/point/provider/dto/request/GetPointChargeRequestAfterDate.java b/server/src/main/java/org/tattour/server/domain/point/provider/dto/request/GetPointChargeRequestAfterDate.java deleted file mode 100644 index 4f091ab8..00000000 --- a/server/src/main/java/org/tattour/server/domain/point/provider/dto/request/GetPointChargeRequestAfterDate.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.tattour.server.domain.point.provider.dto.request; - -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor(access = AccessLevel.PRIVATE) -public class GetPointChargeRequestAfterDate { - - private int userId; - private String date; - - public static GetPointChargeRequestAfterDate of(int userId, String date) { - return new GetPointChargeRequestAfterDate(userId, date); - } -} diff --git a/server/src/main/java/org/tattour/server/domain/point/provider/dto/request/GetPointLogListReq.java b/server/src/main/java/org/tattour/server/domain/point/provider/dto/request/GetPointLogListReq.java deleted file mode 100644 index 446ad245..00000000 --- a/server/src/main/java/org/tattour/server/domain/point/provider/dto/request/GetPointLogListReq.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.tattour.server.domain.point.provider.dto.request; - -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor(access = AccessLevel.PRIVATE) -public class GetPointLogListReq { - - public Integer userId; - public String title; - - public static GetPointLogListReq of(Integer userId, String title) { - return new GetPointLogListReq(userId, title); - } -} diff --git a/server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointChargeRequestListRes.java b/server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointChargeRequestListRes.java deleted file mode 100644 index 173af064..00000000 --- a/server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointChargeRequestListRes.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.tattour.server.domain.point.provider.dto.response; - -import io.swagger.v3.oas.annotations.media.Schema; -import java.util.List; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Schema(description = "포인트 충전 요청 내역 리스트 Response") -@Getter -@AllArgsConstructor(access = AccessLevel.PRIVATE) -public class GetPointChargeRequestListRes { - - List getPointChargeRequestResList; - - public static GetPointChargeRequestListRes of( - List getPointChargeRequestResList) { - return new GetPointChargeRequestListRes(getPointChargeRequestResList); - } -} diff --git a/server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointLogListRes.java b/server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointLogListRes.java deleted file mode 100644 index 5d299c17..00000000 --- a/server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointLogListRes.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.tattour.server.domain.point.provider.dto.response; - -import java.util.List; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor(access = AccessLevel.PRIVATE) -public class GetPointLogListRes { - - List getPointLogResList; - - public static GetPointLogListRes of(List getPointLogResList) { - return new GetPointLogListRes(getPointLogResList); - } -} diff --git a/server/src/main/java/org/tattour/server/domain/point/provider/impl/PointProviderImpl.java b/server/src/main/java/org/tattour/server/domain/point/provider/impl/PointProviderImpl.java index 8fbb6a6f..8d129c12 100644 --- a/server/src/main/java/org/tattour/server/domain/point/provider/impl/PointProviderImpl.java +++ b/server/src/main/java/org/tattour/server/domain/point/provider/impl/PointProviderImpl.java @@ -6,11 +6,9 @@ import org.tattour.server.domain.point.dao.PointDao; import org.tattour.server.domain.point.domain.PointChargeRequest; import org.tattour.server.domain.point.provider.PointProvider; -import org.tattour.server.domain.point.provider.dto.request.GetPointChargeRequestAfterDate; -import org.tattour.server.domain.point.provider.dto.request.GetPointLogListReq; -import org.tattour.server.domain.point.provider.dto.response.GetPointChargeRequestListRes; -import org.tattour.server.domain.point.provider.dto.response.GetPointLogListRes; -import org.tattour.server.domain.point.provider.dto.response.GetPointLogRes; +import org.tattour.server.domain.point.facade.dto.response.ReadPointChargeRequestListRes; +import org.tattour.server.domain.point.facade.dto.response.ReadPointLogListRes; +import org.tattour.server.domain.point.provider.vo.PointLogInfo; import org.tattour.server.domain.point.repository.impl.PointChargeRequestRepositoryImpl; import org.tattour.server.global.exception.BusinessException; import org.tattour.server.global.exception.ErrorType; @@ -31,27 +29,24 @@ public PointChargeRequest getPointChargeRequestById(Integer id) { } @Override - public GetPointChargeRequestListRes getPointChargeRequestAfterDate( - GetPointChargeRequestAfterDate req) { - return GetPointChargeRequestListRes.of( + public ReadPointChargeRequestListRes getPointChargeRequestAfterDate(int userId, String date) { + return ReadPointChargeRequestListRes.of( EntityDtoMapper.INSTANCE.toGetPointChargeRequestResList( pointChargeRequestRepository - .findPointChargeRequestByUser_IdAndCreatedAtAfter(req.getUserId(), - req.getDate()))); + .findPointChargeRequestByUser_IdAndCreatedAtAfter(userId, date))); } @Override - public GetPointChargeRequestListRes getAllPointChargeRequest(Integer userId, + public ReadPointChargeRequestListRes getAllPointChargeRequest(Integer userId, Boolean isCompleted) { - return GetPointChargeRequestListRes.of( + return ReadPointChargeRequestListRes.of( pointDao.getPointChargeRequestResList(userId, isCompleted)); } @Override - public GetPointLogListRes getPointLog(GetPointLogListReq req) { - List userPointLogList = pointDao.getPointLogResList(req.getUserId(), - req.getTitle()); + public ReadPointLogListRes getPointLog(Integer userId, String title) { + List userPointLogList = pointDao.getPointLogResList(userId, title); - return GetPointLogListRes.of(userPointLogList); + return ReadPointLogListRes.of(userPointLogList); } } diff --git a/server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointChargeRequestRes.java b/server/src/main/java/org/tattour/server/domain/point/provider/vo/PointChargeRequestInfo.java similarity index 92% rename from server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointChargeRequestRes.java rename to server/src/main/java/org/tattour/server/domain/point/provider/vo/PointChargeRequestInfo.java index c266d367..b57baf40 100644 --- a/server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointChargeRequestRes.java +++ b/server/src/main/java/org/tattour/server/domain/point/provider/vo/PointChargeRequestInfo.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.point.provider.dto.response; +package org.tattour.server.domain.point.provider.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; @@ -12,7 +12,7 @@ @Setter @Builder @AllArgsConstructor(access = AccessLevel.PRIVATE) -public class GetPointChargeRequestRes { +public class PointChargeRequestInfo { @Schema(description = "포인트 충전 요청 id") private int id; diff --git a/server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointLogRes.java b/server/src/main/java/org/tattour/server/domain/point/provider/vo/PointLogInfo.java similarity index 80% rename from server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointLogRes.java rename to server/src/main/java/org/tattour/server/domain/point/provider/vo/PointLogInfo.java index 70c3466d..a34ec14c 100644 --- a/server/src/main/java/org/tattour/server/domain/point/provider/dto/response/GetPointLogRes.java +++ b/server/src/main/java/org/tattour/server/domain/point/provider/vo/PointLogInfo.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.point.provider.dto.response; +package org.tattour.server.domain.point.provider.vo; import lombok.AccessLevel; import lombok.AllArgsConstructor; @@ -8,7 +8,7 @@ @Getter @Builder @AllArgsConstructor(access = AccessLevel.PRIVATE) -public class GetPointLogRes { +public class PointLogInfo { private int id; private int userId; diff --git a/server/src/main/java/org/tattour/server/domain/point/service/dto/response/ConfirmPointChargeResponseDto.java b/server/src/main/java/org/tattour/server/domain/point/service/dto/response/ConfirmPointChargeResponseDto.java index 2db0c6ba..5d78e177 100644 --- a/server/src/main/java/org/tattour/server/domain/point/service/dto/response/ConfirmPointChargeResponseDto.java +++ b/server/src/main/java/org/tattour/server/domain/point/service/dto/response/ConfirmPointChargeResponseDto.java @@ -6,7 +6,7 @@ import lombok.Getter; import org.tattour.server.domain.custom.service.dto.response.CustomApplySummaryInfoList; import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderHistoryListRes; -import org.tattour.server.domain.point.provider.dto.response.GetPointChargeRequestListRes; +import org.tattour.server.domain.point.facade.dto.response.ReadPointChargeRequestListRes; import org.tattour.server.domain.user.provider.dto.response.GetUserInfoDto; @Schema(description = "송금 금액이 다를 경우 user 정보 Response") @@ -17,7 +17,7 @@ public class ConfirmPointChargeResponseDto { // 유저 정보 GetUserInfoDto getUserInfoDto; // 포인트 충전 내역 - GetPointChargeRequestListRes getPointChargeRequestListRes; + ReadPointChargeRequestListRes readPointChargeRequestListRes; // 구매 내역 ReadUserOrderHistoryListRes orderHistoryListRes; // 커스텀 신청내역 @@ -25,10 +25,10 @@ public class ConfirmPointChargeResponseDto { public static ConfirmPointChargeResponseDto of( GetUserInfoDto getUserInfoDto, - GetPointChargeRequestListRes getPointChargeRequestListRes, + ReadPointChargeRequestListRes readPointChargeRequestListRes, ReadUserOrderHistoryListRes readUserOrderHistoryListRes, CustomApplySummaryInfoList customApplySummaryInfoList) { - return new ConfirmPointChargeResponseDto(getUserInfoDto, getPointChargeRequestListRes, + return new ConfirmPointChargeResponseDto(getUserInfoDto, readPointChargeRequestListRes, readUserOrderHistoryListRes, customApplySummaryInfoList); } } diff --git a/server/src/main/java/org/tattour/server/domain/point/service/impl/PointServiceImpl.java b/server/src/main/java/org/tattour/server/domain/point/service/impl/PointServiceImpl.java index 538bd7f6..ed6bc512 100644 --- a/server/src/main/java/org/tattour/server/domain/point/service/impl/PointServiceImpl.java +++ b/server/src/main/java/org/tattour/server/domain/point/service/impl/PointServiceImpl.java @@ -11,8 +11,7 @@ import org.tattour.server.domain.order.provider.impl.OrderProviderImpl; import org.tattour.server.domain.point.domain.PointChargeRequest; import org.tattour.server.domain.point.domain.UserPointLog; -import org.tattour.server.domain.point.provider.dto.request.GetPointChargeRequestAfterDate; -import org.tattour.server.domain.point.provider.dto.response.GetPointChargeRequestListRes; +import org.tattour.server.domain.point.facade.dto.response.ReadPointChargeRequestListRes; import org.tattour.server.domain.point.provider.impl.PointProviderImpl; import org.tattour.server.domain.point.repository.impl.PointChargeRequestRepositoryImpl; import org.tattour.server.domain.point.repository.impl.UserPointLogRepositoryImpl; @@ -20,7 +19,6 @@ import org.tattour.server.domain.point.service.dto.request.ConfirmPointChargeRequestDto; import org.tattour.server.domain.point.service.dto.request.PatchPointChangeRequestReq; import org.tattour.server.domain.point.service.dto.request.SavePointChargeRequestReq; -import org.tattour.server.domain.point.service.dto.request.SaveUserPointLogReq; import org.tattour.server.domain.point.service.dto.response.ConfirmPointChargeResponseDto; import org.tattour.server.domain.user.domain.User; import org.tattour.server.domain.user.provider.dto.response.GetUserInfoDto; @@ -105,11 +103,10 @@ public ConfirmPointChargeResponseDto confirmPointChargeRequest( GetUserInfoDto getUserInfoDto = EntityDtoMapper.INSTANCE.toGetUserInfoDto(user); // 포인트 충전 내역 - GetPointChargeRequestListRes getPointChargeRequestListRes = - pointProvider.getPointChargeRequestAfterDate( - GetPointChargeRequestAfterDate.of(req.getUserId(), baseDate)); - getPointChargeRequestListRes - .getGetPointChargeRequestResList() + ReadPointChargeRequestListRes readPointChargeRequestListRes = + pointProvider.getPointChargeRequestAfterDate(req.getUserId(), baseDate); + readPointChargeRequestListRes + .getPointChargeRequestInfoList() .add(0, EntityDtoMapper.INSTANCE.toGetPointChargeRequestRes( pointChargeRequest)); @@ -125,7 +122,7 @@ public ConfirmPointChargeResponseDto confirmPointChargeRequest( GetCustomSummaryInfo.of(req.getUserId(), baseDate)); return ConfirmPointChargeResponseDto.of(getUserInfoDto, - getPointChargeRequestListRes, readUserOrderHistoryListRes, + readPointChargeRequestListRes, readUserOrderHistoryListRes, customApplySummaryInfoList); } } else { 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 7c034290..8403a8a9 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,7 +1,7 @@ package org.tattour.server.domain.sticker.provider; import org.tattour.server.domain.sticker.domain.Sticker; -import org.tattour.server.domain.sticker.provider.dto.response.ReadOrderSheetStickerInfo; +import org.tattour.server.domain.sticker.provider.vo.ReadOrderSheetStickerInfo; 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 d099941e..3b5f8bed 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 @@ -5,7 +5,7 @@ import org.springframework.stereotype.Service; import org.tattour.server.domain.sticker.domain.Sticker; import org.tattour.server.domain.sticker.provider.StickerProvider; -import org.tattour.server.domain.sticker.provider.dto.response.ReadOrderSheetStickerInfo; +import org.tattour.server.domain.sticker.provider.vo.ReadOrderSheetStickerInfo; import org.tattour.server.domain.sticker.repository.impl.StickerRepositoryImpl; 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/sticker/provider/dto/response/ReadOrderSheetStickerInfo.java b/server/src/main/java/org/tattour/server/domain/sticker/provider/vo/ReadOrderSheetStickerInfo.java similarity index 95% rename from server/src/main/java/org/tattour/server/domain/sticker/provider/dto/response/ReadOrderSheetStickerInfo.java rename to server/src/main/java/org/tattour/server/domain/sticker/provider/vo/ReadOrderSheetStickerInfo.java index 88cbe8e0..ae98c7be 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/provider/dto/response/ReadOrderSheetStickerInfo.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/provider/vo/ReadOrderSheetStickerInfo.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.sticker.provider.dto.response; +package org.tattour.server.domain.sticker.provider.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/server/src/main/java/org/tattour/server/domain/sticker/provider/dto/response/StickerLikedInfo.java b/server/src/main/java/org/tattour/server/domain/sticker/provider/vo/StickerLikedInfo.java similarity index 93% rename from server/src/main/java/org/tattour/server/domain/sticker/provider/dto/response/StickerLikedInfo.java rename to server/src/main/java/org/tattour/server/domain/sticker/provider/vo/StickerLikedInfo.java index d83c465a..ec9a6ccc 100644 --- a/server/src/main/java/org/tattour/server/domain/sticker/provider/dto/response/StickerLikedInfo.java +++ b/server/src/main/java/org/tattour/server/domain/sticker/provider/vo/StickerLikedInfo.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.sticker.provider.dto.response; +package org.tattour.server.domain.sticker.provider.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/server/src/main/java/org/tattour/server/domain/user/controller/dto/request/LoginReq.java b/server/src/main/java/org/tattour/server/domain/user/controller/dto/request/PostLoginReq.java similarity index 80% rename from server/src/main/java/org/tattour/server/domain/user/controller/dto/request/LoginReq.java rename to server/src/main/java/org/tattour/server/domain/user/controller/dto/request/PostLoginReq.java index 8c8bcd3a..3c16af78 100644 --- a/server/src/main/java/org/tattour/server/domain/user/controller/dto/request/LoginReq.java +++ b/server/src/main/java/org/tattour/server/domain/user/controller/dto/request/PostLoginReq.java @@ -10,13 +10,13 @@ @Getter @NoArgsConstructor(access = AccessLevel.PRIVATE) @AllArgsConstructor(access = AccessLevel.PRIVATE) -public class LoginReq { +public class PostLoginReq { @Schema(description = "소셜 로그인 플랫폼", example = "KAKAO") @NotNull(message = "socialPlatform is null") private SocialPlatform socialPlatform; - public static LoginReq of(SocialPlatform socialPlatform) { - return new LoginReq(socialPlatform); + public static PostLoginReq of(SocialPlatform socialPlatform) { + return new PostLoginReq(socialPlatform); } } diff --git a/server/src/main/java/org/tattour/server/domain/user/provider/dto/response/ProductLikedListRes.java b/server/src/main/java/org/tattour/server/domain/user/provider/dto/response/ProductLikedListRes.java index 12634557..676bce5e 100644 --- a/server/src/main/java/org/tattour/server/domain/user/provider/dto/response/ProductLikedListRes.java +++ b/server/src/main/java/org/tattour/server/domain/user/provider/dto/response/ProductLikedListRes.java @@ -3,11 +3,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Getter; -import lombok.NoArgsConstructor; import lombok.Setter; -import org.tattour.server.domain.sticker.provider.dto.response.StickerLikedInfo; +import org.tattour.server.domain.sticker.provider.vo.StickerLikedInfo; @Schema(description = "좋아요한 타투 스티커 리스트 Response") @Getter diff --git a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadUserOrderPointRes.java b/server/src/main/java/org/tattour/server/domain/user/provider/vo/UserPointAfterOrderInfo.java similarity index 67% rename from server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadUserOrderPointRes.java rename to server/src/main/java/org/tattour/server/domain/user/provider/vo/UserPointAfterOrderInfo.java index 9276add6..255914d0 100644 --- a/server/src/main/java/org/tattour/server/domain/order/facade/dto/response/ReadUserOrderPointRes.java +++ b/server/src/main/java/org/tattour/server/domain/user/provider/vo/UserPointAfterOrderInfo.java @@ -1,4 +1,4 @@ -package org.tattour.server.domain.order.facade.dto.response; +package org.tattour.server.domain.user.provider.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AccessLevel; @@ -8,7 +8,7 @@ @Schema(description = "user 포인트 정보") @Getter @AllArgsConstructor(access = AccessLevel.PRIVATE) -public class ReadUserOrderPointRes { +public class UserPointAfterOrderInfo { @Schema(description = "현재 user 포인트", example = "5000") private int userPoint; @@ -19,7 +19,7 @@ public class ReadUserOrderPointRes { @Schema(description = "포인트 부족한지 여부", example = "true") private Boolean isLacked; - public static ReadUserOrderPointRes of(int userPoint, int resultPoint, Boolean isLacked) { - return new ReadUserOrderPointRes(userPoint, resultPoint, isLacked); + public static UserPointAfterOrderInfo of(int userPoint, int resultPoint, Boolean isLacked) { + return new UserPointAfterOrderInfo(userPoint, resultPoint, isLacked); } } diff --git a/server/src/main/java/org/tattour/server/global/util/EntityDtoMapper.java b/server/src/main/java/org/tattour/server/global/util/EntityDtoMapper.java index 8014664a..086a0f91 100644 --- a/server/src/main/java/org/tattour/server/global/util/EntityDtoMapper.java +++ b/server/src/main/java/org/tattour/server/global/util/EntityDtoMapper.java @@ -8,11 +8,11 @@ import org.tattour.server.domain.custom.domain.Custom; import org.tattour.server.domain.custom.service.dto.response.CustomApplySummaryInfo; import org.tattour.server.domain.order.domain.Order; -import org.tattour.server.domain.order.facade.dto.response.ReadOrderHistoryRes; -import org.tattour.server.domain.order.facade.dto.response.ReadUserOrderHistoryRes; +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.dto.response.GetPointChargeRequestRes; -import org.tattour.server.domain.sticker.provider.dto.response.StickerLikedInfo; +import org.tattour.server.domain.point.provider.vo.PointChargeRequestInfo; +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.provider.dto.response.GetUserInfoDto; @@ -47,22 +47,22 @@ public interface EntityDtoMapper { // Order @Mapping(target = "userId", source = "user.id") @Mapping(target = "stickerId", source = "sticker.id") - ReadUserOrderHistoryRes toGetUserOrderHistoryRes(Order order); + UserOrderHistoryInfo toGetUserOrderHistoryRes(Order order); - List toGetUserOrderHistoryListRes(List orderList); + List toGetUserOrderHistoryListRes(List orderList); @Mapping(target = "userId", source = "user.id") @Mapping(target = "stickerId", source = "sticker.id") - ReadOrderHistoryRes toGetOrderHistoryRes(Order order); + OrderHistoryInfo toGetOrderHistoryRes(Order order); - @IterableMapping(elementTargetType = ReadOrderHistoryRes.class) - List toGetOrderHistoryListRes(Page orderList); + @IterableMapping(elementTargetType = OrderHistoryInfo.class) + List toGetOrderHistoryListRes(Page orderList); // Point @Mapping(target = "userId", source = "user.id") - GetPointChargeRequestRes toGetPointChargeRequestRes(PointChargeRequest pointChargeRequest); + PointChargeRequestInfo toGetPointChargeRequestRes(PointChargeRequest pointChargeRequest); - List toGetPointChargeRequestResList( + List toGetPointChargeRequestResList( List pointChargeRequestList); // Custom