From 16bbfd5d78a503afe5ea1f9ec884fa88151965aa Mon Sep 17 00:00:00 2001 From: Anton Bondar Date: Sun, 9 Jul 2023 23:01:45 +0300 Subject: [PATCH 1/2] payment refund --- .../configuration/SecurityConfig.java | 1 + .../controller/ManagementOrderController.java | 23 + .../ManagementOrderControllerTest.java | 6 + .../java/greencity/entity/order/Refund.java | 30 ++ .../repository/RefundRepository.java | 9 + .../db/changelog/db.changelog-master.xml | 1 + .../logs/ch-add-table-refunds-Bondar.xml | 17 + .../service/ubs/UBSManagementService.java | 28 +- .../service/ubs/UBSManagementServiceImpl.java | 10 + .../src/test/java/greencity/ModelUtils.java | 5 + .../ubs/UBSManagementServiceImplTest.java | 466 ++++++++++-------- 11 files changed, 403 insertions(+), 193 deletions(-) create mode 100644 dao/src/main/java/greencity/entity/order/Refund.java create mode 100644 dao/src/main/java/greencity/repository/RefundRepository.java create mode 100644 dao/src/main/resources/db/changelog/logs/ch-add-table-refunds-Bondar.xml diff --git a/core/src/main/java/greencity/configuration/SecurityConfig.java b/core/src/main/java/greencity/configuration/SecurityConfig.java index c8d3ff64e..4721adbcc 100644 --- a/core/src/main/java/greencity/configuration/SecurityConfig.java +++ b/core/src/main/java/greencity/configuration/SecurityConfig.java @@ -113,6 +113,7 @@ protected void configure(HttpSecurity http) throws Exception { UBS_MANAG_LINK + "/add-manual-payment/{id}", UBS_MANAG_LINK + "/add-bonuses-user/{id}", UBS_MANAG_LINK + "/order/{id}/cancellation", + UBS_MANAG_LINK + "/save-order-for-refund/{orderId}", ADMIN_EMPL_LINK + "/**", SUPER_ADMIN_LINK + "/add-new-tariff", SUPER_ADMIN_LINK + "/check-if-tariff-exists", diff --git a/core/src/main/java/greencity/controller/ManagementOrderController.java b/core/src/main/java/greencity/controller/ManagementOrderController.java index 0a505213e..d356ab351 100644 --- a/core/src/main/java/greencity/controller/ManagementOrderController.java +++ b/core/src/main/java/greencity/controller/ManagementOrderController.java @@ -1041,4 +1041,27 @@ public ResponseEntity updateCancellationReason( @ApiIgnore @CurrentUserUuid String uuid) { return ResponseEntity.status(HttpStatus.OK).body(ubsClientService.updateOrderCancellationReason(id, dto, uuid)); } + + /** + * Controller saves order ID of order for which we need to make a refund. + * + * @param orderId {@link Long}. + * @return {@link HttpStatus} - http status. + * + * @author Anton Bondar + */ + @ApiOperation(value = "saves order ID of order for which we need to make a refund") + @ApiResponses(value = { + @ApiResponse(code = 201, message = HttpStatuses.CREATED), + @ApiResponse(code = 400, message = HttpStatuses.BAD_REQUEST), + @ApiResponse(code = 401, message = HttpStatuses.UNAUTHORIZED), + @ApiResponse(code = 404, message = HttpStatuses.NOT_FOUND) + }) + @ResponseStatus(value = HttpStatus.CREATED) + @PostMapping("/save-order-for-refund/{orderId}") + public ResponseEntity saveOrderIdForRefund( + @Valid @PathVariable("orderId") Long orderId) { + ubsManagementService.saveOrderIdForRefund(orderId); + return new ResponseEntity<>(HttpStatus.CREATED); + } } diff --git a/core/src/test/java/greencity/controller/ManagementOrderControllerTest.java b/core/src/test/java/greencity/controller/ManagementOrderControllerTest.java index d6296206d..afc765953 100644 --- a/core/src/test/java/greencity/controller/ManagementOrderControllerTest.java +++ b/core/src/test/java/greencity/controller/ManagementOrderControllerTest.java @@ -501,4 +501,10 @@ void updatesCancellationReason() throws Exception { .content(objectMapper.writeValueAsString(dto))) .andExpect(status().isOk()); } + + @Test + void saveOrderIdForRefundTest() throws Exception { + mockMvc.perform(post(ubsLink + "/save-order-for-refund/{orderId}", 1L) + .principal(principal)).andExpect(status().isCreated()); + } } diff --git a/dao/src/main/java/greencity/entity/order/Refund.java b/dao/src/main/java/greencity/entity/order/Refund.java new file mode 100644 index 000000000..0d0875d1e --- /dev/null +++ b/dao/src/main/java/greencity/entity/order/Refund.java @@ -0,0 +1,30 @@ +package greencity.entity.order; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; + +@Entity +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Table(name = "refunds") +public class Refund { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "order_id") + @NotNull + private Long orderId; +} diff --git a/dao/src/main/java/greencity/repository/RefundRepository.java b/dao/src/main/java/greencity/repository/RefundRepository.java new file mode 100644 index 000000000..4b55e9e11 --- /dev/null +++ b/dao/src/main/java/greencity/repository/RefundRepository.java @@ -0,0 +1,9 @@ +package greencity.repository; + +import greencity.entity.order.Refund; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface RefundRepository extends JpaRepository { +} diff --git a/dao/src/main/resources/db/changelog/db.changelog-master.xml b/dao/src/main/resources/db/changelog/db.changelog-master.xml index 1a18d28e5..db07e44e8 100644 --- a/dao/src/main/resources/db/changelog/db.changelog-master.xml +++ b/dao/src/main/resources/db/changelog/db.changelog-master.xml @@ -213,4 +213,5 @@ + \ No newline at end of file diff --git a/dao/src/main/resources/db/changelog/logs/ch-add-table-refunds-Bondar.xml b/dao/src/main/resources/db/changelog/logs/ch-add-table-refunds-Bondar.xml new file mode 100644 index 000000000..b0f040076 --- /dev/null +++ b/dao/src/main/resources/db/changelog/logs/ch-add-table-refunds-Bondar.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/service-api/src/main/java/greencity/service/ubs/UBSManagementService.java b/service-api/src/main/java/greencity/service/ubs/UBSManagementService.java index 09b056099..443ed3b08 100644 --- a/service-api/src/main/java/greencity/service/ubs/UBSManagementService.java +++ b/service-api/src/main/java/greencity/service/ubs/UBSManagementService.java @@ -4,7 +4,24 @@ import greencity.dto.bag.ReasonNotTakeBagDto; import greencity.dto.certificate.CertificateDtoForSearching; import greencity.dto.employee.EmployeePositionDtoRequest; -import greencity.dto.order.*; +import greencity.dto.order.AdminCommentDto; +import greencity.dto.order.CounterOrderDetailsDto; +import greencity.dto.order.DetailsOrderInfoDto; +import greencity.dto.order.EcoNumberDto; +import greencity.dto.order.ExportDetailsDto; +import greencity.dto.order.ExportDetailsDtoUpdate; +import greencity.dto.order.NotTakenOrderReasonDto; +import greencity.dto.order.OrderAddressDtoResponse; +import greencity.dto.order.OrderAddressExportDetailsDtoUpdate; +import greencity.dto.order.OrderCancellationReasonDto; +import greencity.dto.order.OrderDetailInfoDto; +import greencity.dto.order.OrderDetailStatusDto; +import greencity.dto.order.OrderDetailStatusRequestDto; +import greencity.dto.order.OrderInfoDto; +import greencity.dto.order.OrderStatusPageDto; +import greencity.dto.order.ReadAddressByOrderDto; +import greencity.dto.order.UpdateAllOrderPageDto; +import greencity.dto.order.UpdateOrderPageAdminDto; import greencity.dto.pageble.PageableDto; import greencity.dto.payment.ManualPaymentRequestDto; import greencity.dto.payment.ManualPaymentResponseDto; @@ -301,4 +318,13 @@ void updateOrderAdminPageInfo(UpdateOrderPageAdminDto updateOrderPageAdminDto, L * @author Kharchenko Volodymyr. */ NotTakenOrderReasonDto getNotTakenOrderReason(Long orderId); + + /** + * Method saves order ID of order for which we need to make a refund. + * + * @param orderId {@link Long}. + * + * @author Anton Bondar. + */ + void saveOrderIdForRefund(Long orderId); } diff --git a/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java b/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java index fe21ad61c..bf0a85efb 100644 --- a/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java +++ b/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java @@ -55,6 +55,7 @@ import greencity.entity.order.OrderPaymentStatusTranslation; import greencity.entity.order.OrderStatusTranslation; import greencity.entity.order.Payment; +import greencity.entity.order.Refund; import greencity.entity.order.TariffsInfo; import greencity.entity.user.User; import greencity.entity.user.employee.Employee; @@ -83,6 +84,7 @@ import greencity.repository.PaymentRepository; import greencity.repository.PositionRepository; import greencity.repository.ReceivingStationRepository; +import greencity.repository.RefundRepository; import greencity.repository.ServiceRepository; import greencity.repository.TariffsInfoRepository; import greencity.repository.UserRepository; @@ -163,6 +165,7 @@ public class UBSManagementServiceImpl implements UBSManagementService { private final OrderPaymentStatusTranslationRepository orderPaymentStatusTranslationRepository; private final ServiceRepository serviceRepository; private final OrdersAdminsPageService ordersAdminsPageService; + private final RefundRepository refundRepository; private static final String DEFAULT_IMAGE_PATH = AppConstant.DEFAULT_IMAGE; @@ -1831,4 +1834,11 @@ public NotTakenOrderReasonDto getNotTakenOrderReason(Long orderId) { .images(order.getImageReasonNotTakingBags()) .build(); } + + @Override + public void saveOrderIdForRefund(Long orderId) { + orderRepository.findById(orderId) + .orElseThrow(() -> new NotFoundException(ORDER_WITH_CURRENT_ID_DOES_NOT_EXIST + orderId)); + refundRepository.save(Refund.builder().orderId(orderId).build()); + } } diff --git a/service/src/test/java/greencity/ModelUtils.java b/service/src/test/java/greencity/ModelUtils.java index 3f1c2fe6b..e182a029c 100644 --- a/service/src/test/java/greencity/ModelUtils.java +++ b/service/src/test/java/greencity/ModelUtils.java @@ -102,6 +102,7 @@ import greencity.entity.order.OrderPaymentStatusTranslation; import greencity.entity.order.OrderStatusTranslation; import greencity.entity.order.Payment; +import greencity.entity.order.Refund; import greencity.entity.order.Service; import greencity.entity.order.TariffLocation; import greencity.entity.order.TariffsInfo; @@ -4644,4 +4645,8 @@ public static PositionWithTranslateDto getPositionWithTranslateDto(Long id) { .name(nameTranslations) .build(); } + + public static Refund getRefund(Long id) { + return Refund.builder().orderId(id).build(); + } } diff --git a/service/src/test/java/greencity/service/ubs/UBSManagementServiceImplTest.java b/service/src/test/java/greencity/service/ubs/UBSManagementServiceImplTest.java index 8ff1bd1db..cdfa9b4ad 100644 --- a/service/src/test/java/greencity/service/ubs/UBSManagementServiceImplTest.java +++ b/service/src/test/java/greencity/service/ubs/UBSManagementServiceImplTest.java @@ -39,6 +39,7 @@ import greencity.entity.order.OrderPaymentStatusTranslation; import greencity.entity.order.OrderStatusTranslation; import greencity.entity.order.Payment; +import greencity.entity.order.Refund; import greencity.entity.order.TariffsInfo; import greencity.entity.user.User; import greencity.entity.user.employee.Employee; @@ -63,6 +64,7 @@ import greencity.repository.PaymentRepository; import greencity.repository.PositionRepository; import greencity.repository.ReceivingStationRepository; +import greencity.repository.RefundRepository; import greencity.repository.ServiceRepository; import greencity.repository.TariffsInfoRepository; import greencity.repository.UserRepository; @@ -103,7 +105,66 @@ import java.util.Set; import java.util.stream.Stream; -import static greencity.ModelUtils.*; +import static greencity.ModelUtils.ORDER_DETAIL_STATUS_DTO; +import static greencity.ModelUtils.TEST_ADDITIONAL_BAG_INFO_DTO; +import static greencity.ModelUtils.TEST_ADDITIONAL_BAG_INFO_DTO_LIST; +import static greencity.ModelUtils.TEST_BAG; +import static greencity.ModelUtils.TEST_BAG_INFO_DTO; +import static greencity.ModelUtils.TEST_BAG_LIST; +import static greencity.ModelUtils.TEST_BAG_MAPPING_DTO_LIST; +import static greencity.ModelUtils.TEST_MAP_ADDITIONAL_BAG_LIST; +import static greencity.ModelUtils.TEST_ORDER; +import static greencity.ModelUtils.TEST_ORDER_ADDRESS_DTO_RESPONSE; +import static greencity.ModelUtils.TEST_ORDER_ADDRESS_DTO_UPDATE; +import static greencity.ModelUtils.TEST_ORDER_DETAILS_INFO_DTO_LIST; +import static greencity.ModelUtils.TEST_PAYMENT_LIST; +import static greencity.ModelUtils.TEST_USER; +import static greencity.ModelUtils.UPDATE_ORDER_PAGE_ADMIN_DTO; +import static greencity.ModelUtils.getAddBonusesToUserDto; +import static greencity.ModelUtils.getAdminCommentDto; +import static greencity.ModelUtils.getBag1list; +import static greencity.ModelUtils.getBag2list; +import static greencity.ModelUtils.getBag3list; +import static greencity.ModelUtils.getBagInfoDto; +import static greencity.ModelUtils.getBaglist; +import static greencity.ModelUtils.getCertificateList; +import static greencity.ModelUtils.getEcoNumberDto; +import static greencity.ModelUtils.getEmployee; +import static greencity.ModelUtils.getExportDetailsRequest; +import static greencity.ModelUtils.getExportDetailsRequestToday; +import static greencity.ModelUtils.getFormedOrder; +import static greencity.ModelUtils.getInfoPayment; +import static greencity.ModelUtils.getManualPayment; +import static greencity.ModelUtils.getManualPaymentRequestDto; +import static greencity.ModelUtils.getOrder; +import static greencity.ModelUtils.getOrderAddress; +import static greencity.ModelUtils.getOrderDoneByUser; +import static greencity.ModelUtils.getOrderExportDetails; +import static greencity.ModelUtils.getOrderExportDetailsWithDeliverFromTo; +import static greencity.ModelUtils.getOrderExportDetailsWithExportDate; +import static greencity.ModelUtils.getOrderExportDetailsWithExportDateDeliverFrom; +import static greencity.ModelUtils.getOrderExportDetailsWithExportDateDeliverFromTo; +import static greencity.ModelUtils.getOrderExportDetailsWithNullValues; +import static greencity.ModelUtils.getOrderForGetOrderStatusData2Test; +import static greencity.ModelUtils.getOrderForGetOrderStatusEmptyPriceDetails; +import static greencity.ModelUtils.getOrderStatusPaymentTranslations; +import static greencity.ModelUtils.getOrderStatusTranslation; +import static greencity.ModelUtils.getOrderStatusTranslations; +import static greencity.ModelUtils.getOrderUserFirst; +import static greencity.ModelUtils.getOrderWithoutPayment; +import static greencity.ModelUtils.getOrdersStatusFormedDto; +import static greencity.ModelUtils.getPayment; +import static greencity.ModelUtils.getReceivingList; +import static greencity.ModelUtils.getReceivingStation; +import static greencity.ModelUtils.getRefund; +import static greencity.ModelUtils.getService; +import static greencity.ModelUtils.getStatusTranslation; +import static greencity.ModelUtils.getTariffsInfo; +import static greencity.ModelUtils.getTestDetailsOrderInfoDto; +import static greencity.ModelUtils.getTestOrderDetailStatusRequestDto; +import static greencity.ModelUtils.getTestUser; +import static greencity.ModelUtils.updateAllOrderPageDto; +import static greencity.ModelUtils.updateOrderPageAdminDto; import static greencity.constant.ErrorMessage.EMPLOYEE_NOT_FOUND; import static greencity.constant.ErrorMessage.ORDER_WITH_CURRENT_ID_DOES_NOT_EXIST; import static greencity.constant.ErrorMessage.ORDER_CAN_NOT_BE_UPDATED; @@ -200,6 +261,9 @@ class UBSManagementServiceImplTest { @Mock TariffsInfoRepository tariffsInfoRepository; + @Mock + RefundRepository refundRepository; + @Test void getAllCertificates() { Pageable pageable = @@ -228,7 +292,7 @@ void checkOrderNotFound() { @Test void getAddressByOrderId() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); ReadAddressByOrderDto readAddressByOrderDto = ModelUtils.getReadAddressByOrderDto(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(ubsManagementService.getAddressByOrderId(1L)).thenReturn(readAddressByOrderDto); @@ -243,7 +307,7 @@ void checkPaymentNotFound() { @Test void returnExportDetailsByOrderId() { ExportDetailsDto expected = ModelUtils.getExportDetails(); - Order order = ModelUtils.getOrderExportDetails(); + Order order = getOrderExportDetails(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); List stations = @@ -255,10 +319,10 @@ void returnExportDetailsByOrderId() { @Test void updateExportDetailsByOrderId() { - ExportDetailsDtoUpdate dto = ModelUtils.getExportDetailsRequest(); - Order order = ModelUtils.getOrderExportDetails(); + ExportDetailsDtoUpdate dto = getExportDetailsRequest(); + Order order = getOrderExportDetails(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); - var receivingStation = ModelUtils.getReceivingStation(); + var receivingStation = getReceivingStation(); when(receivingStationRepository.findById(1L)).thenReturn(Optional.of(receivingStation)); List stations = List.of(new ReceivingStation()); @@ -271,10 +335,10 @@ void updateExportDetailsByOrderId() { @Test void updateExportDetailsNotSuccessfulByOrderId() { - ExportDetailsDtoUpdate dto = ModelUtils.getExportDetailsRequest(); - Order order = ModelUtils.getOrderExportDetailsWithNullValues(); + ExportDetailsDtoUpdate dto = getExportDetailsRequest(); + Order order = getOrderExportDetailsWithNullValues(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); - var receivingStation = ModelUtils.getReceivingStation(); + var receivingStation = getReceivingStation(); when(receivingStationRepository.findById(1L)).thenReturn(Optional.of(receivingStation)); List stations = List.of(new ReceivingStation()); when(receivingStationRepository.findAll()).thenReturn(stations); @@ -292,14 +356,14 @@ void checkStationNotFound() { @ParameterizedTest @MethodSource("provideManualPaymentRequestDto") void saveNewManualPayment(ManualPaymentRequestDto paymentDetails, MultipartFile image) { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setRecipientName("Петро"); user.setRecipientSurname("Петренко"); - Order order = ModelUtils.getFormedOrder(); + Order order = getFormedOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); - Payment payment = ModelUtils.getManualPayment(); - Employee employee = ModelUtils.getEmployee(); + Payment payment = getManualPayment(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -345,7 +409,7 @@ void checkDeleteManualPayment() { @Test void checkUpdateManualPayment() { Employee employee = getEmployee(); - Order order = ModelUtils.getFormedOrder(); + Order order = getFormedOrder(); when(employeeRepository.findByUuid("abc")).thenReturn(Optional.of(employee)); when(orderRepository.getOrderDetails(1L)).thenReturn(Optional.of(order)); when(paymentRepository.findById(1L)).thenReturn(Optional.of(getManualPayment())); @@ -364,20 +428,20 @@ void checkUpdateManualPayment() { @Test void saveNewManualPaymentWithZeroAmount() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setRecipientName("Петро"); user.setRecipientSurname("Петренко"); - Order order = ModelUtils.getFormedOrder(); + Order order = getFormedOrder(); order.setPointsToUse(0); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); order.setOrderPaymentStatus(OrderPaymentStatus.UNPAID); - Payment payment = ModelUtils.getManualPayment(); + Payment payment = getManualPayment(); payment.setAmount(0L); order.setPayment(singletonList(payment)); ManualPaymentRequestDto paymentDetails = ManualPaymentRequestDto.builder() .settlementdate("02-08-2021").amount(0L).receiptLink("link").paymentId("1").build(); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -397,20 +461,20 @@ void saveNewManualPaymentWithZeroAmount() { @Test void saveNewManualPaymentWithHalfPaidAmount() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setRecipientName("Петро"); user.setRecipientSurname("Петренко"); - Order order = ModelUtils.getFormedOrder(); + Order order = getFormedOrder(); order.setPointsToUse(0); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); order.setOrderPaymentStatus(OrderPaymentStatus.HALF_PAID); - Payment payment = ModelUtils.getManualPayment(); + Payment payment = getManualPayment(); payment.setAmount(50_00L); order.setPayment(singletonList(payment)); ManualPaymentRequestDto paymentDetails = ManualPaymentRequestDto.builder() .settlementdate("02-08-2021").amount(50_00L).receiptLink("link").paymentId("1").build(); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -433,19 +497,19 @@ void saveNewManualPaymentWithHalfPaidAmount() { @Test void saveNewManualPaymentWithPaidAmount() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setRecipientName("Петро"); user.setRecipientSurname("Петренко"); - Order order = ModelUtils.getFormedOrder(); + Order order = getFormedOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); order.setOrderPaymentStatus(OrderPaymentStatus.PAID); - Payment payment = ModelUtils.getManualPayment(); + Payment payment = getManualPayment(); payment.setAmount(500_00L); order.setPayment(singletonList(payment)); ManualPaymentRequestDto paymentDetails = ManualPaymentRequestDto.builder() .settlementdate("02-08-2021").amount(500_00L).receiptLink("link").paymentId("1").build(); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -468,17 +532,17 @@ void saveNewManualPaymentWithPaidAmount() { @Test void saveNewManualPaymentWithPaidOrder() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setRecipientName("Петро"); user.setRecipientSurname("Петренко"); - Order order = ModelUtils.getFormedOrder(); + Order order = getFormedOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); order.setOrderPaymentStatus(OrderPaymentStatus.PAID); - Payment payment = ModelUtils.getManualPayment(); + Payment payment = getManualPayment(); ManualPaymentRequestDto paymentDetails = ManualPaymentRequestDto.builder() .settlementdate("02-08-2021").amount(500L).receiptLink("link").paymentId("1").build(); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -497,17 +561,17 @@ void saveNewManualPaymentWithPaidOrder() { @Test void saveNewManualPaymentWithPartiallyPaidOrder() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setRecipientName("Петро"); user.setRecipientSurname("Петренко"); - Order order = ModelUtils.getFormedOrder(); + Order order = getFormedOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); order.setOrderPaymentStatus(OrderPaymentStatus.HALF_PAID); - Payment payment = ModelUtils.getManualPayment(); + Payment payment = getManualPayment(); ManualPaymentRequestDto paymentDetails = ManualPaymentRequestDto.builder() .settlementdate("02-08-2021").amount(200L).receiptLink("link").paymentId("1").build(); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -526,17 +590,17 @@ void saveNewManualPaymentWithPartiallyPaidOrder() { @Test void saveNewManualPaymentWithUnpaidOrder() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setRecipientName("Петро"); user.setRecipientSurname("Петренко"); - Order order = ModelUtils.getFormedOrder(); + Order order = getFormedOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); order.setOrderPaymentStatus(OrderPaymentStatus.UNPAID); - Payment payment = ModelUtils.getManualPayment(); + Payment payment = getManualPayment(); ManualPaymentRequestDto paymentDetails = ManualPaymentRequestDto.builder() .settlementdate("02-08-2021").amount(500L).receiptLink("link").paymentId("1").build(); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -555,17 +619,17 @@ void saveNewManualPaymentWithUnpaidOrder() { @Test void saveNewManualPaymentWithPaymentRefundedOrder() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setRecipientName("Петро"); user.setRecipientSurname("Петренко"); - Order order = ModelUtils.getFormedOrder(); + Order order = getFormedOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); order.setOrderPaymentStatus(OrderPaymentStatus.PAYMENT_REFUNDED); - Payment payment = ModelUtils.getManualPayment(); + Payment payment = getManualPayment(); ManualPaymentRequestDto paymentDetails = ManualPaymentRequestDto.builder() .settlementdate("02-08-2021").amount(500L).receiptLink("link").paymentId("1").build(); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -616,7 +680,7 @@ void checkManualPaymentNotFound() { @Test void checkReturnOverpaymentInfo() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); when(orderRepository.findUserById(1L)).thenReturn(Optional.of(order)); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); @@ -642,7 +706,7 @@ void checkReturnOverpaymentThroweException() { @Test void checkReturnOverpaymentThroweExceptioninGetPaymentInfo() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); when(orderRepository.findUserById(1L)).thenReturn(Optional.of(order)); Assertions.assertThrows(NotFoundException.class, () -> ubsManagementService.returnOverpaymentInfo(1L, 1., 1L)); @@ -650,7 +714,7 @@ void checkReturnOverpaymentThroweExceptioninGetPaymentInfo() { @Test void checkGetPaymentInfo() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); order.setOrderStatus(OrderStatus.DONE); when(orderRepository.findById(order.getId())).thenReturn(Optional.of(order)); assertEquals(100L, ubsManagementService.getPaymentInfo(order.getId(), 800.).getOverpayment()); @@ -661,7 +725,7 @@ void checkGetPaymentInfo() { @Test void checkGetPaymentInfoIfOrderStatusIsCanceled() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); order.setOrderStatus(OrderStatus.CANCELED); when(orderRepository.findById(order.getId())).thenReturn(Optional.of(order)); assertEquals(200L, ubsManagementService.getPaymentInfo(order.getId(), 800.).getOverpayment()); @@ -672,7 +736,7 @@ void checkGetPaymentInfoIfOrderStatusIsCanceled() { @Test void checkGetPaymentInfoIfSumToPayIsNull() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); order.setOrderStatus(OrderStatus.DONE); when(orderRepository.findById(order.getId())).thenReturn(Optional.of(order)); assertEquals(900L, ubsManagementService.getPaymentInfo(order.getId(), null).getOverpayment()); @@ -689,7 +753,7 @@ void updateOrderDetailStatusThrowException() { @Test void updateOrderDetailStatusFirst() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setRecipientName("Петро"); user.setRecipientSurname("Петренко"); Order order = user.getOrders().get(0); @@ -705,7 +769,7 @@ void updateOrderDetailStatusFirst() { when(paymentRepository.saveAll(any())).thenReturn(payment); when(orderRepository.save(any())).thenReturn(order); - OrderDetailStatusRequestDto testOrderDetail = ModelUtils.getTestOrderDetailStatusRequestDto(); + OrderDetailStatusRequestDto testOrderDetail = getTestOrderDetailStatusRequestDto(); OrderDetailStatusDto expectedObject = ModelUtils.getTestOrderDetailStatusDto(); OrderDetailStatusDto producedObject = ubsManagementService .updateOrderDetailStatus(order.getId(), testOrderDetail, "test@gmail.com"); @@ -809,7 +873,7 @@ void updateOrderDetailStatusFirst() { @Test void updateOrderDetailStatusSecond() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setRecipientName("Петро"); user.setRecipientSurname("Петренко"); Order order = user.getOrders().get(0); @@ -823,7 +887,7 @@ void updateOrderDetailStatusSecond() { when(paymentRepository.saveAll(any())).thenReturn(payment); when(orderRepository.save(any())).thenReturn(order); - OrderDetailStatusRequestDto testOrderDetail = ModelUtils.getTestOrderDetailStatusRequestDto(); + OrderDetailStatusRequestDto testOrderDetail = getTestOrderDetailStatusRequestDto(); OrderDetailStatusDto expectedObject = ModelUtils.getTestOrderDetailStatusDto(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy"); expectedObject.setDate(LocalDateTime.now().format(formatter)); @@ -839,17 +903,17 @@ void updateOrderDetailStatusSecond() { @Test void getAllEmployeesByPosition() { - Order order = ModelUtils.getOrder(); - TariffsInfo tariffsInfo = ModelUtils.getTariffsInfo(); + Order order = getOrder(); + TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); EmployeePositionDtoRequest dto = ModelUtils.getEmployeePositionDtoRequest(); List newList = new ArrayList<>(); newList.add(ModelUtils.getEmployeeOrderPosition()); List positionList = new ArrayList<>(); positionList.add(ModelUtils.getPosition()); List employeeList = new ArrayList<>(); - employeeList.add(ModelUtils.getEmployee()); + employeeList.add(getEmployee()); when(orderRepository.findById(anyLong())).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -868,10 +932,10 @@ void getAllEmployeesByPosition() { @Test void getAllEmployeesByPositionThrowBadRequestException() { - Order order = ModelUtils.getOrder(); - TariffsInfo tariffsInfo = ModelUtils.getTariffsInfo(); + Order order = getOrder(); + TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(anyLong())).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -993,7 +1057,7 @@ void testGetOrdersBagsDetails() { @Test void testGetOrderExportDetailsReceivingStationNotFoundExceptionThrown() { when(orderRepository.findById(1L)) - .thenReturn(Optional.of(ModelUtils.getOrder())); + .thenReturn(Optional.of(getOrder())); List receivingStations = new ArrayList<>(); when(receivingStationRepository.findAll()) .thenReturn(receivingStations); @@ -1026,7 +1090,7 @@ void checkGetAllUserViolations() { @Test void testAddPointToUserThrowsException() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setUuid(null); AddingPointsToUserDto addingPointsToUserDto = @@ -1036,7 +1100,7 @@ void testAddPointToUserThrowsException() { @Test void testAddPointsToUser() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setUuid(userRemoteClient.findUuidByEmail(user.getRecipientEmail())); user.setCurrentPoints(1); @@ -1080,9 +1144,9 @@ void testSetOrderDetail() { doNothing().when(orderDetailRepository).updateExporter(anyInt(), anyLong(), anyLong()); doNothing().when(orderDetailRepository).updateConfirm(anyInt(), anyLong(), anyLong()); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); - when(bagRepository.findBagsByOrderId(1L)).thenReturn(ModelUtils.getBag1list()); + when(bagRepository.findBagsByOrderId(1L)).thenReturn(getBag1list()); when(paymentRepository.selectSumPaid(1L)).thenReturn(5000L); ubsManagementService.setOrderDetail(1L, @@ -1100,9 +1164,9 @@ void testSetOrderDetailNeedToChangeStatusToHALF_PAID() { doNothing().when(orderDetailRepository).updateExporter(anyInt(), anyLong(), anyLong()); doNothing().when(orderDetailRepository).updateConfirm(anyInt(), anyLong(), anyLong()); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); - when(bagRepository.findBagsByOrderId(1L)).thenReturn(ModelUtils.getBag1list()); + when(bagRepository.findBagsByOrderId(1L)).thenReturn(getBag1list()); when(paymentRepository.selectSumPaid(1L)).thenReturn(5000L); doNothing().when(orderRepository).updateOrderPaymentStatus(1L, OrderPaymentStatus.HALF_PAID.name()); @@ -1123,9 +1187,9 @@ void testSetOrderDetailNeedToChangeStatusToUNPAID() { doNothing().when(orderDetailRepository).updateExporter(anyInt(), anyLong(), anyLong()); doNothing().when(orderDetailRepository).updateConfirm(anyInt(), anyLong(), anyLong()); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); - when(bagRepository.findBagsByOrderId(1L)).thenReturn(ModelUtils.getBag1list()); + when(bagRepository.findBagsByOrderId(1L)).thenReturn(getBag1list()); when(paymentRepository.selectSumPaid(1L)).thenReturn(null); doNothing().when(orderRepository).updateOrderPaymentStatus(1L, OrderPaymentStatus.UNPAID.name()); @@ -1145,7 +1209,7 @@ void testSetOrderDetailWhenSumPaidIsNull() { doNothing().when(orderDetailRepository).updateExporter(anyInt(), anyLong(), anyLong()); doNothing().when(orderDetailRepository).updateConfirm(anyInt(), anyLong(), anyLong()); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); when(paymentRepository.selectSumPaid(1L)).thenReturn(null); @@ -1181,7 +1245,7 @@ void testSetOrderDetailWhenOrderNotFound() { @Test void testSetOrderDetailIfHalfPaid() { Order orderDto = ModelUtils.getOrdersStatusDoneDto(); - Order orderDetailDto = ModelUtils.getOrdersStatusFormedDto(); + Order orderDetailDto = getOrdersStatusFormedDto(); Bag tariffBagDto = ModelUtils.getTariffBag(); List bagList = getBaglist(); when(orderRepository.findById(1L)).thenReturn(Optional.ofNullable(orderDto)); @@ -1247,7 +1311,7 @@ void testSetOrderDetailConfirmed() { when(bagRepository.findCapacityById(1)).thenReturn(1); doNothing().when(orderDetailRepository).updateConfirm(anyInt(), anyLong(), anyLong()); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); ubsManagementService.setOrderDetail(1L, @@ -1264,7 +1328,7 @@ void testSetOrderDetailConfirmed2() { when(orderRepository.findById(1L)).thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusConfirmedDto())); when(bagRepository.findCapacityById(1)).thenReturn(1); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); when(orderDetailRepository.ifRecordExist(any(), any())).thenReturn(1L); when(orderDetailRepository.getAmount(any(), any())).thenReturn(1L); @@ -1288,7 +1352,7 @@ void testSetOrderDetailWithExportedWaste() { doNothing().when(orderDetailRepository).updateExporter(anyInt(), anyLong(), anyLong()); doNothing().when(orderDetailRepository).updateConfirm(anyInt(), anyLong(), anyLong()); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); when(orderDetailRepository.ifRecordExist(any(), any())).thenReturn(1L); ubsManagementService.setOrderDetail(1L, @@ -1305,11 +1369,11 @@ void testSetOrderDetailWithExportedWaste() { @Test void testSetOrderDetailFormed() { - when(orderRepository.findById(1L)).thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + when(orderRepository.findById(1L)).thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findCapacityById(1)).thenReturn(1); doNothing().when(orderDetailRepository).updateConfirm(anyInt(), anyLong(), anyLong()); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); ubsManagementService.setOrderDetail(1L, @@ -1321,7 +1385,7 @@ void testSetOrderDetailFormed() { @Test void testSetOrderDetailFormedWithBagNoPresent() { - when(orderRepository.findById(1L)).thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + when(orderRepository.findById(1L)).thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findCapacityById(1)).thenReturn(1); when(orderRepository.getOrderDetails(1L)).thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.empty()); @@ -1342,7 +1406,7 @@ void testSetOrderDetailNotTakenOut() { doNothing().when(orderDetailRepository).updateExporter(anyInt(), anyLong(), anyLong()); doNothing().when(orderDetailRepository).updateConfirm(anyInt(), anyLong(), anyLong()); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); @@ -1361,7 +1425,7 @@ void testSetOrderDetailOnTheRoute() { when(bagRepository.findCapacityById(1)).thenReturn(1); doNothing().when(orderDetailRepository).updateConfirm(anyInt(), anyLong(), anyLong()); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); ubsManagementService.setOrderDetail(1L, @@ -1380,7 +1444,7 @@ void testSetOrderDetailsDone() { doNothing().when(orderDetailRepository).updateExporter(anyInt(), anyLong(), anyLong()); doNothing().when(orderDetailRepository).updateConfirm(anyInt(), anyLong(), anyLong()); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); ubsManagementService.setOrderDetail(1L, UPDATE_ORDER_PAGE_ADMIN_DTO.getOrderDetailDto().getAmountOfBagsConfirmed(), @@ -1398,7 +1462,7 @@ void testSetOrderBroughtItHimself() { when(bagRepository.findCapacityById(1)).thenReturn(1); doNothing().when(orderDetailRepository).updateConfirm(anyInt(), anyLong(), anyLong()); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); ubsManagementService.setOrderDetail(1L, UPDATE_ORDER_PAGE_ADMIN_DTO.getOrderDetailDto().getAmountOfBagsConfirmed(), @@ -1416,7 +1480,7 @@ void testSetOrderDetailsCanseled() { doNothing().when(orderDetailRepository).updateExporter(anyInt(), anyLong(), anyLong()); doNothing().when(orderDetailRepository).updateConfirm(anyInt(), anyLong(), anyLong()); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); ubsManagementService.setOrderDetail(1L, @@ -1447,15 +1511,15 @@ void testSetOrderDetailThrowsUserNotFoundException() { @Test void testSaveAdminToOrder() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) .thenReturn(Optional.of(tariffsInfo)); - ubsManagementService.saveAdminCommentToOrder(ModelUtils.getAdminCommentDto(), "test@gmail.com"); + ubsManagementService.saveAdminCommentToOrder(getAdminCommentDto(), "test@gmail.com"); verify(orderRepository, times(1)).save(order); verify(eventService, times(1)).save(any(), any(), any()); verify(tariffsInfoRepository, atLeastOnce()).findTariffsInfoByIdForEmployee(anyLong(), anyLong()); @@ -1463,14 +1527,14 @@ void testSaveAdminToOrder() { @Test void testUpdateEcoNumberForOrder() { - when(orderRepository.findById(1L)).thenReturn(Optional.of(ModelUtils.getOrder())); - ubsManagementService.updateEcoNumberForOrder(ModelUtils.getEcoNumberDto(), 1L, "abc"); + when(orderRepository.findById(1L)).thenReturn(Optional.of(getOrder())); + ubsManagementService.updateEcoNumberForOrder(getEcoNumberDto(), 1L, "abc"); verify(eventService, times(1)).saveEvent(any(), any(), any()); } @Test void testUpdateEcoNumberThrowOrderNotFoundException() { - EcoNumberDto dto = ModelUtils.getEcoNumberDto(); + EcoNumberDto dto = getEcoNumberDto(); when(orderRepository.findById(1L)).thenReturn(Optional.empty()); assertThrows(NotFoundException.class, () -> ubsManagementService.updateEcoNumberForOrder(dto, 1L, "test@gmail.com")); @@ -1487,9 +1551,9 @@ void updateEcoNumberTrowsException() { @Test void updateEcoNumberTrowsIncorrectEcoNumberFormatException() { - when(orderRepository.findById(1L)).thenReturn(Optional.of(ModelUtils.getOrder())); + when(orderRepository.findById(1L)).thenReturn(Optional.of(getOrder())); - EcoNumberDto ecoNumberDto = ModelUtils.getEcoNumberDto(); + EcoNumberDto ecoNumberDto = getEcoNumberDto(); ecoNumberDto.setEcoNumber(new HashSet<>(List.of("1234a"))); assertThrows(BadRequestException.class, () -> ubsManagementService.updateEcoNumberForOrder(ecoNumberDto, 1L, "abc")); @@ -1505,7 +1569,7 @@ void saveAdminCommentThrowsException() { @Test void getOrdersForUserTest() { - Order order1 = ModelUtils.getOrderUserFirst(); + Order order1 = getOrderUserFirst(); Order order2 = ModelUtils.getOrderUserSecond(); List orders = List.of(order1, order2); OrderInfoDto info1 = OrderInfoDto.builder().id(1L).orderPrice(10).build(); @@ -1532,17 +1596,17 @@ void getOrderStatusDataThrowsUnexistingOrderExceptionTest() { @Test void updateOrderAdminPageInfoTest() { - OrderDetailStatusRequestDto orderDetailStatusRequestDto = ModelUtils.getTestOrderDetailStatusRequestDto(); - Order order = ModelUtils.getOrder(); + OrderDetailStatusRequestDto orderDetailStatusRequestDto = getTestOrderDetailStatusRequestDto(); + Order order = getOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setOrderDate(LocalDateTime.now()).setTariffsInfo(tariffsInfo); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) .thenReturn(Optional.of(tariffsInfo)); when(paymentRepository.findAllByOrderId(1L)) - .thenReturn(List.of(ModelUtils.getPayment())); + .thenReturn(List.of(getPayment())); lenient().when(ubsManagementServiceMock.updateOrderDetailStatus(1L, orderDetailStatusRequestDto, "abc")) .thenReturn(ModelUtils.getTestOrderDetailStatusDto()); when(ubsClientService.updateUbsUserInfoInOrder(ModelUtils.getUbsCustomersDtoUpdate(), @@ -1550,13 +1614,13 @@ void updateOrderAdminPageInfoTest() { UpdateOrderPageAdminDto updateOrderPageAdminDto = updateOrderPageAdminDto(); updateOrderPageAdminDto.setUserInfoDto(ModelUtils.getUbsCustomersDtoUpdate()); when(orderAddressRepository.findById(1L)) - .thenReturn(Optional.of(ModelUtils.getOrderAddress())); + .thenReturn(Optional.of(getOrderAddress())); when(receivingStationRepository.findAll()) - .thenReturn(List.of(ModelUtils.getReceivingStation())); - var receivingStation = ModelUtils.getReceivingStation(); + .thenReturn(List.of(getReceivingStation())); + var receivingStation = getReceivingStation(); when(receivingStationRepository.findById(1L)).thenReturn(Optional.of(receivingStation)); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); ubsManagementService.updateOrderAdminPageInfo(updateOrderPageAdminDto, 1L, "en", "test@gmail.com"); @@ -1570,17 +1634,17 @@ void updateOrderAdminPageInfoTest() { @Test void updateOrderAdminPageInfoWithUbsCourierSumAndWriteOffStationSum() { - OrderDetailStatusRequestDto orderDetailStatusRequestDto = ModelUtils.getTestOrderDetailStatusRequestDto(); - Order order = ModelUtils.getOrder(); + OrderDetailStatusRequestDto orderDetailStatusRequestDto = getTestOrderDetailStatusRequestDto(); + Order order = getOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setOrderDate(LocalDateTime.now()).setTariffsInfo(tariffsInfo); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) .thenReturn(Optional.of(tariffsInfo)); when(paymentRepository.findAllByOrderId(1L)) - .thenReturn(List.of(ModelUtils.getPayment())); + .thenReturn(List.of(getPayment())); lenient().when(ubsManagementServiceMock.updateOrderDetailStatus(1L, orderDetailStatusRequestDto, "abc")) .thenReturn(ModelUtils.getTestOrderDetailStatusDto()); when(ubsClientService.updateUbsUserInfoInOrder(ModelUtils.getUbsCustomersDtoUpdate(), @@ -1590,13 +1654,13 @@ void updateOrderAdminPageInfoWithUbsCourierSumAndWriteOffStationSum() { updateOrderPageAdminDto.setUbsCourierSum(50.); updateOrderPageAdminDto.setWriteOffStationSum(100.); when(orderAddressRepository.findById(1L)) - .thenReturn(Optional.of(ModelUtils.getOrderAddress())); + .thenReturn(Optional.of(getOrderAddress())); when(receivingStationRepository.findAll()) - .thenReturn(List.of(ModelUtils.getReceivingStation())); - var receivingStation = ModelUtils.getReceivingStation(); + .thenReturn(List.of(getReceivingStation())); + var receivingStation = getReceivingStation(); when(receivingStationRepository.findById(1L)).thenReturn(Optional.of(receivingStation)); when(orderRepository.getOrderDetails(anyLong())) - .thenReturn(Optional.ofNullable(ModelUtils.getOrdersStatusFormedDto())); + .thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); when(bagRepository.findById(1)).thenReturn(Optional.of(ModelUtils.getTariffBag())); ubsManagementService.updateOrderAdminPageInfo(updateOrderPageAdminDto, 1L, "en", "test@gmail.com"); @@ -1610,12 +1674,12 @@ void updateOrderAdminPageInfoWithUbsCourierSumAndWriteOffStationSum() { @Test void updateOrderAdminPageInfoWithStatusFormedTest() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setOrderDate(LocalDateTime.now()).setTariffsInfo(tariffsInfo); order.setOrderStatus(OrderStatus.FORMED); EmployeeOrderPosition employeeOrderPosition = ModelUtils.getEmployeeOrderPosition(); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); UpdateOrderPageAdminDto updateOrderPageAdminDto = ModelUtils.updateOrderPageAdminDtoWithStatusFormed(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); @@ -1623,8 +1687,8 @@ void updateOrderAdminPageInfoWithStatusFormedTest() { when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) .thenReturn(Optional.of(tariffsInfo)); - when(paymentRepository.findAllByOrderId(1L)).thenReturn(List.of(ModelUtils.getPayment())); - when(receivingStationRepository.findAll()).thenReturn(List.of(ModelUtils.getReceivingStation())); + when(paymentRepository.findAllByOrderId(1L)).thenReturn(List.of(getPayment())); + when(receivingStationRepository.findAll()).thenReturn(List.of(getReceivingStation())); when(employeeOrderPositionRepository.findAllByOrderId(1L)).thenReturn(List.of(employeeOrderPosition)); ubsManagementService.updateOrderAdminPageInfo(updateOrderPageAdminDto, 1L, "en", "test@gmail.com"); @@ -1644,7 +1708,7 @@ void updateOrderAdminPageInfoWithStatusFormedTest() { @Test void updateOrderAdminPageInfoWithStatusCanceledTest() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setOrderDate(LocalDateTime.now()).setTariffsInfo(tariffsInfo); order.setOrderStatus(OrderStatus.CANCELED); @@ -1663,7 +1727,7 @@ void updateOrderAdminPageInfoWithStatusCanceledTest() { @Test void updateOrderAdminPageInfoWithStatusDoneTest() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setOrderDate(LocalDateTime.now()).setTariffsInfo(tariffsInfo); order.setOrderStatus(OrderStatus.DONE); @@ -1682,7 +1746,7 @@ void updateOrderAdminPageInfoWithStatusDoneTest() { @Test void updateOrderAdminPageInfoWithStatusBroughtItHimselfTest() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); LocalDateTime orderDate = LocalDateTime.of(2023, 6, 10, 12, 10); LocalDateTime deliverFrom = LocalDateTime.of(2023, 6, 16, 15, 30); LocalDateTime deliverTo = LocalDateTime.of(2023, 6, 16, 19, 30); @@ -1693,7 +1757,7 @@ void updateOrderAdminPageInfoWithStatusBroughtItHimselfTest() { order.setDeliverTo(deliverTo); order.setTariffsInfo(tariffsInfo); order.setOrderStatus(OrderStatus.BROUGHT_IT_HIMSELF); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); UpdateOrderPageAdminDto updateOrderPageAdminDto = ModelUtils.updateOrderPageAdminDtoWithStatusBroughtItHimself(); @@ -1702,7 +1766,7 @@ void updateOrderAdminPageInfoWithStatusBroughtItHimselfTest() { when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) .thenReturn(Optional.of(tariffsInfo)); - when(paymentRepository.findAllByOrderId(1L)).thenReturn(List.of(ModelUtils.getPayment())); + when(paymentRepository.findAllByOrderId(1L)).thenReturn(List.of(getPayment())); ubsManagementService.updateOrderAdminPageInfo(updateOrderPageAdminDto, 1L, "en", "test@gmail.com"); @@ -1720,11 +1784,11 @@ void updateOrderAdminPageInfoWithStatusBroughtItHimselfTest() { @Test void updateOrderAdminPageInfoWithNullFieldsTest() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setOrderDate(LocalDateTime.now()).setTariffsInfo(tariffsInfo); order.setOrderStatus(OrderStatus.ON_THE_ROUTE); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); UpdateOrderPageAdminDto updateOrderPageAdminDto = ModelUtils.updateOrderPageAdminDtoWithNullFields(); @@ -1733,8 +1797,8 @@ void updateOrderAdminPageInfoWithNullFieldsTest() { when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) .thenReturn(Optional.of(tariffsInfo)); - when(paymentRepository.findAllByOrderId(1L)).thenReturn(List.of(ModelUtils.getPayment())); - when(receivingStationRepository.findAll()).thenReturn(List.of(ModelUtils.getReceivingStation())); + when(paymentRepository.findAllByOrderId(1L)).thenReturn(List.of(getPayment())); + when(receivingStationRepository.findAll()).thenReturn(List.of(getReceivingStation())); ubsManagementService.updateOrderAdminPageInfo(updateOrderPageAdminDto, 1L, "en", "test@gmail.com"); @@ -1753,9 +1817,9 @@ void updateOrderAdminPageInfoWithNullFieldsTest() { void updateOrderAdminPageInfoTestThrowsException() { UpdateOrderPageAdminDto updateOrderPageAdminDto = updateOrderPageAdminDto(); TariffsInfo tariffsInfo = getTariffsInfo(); - Order order = ModelUtils.getOrder(); + Order order = getOrder(); order.setOrderDate(LocalDateTime.now()).setTariffsInfo(tariffsInfo); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -1778,21 +1842,21 @@ void updateOrderAdminPageInfoForOrderWithStatusBroughtItHimselfTest() { LocalDateTime orderDate = LocalDateTime.now(); TariffsInfo tariffsInfo = getTariffsInfo(); - Order expected = ModelUtils.getOrder(); + Order expected = getOrder(); expected.setOrderDate(orderDate).setTariffsInfo(tariffsInfo); expected.setOrderStatus(OrderStatus.DONE); - Order order = ModelUtils.getOrder(); + Order order = getOrder(); order.setOrderDate(orderDate).setTariffsInfo(tariffsInfo); order.setOrderStatus(OrderStatus.BROUGHT_IT_HIMSELF); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) .thenReturn(Optional.of(tariffsInfo)); - when(paymentRepository.findAllByOrderId(1L)).thenReturn(List.of(ModelUtils.getPayment())); + when(paymentRepository.findAllByOrderId(1L)).thenReturn(List.of(getPayment())); ubsManagementService.updateOrderAdminPageInfo(updateOrderPageAdminDto, 1L, "en", "test@gmail.com"); @@ -1815,7 +1879,7 @@ void saveReason() { @Test void getOrderSumDetailsForFormedOrder() { CounterOrderDetailsDto dto = ModelUtils.getcounterOrderDetailsDto(); - Order order = ModelUtils.getFormedOrder(); + Order order = getFormedOrder(); order.setOrderDate(LocalDateTime.now()); when(orderRepository.getOrderDetails(1L)).thenReturn(Optional.of(order)); @@ -1829,7 +1893,7 @@ void getOrderSumDetailsForFormedOrder() { @Test void getOrderSumDetailsForFormedOrderWithUbsCourierSumAndWriteOffStationSum() { CounterOrderDetailsDto dto = ModelUtils.getcounterOrderDetailsDto(); - Order order = ModelUtils.getFormedOrder(); + Order order = getFormedOrder(); order.setOrderDate(LocalDateTime.now()); order.setUbsCourierSum(50_00L); order.setWriteOffStationSum(100_00L); @@ -1937,8 +2001,8 @@ void getOrderSumDetailsThrowsUnexcitingOrderExceptionTest() { @Test void getOrderStatusDataTest() { - Order order = ModelUtils.getOrderForGetOrderStatusData2Test(); - BagInfoDto bagInfoDto = ModelUtils.getBagInfoDto(); + Order order = getOrderForGetOrderStatusData2Test(); + BagInfoDto bagInfoDto = getBagInfoDto(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); Employee employee = getEmployee(); @@ -1949,7 +2013,7 @@ void getOrderStatusDataTest() { when(orderRepository.getOrderDetails(1L)).thenReturn(Optional.of(order)); when(bagRepository.findBagsByOrderId(1L)).thenReturn(getBaglist()); when(bagRepository.findBagsByTariffsInfoId(1L)).thenReturn(getBaglist()); - when(certificateRepository.findCertificate(1L)).thenReturn(ModelUtils.getCertificateList()); + when(certificateRepository.findCertificate(1L)).thenReturn(getCertificateList()); when(orderRepository.findById(1L)).thenReturn(Optional.ofNullable(getOrderForGetOrderStatusData2Test())); when(serviceRepository.findServiceByTariffsInfoId(1L)).thenReturn(Optional.of(getService())); when(modelMapper.map(getBaglist().get(0), BagInfoDto.class)).thenReturn(bagInfoDto); @@ -1961,7 +2025,7 @@ void getOrderStatusDataTest() { .thenReturn(OrderPaymentStatusTranslation.builder().translationValue("name").build()); when(orderPaymentStatusTranslationRepository.getAllBy()).thenReturn(getOrderStatusPaymentTranslations()); when(orderRepository.findById(6L)).thenReturn(Optional.of(order)); - when(receivingStationRepository.findAll()).thenReturn(ModelUtils.getReceivingList()); + when(receivingStationRepository.findAll()).thenReturn(getReceivingList()); ubsManagementService.getOrderStatusData(1L, "test@gmail.com"); @@ -1971,7 +2035,7 @@ void getOrderStatusDataTest() { verify(certificateRepository).findCertificate(1L); verify(orderRepository, times(5)).findById(1L); verify(serviceRepository).findServiceByTariffsInfoId(1L); - verify(modelMapper).map(ModelUtils.getBaglist().get(0), BagInfoDto.class); + verify(modelMapper).map(getBaglist().get(0), BagInfoDto.class); verify(orderStatusTranslationRepository).getOrderStatusTranslationById(6L); verify(orderPaymentStatusTranslationRepository).getById(1L); verify(receivingStationRepository).findAll(); @@ -1982,17 +2046,17 @@ void getOrderStatusDataTest() { @Test void saveNewManualPaymentWhenImageNotNull() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setRecipientName("Петро"); user.setRecipientSurname("Петренко"); - Order order = ModelUtils.getFormedOrder(); + Order order = getFormedOrder(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); order.setOrderPaymentStatus(OrderPaymentStatus.PAID); - Payment payment = ModelUtils.getManualPayment(); + Payment payment = getManualPayment(); ManualPaymentRequestDto paymentDetails = ManualPaymentRequestDto.builder() .settlementdate("02-08-2021").amount(500L).receiptLink("link").paymentId("1").build(); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -2046,7 +2110,7 @@ void getOrderStatusDataTestEmptyPriceDetails() { verify(certificateRepository).findCertificate(1L); verify(orderRepository, times(5)).findById(1L); verify(serviceRepository).findServiceByTariffsInfoId(1L); - verify(modelMapper).map(ModelUtils.getBaglist().get(0), BagInfoDto.class); + verify(modelMapper).map(getBaglist().get(0), BagInfoDto.class); verify(orderStatusTranslationRepository).getOrderStatusTranslationById(6L); verify(orderPaymentStatusTranslationRepository).getById(1L); verify(receivingStationRepository).findAll(); @@ -2056,11 +2120,11 @@ void getOrderStatusDataTestEmptyPriceDetails() { @Test void getOrderStatusDataWithEmptyCertificateTest() { - Order order = ModelUtils.getOrderForGetOrderStatusData2Test(); - BagInfoDto bagInfoDto = ModelUtils.getBagInfoDto(); + Order order = getOrderForGetOrderStatusData2Test(); + BagInfoDto bagInfoDto = getBagInfoDto(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(order.getId())).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -2077,7 +2141,7 @@ void getOrderStatusDataWithEmptyCertificateTest() { orderPaymentStatusTranslationRepository.getById(1L)) .thenReturn(OrderPaymentStatusTranslation.builder().translationValue("name").build()); when(orderRepository.findById(6L)).thenReturn(Optional.of(order)); - when(receivingStationRepository.findAll()).thenReturn(ModelUtils.getReceivingList()); + when(receivingStationRepository.findAll()).thenReturn(getReceivingList()); ubsManagementService.getOrderStatusData(1L, "test@gmail.com"); @@ -2086,7 +2150,7 @@ void getOrderStatusDataWithEmptyCertificateTest() { verify(bagRepository).findBagsByTariffsInfoId(1L); verify(orderRepository, times(5)).findById(1L); verify(serviceRepository).findServiceByTariffsInfoId(1L); - verify(modelMapper).map(ModelUtils.getBaglist().get(0), BagInfoDto.class); + verify(modelMapper).map(getBaglist().get(0), BagInfoDto.class); verify(orderStatusTranslationRepository).getOrderStatusTranslationById(6L); verify(orderPaymentStatusTranslationRepository).getById(1L); verify(receivingStationRepository).findAll(); @@ -2095,11 +2159,11 @@ void getOrderStatusDataWithEmptyCertificateTest() { @Test void getOrderStatusDataWhenOrderTranslationIsNull() { - Order order = ModelUtils.getOrderForGetOrderStatusData2Test(); - BagInfoDto bagInfoDto = ModelUtils.getBagInfoDto(); + Order order = getOrderForGetOrderStatusData2Test(); + BagInfoDto bagInfoDto = getBagInfoDto(); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(order.getId())).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -2114,7 +2178,7 @@ void getOrderStatusDataWhenOrderTranslationIsNull() { orderPaymentStatusTranslationRepository.getById(1L)) .thenReturn(OrderPaymentStatusTranslation.builder().translationValue("name").build()); when(orderRepository.findById(6L)).thenReturn(Optional.of(order)); - when(receivingStationRepository.findAll()).thenReturn(ModelUtils.getReceivingList()); + when(receivingStationRepository.findAll()).thenReturn(getReceivingList()); ubsManagementService.getOrderStatusData(1L, "test@gmail.com"); @@ -2123,7 +2187,7 @@ void getOrderStatusDataWhenOrderTranslationIsNull() { verify(bagRepository).findBagsByTariffsInfoId(1L); verify(orderRepository, times(5)).findById(1L); verify(serviceRepository).findServiceByTariffsInfoId(1L); - verify(modelMapper).map(ModelUtils.getBaglist().get(0), BagInfoDto.class); + verify(modelMapper).map(getBaglist().get(0), BagInfoDto.class); verify(orderStatusTranslationRepository).getOrderStatusTranslationById(6L); verify(orderPaymentStatusTranslationRepository).getById(1L); verify(receivingStationRepository).findAll(); @@ -2132,21 +2196,21 @@ void getOrderStatusDataWhenOrderTranslationIsNull() { @Test void getOrderStatusDataExceptionTest() { - Order order = ModelUtils.getOrderForGetOrderStatusData2Test(); + Order order = getOrderForGetOrderStatusData2Test(); TariffsInfo tariffsInfo = getTariffsInfo(); - BagInfoDto bagInfoDto = ModelUtils.getBagInfoDto(); + BagInfoDto bagInfoDto = getBagInfoDto(); order.setTariffsInfo(tariffsInfo); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(order.getId())).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) .thenReturn(Optional.of(tariffsInfo)); when(orderRepository.getOrderDetails(1L)).thenReturn(Optional.of(order)); - when(bagRepository.findBagsByOrderId(1L)).thenReturn(ModelUtils.getBaglist()); - when(certificateRepository.findCertificate(1L)).thenReturn(ModelUtils.getCertificateList()); + when(bagRepository.findBagsByOrderId(1L)).thenReturn(getBaglist()); + when(certificateRepository.findCertificate(1L)).thenReturn(getCertificateList()); when(serviceRepository.findServiceByTariffsInfoId(1L)).thenReturn(Optional.of(getService())); when(orderRepository.findById(1L)).thenReturn(Optional.ofNullable(getOrderForGetOrderStatusData2Test())); - when(modelMapper.map(ModelUtils.getBaglist().get(0), BagInfoDto.class)).thenReturn(bagInfoDto); + when(modelMapper.map(getBaglist().get(0), BagInfoDto.class)).thenReturn(bagInfoDto); when(orderStatusTranslationRepository.getOrderStatusTranslationById(6L)) .thenReturn(Optional.ofNullable(getStatusTranslation())); when( @@ -2162,7 +2226,7 @@ void updateOrderExportDetails() { List receivingStations = List.of(getReceivingStation()); ExportDetailsDtoUpdate testDetails = getExportDetailsRequestToday(); - var receivingStation = ModelUtils.getReceivingStation(); + var receivingStation = getReceivingStation(); when(receivingStationRepository.findById(1L)).thenReturn(Optional.of(receivingStation)); when(orderRepository.findById(anyLong())).thenReturn(Optional.of(order)); when(receivingStationRepository.findAll()).thenReturn(receivingStations); @@ -2181,7 +2245,7 @@ void updateOrderExportDetailsEmptyDetailsTest() { order.setDeliverFrom(null); List receivingStations = List.of(getReceivingStation()); ExportDetailsDtoUpdate emptyDetails = ExportDetailsDtoUpdate.builder().receivingStationId(1L).build(); - var receivingStation = ModelUtils.getReceivingStation(); + var receivingStation = getReceivingStation(); when(receivingStationRepository.findById(1L)).thenReturn(Optional.of(receivingStation)); when(orderRepository.findById(anyLong())).thenReturn(Optional.of(order)); when(receivingStationRepository.findAll()).thenReturn(receivingStations); @@ -2209,7 +2273,7 @@ void updateOrderExportDetailsUnexistingOrderExceptionTest() { void updateOrderExportDetailsReceivingStationNotFoundExceptionTest() { Order order = getOrder(); ExportDetailsDtoUpdate testDetails = getExportDetailsRequest(); - var receivingStation = ModelUtils.getReceivingStation(); + var receivingStation = getReceivingStation(); when(orderRepository.findById(anyLong())).thenReturn(Optional.of(order)); when(receivingStationRepository.findAll()).thenReturn(Collections.emptyList()); assertThrows(NotFoundException.class, @@ -2284,8 +2348,8 @@ void updateManualPaymentPaymentNotFoundExceptionTest() { @Test void updateAllOrderAdminPageInfoUnexistingOrderExceptionTest() { - Order order = ModelUtils.getOrder(); - UpdateAllOrderPageDto updateAllOrderPageDto = ModelUtils.updateAllOrderPageDto(); + Order order = getOrder(); + UpdateAllOrderPageDto updateAllOrderPageDto = updateAllOrderPageDto(); when(orderRepository.findById(4L)).thenReturn(Optional.ofNullable(order)); assertThrows(NotFoundException.class, () -> ubsManagementService.updateAllOrderAdminPageInfo(updateAllOrderPageDto, "uuid", "ua")); @@ -2301,57 +2365,57 @@ void updateAllOrderAdminPageInfoUpdateAdminPageInfoExceptionTest() { @Test void updateAllOrderAdminPageInfoStatusConfirmedTest() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); order.setOrderDate(LocalDateTime.now()); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(receivingStationRepository.findById(1L)).thenReturn(Optional.of(getReceivingStation())); when(receivingStationRepository.findAll()).thenReturn(List.of(getReceivingStation())); - UpdateAllOrderPageDto expectedObject = ModelUtils.updateAllOrderPageDto(); - UpdateAllOrderPageDto actual = ModelUtils.updateAllOrderPageDto(); + UpdateAllOrderPageDto expectedObject = updateAllOrderPageDto(); + UpdateAllOrderPageDto actual = updateAllOrderPageDto(); assertEquals(expectedObject.getExportDetailsDto().getDateExport(), actual.getExportDetailsDto().getDateExport()); ubsManagementService.updateAllOrderAdminPageInfo(expectedObject, "uuid", "ua"); - expectedObject = ModelUtils.updateAllOrderPageDto(); - actual = ModelUtils.updateAllOrderPageDto(); + expectedObject = updateAllOrderPageDto(); + actual = updateAllOrderPageDto(); assertEquals(expectedObject.getExportDetailsDto().getDateExport(), actual.getExportDetailsDto().getDateExport()); ubsManagementService.updateAllOrderAdminPageInfo(expectedObject, "uuid", "ua"); - expectedObject = ModelUtils.updateAllOrderPageDto(); - actual = ModelUtils.updateAllOrderPageDto(); + expectedObject = updateAllOrderPageDto(); + actual = updateAllOrderPageDto(); assertEquals(expectedObject.getExportDetailsDto().getDateExport(), actual.getExportDetailsDto().getDateExport()); ubsManagementService.updateAllOrderAdminPageInfo(expectedObject, "uuid", "ua"); - expectedObject = ModelUtils.updateAllOrderPageDto(); - actual = ModelUtils.updateAllOrderPageDto(); + expectedObject = updateAllOrderPageDto(); + actual = updateAllOrderPageDto(); assertEquals(expectedObject.getExportDetailsDto().getDateExport(), actual.getExportDetailsDto().getDateExport()); ubsManagementService.updateAllOrderAdminPageInfo(expectedObject, "uuid", "ua"); - expectedObject = ModelUtils.updateAllOrderPageDto(); - actual = ModelUtils.updateAllOrderPageDto(); + expectedObject = updateAllOrderPageDto(); + actual = updateAllOrderPageDto(); assertEquals(expectedObject.getExportDetailsDto().getDateExport(), actual.getExportDetailsDto().getDateExport()); ubsManagementService.updateAllOrderAdminPageInfo(expectedObject, "uuid", "ua"); - expectedObject = ModelUtils.updateAllOrderPageDto(); - actual = ModelUtils.updateAllOrderPageDto(); + expectedObject = updateAllOrderPageDto(); + actual = updateAllOrderPageDto(); assertEquals(expectedObject.getExportDetailsDto().getDateExport(), actual.getExportDetailsDto().getDateExport()); ubsManagementService.updateAllOrderAdminPageInfo(expectedObject, "uuid", "ua"); - expectedObject = ModelUtils.updateAllOrderPageDto(); - actual = ModelUtils.updateAllOrderPageDto(); + expectedObject = updateAllOrderPageDto(); + actual = updateAllOrderPageDto(); assertEquals(expectedObject.getExportDetailsDto().getDateExport(), actual.getExportDetailsDto().getDateExport()); @@ -2361,7 +2425,7 @@ void updateAllOrderAdminPageInfoStatusConfirmedTest() { @Test void updateAllOrderAdminPageInfoAdditionalOrdersEmptyTest() { Order order = ModelUtils.getOrder2(); - UpdateAllOrderPageDto updateAllOrderPageDto = ModelUtils.updateAllOrderPageDto(); + UpdateAllOrderPageDto updateAllOrderPageDto = updateAllOrderPageDto(); order.setOrderDate(LocalDateTime.now()); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(receivingStationRepository.findById(1L)).thenReturn(Optional.of(getReceivingStation())); @@ -2374,7 +2438,7 @@ void updateAllOrderAdminPageInfoAdditionalOrdersEmptyTest() { @Test void checkGetPaymentInfoWhenPaymentsWithCertificatesAndPointsSmallerThanSumToPay() { - Order order = ModelUtils.getOrder(); + Order order = getOrder(); order.setOrderStatus(OrderStatus.DONE); when(orderRepository.findById(order.getId())).thenReturn(Optional.of(order)); assertEquals(0L, ubsManagementService.getPaymentInfo(order.getId(), 1100.).getOverpayment()); @@ -2382,7 +2446,7 @@ void checkGetPaymentInfoWhenPaymentsWithCertificatesAndPointsSmallerThanSumToPay @Test void testAddPointsToUserWhenCurrentPointIsNull() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); user.setUuid(userRemoteClient.findUuidByEmail(user.getRecipientEmail())); user.setCurrentPoints(null); @@ -2412,7 +2476,7 @@ void getOrderStatusDataWithNotEmptyLists() { OrderPaymentStatusTranslation orderPaymentStatusTranslation = mock(OrderPaymentStatusTranslation.class); TariffsInfo tariffsInfo = getTariffsInfo(); order.setTariffsInfo(tariffsInfo); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(order.getId())).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -2458,7 +2522,7 @@ void getOrderStatusesTranslationTest() { TariffsInfo tariffsInfo = getTariffsInfo(); list.add(getOrderStatusTranslation()); order.setTariffsInfo(tariffsInfo); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); when(orderRepository.findById(order.getId())).thenReturn(Optional.of(order)); when(employeeRepository.findByEmail("test@gmail.com")).thenReturn(Optional.of(employee)); when(tariffsInfoRepository.findTariffsInfoByIdForEmployee(anyLong(), anyLong())) @@ -2561,15 +2625,15 @@ void deleteManualTestWithoutPayment() { @Test void addBonusesToUserTest() { - Order order = ModelUtils.getOrderForGetOrderStatusData2Test(); + Order order = getOrderForGetOrderStatusData2Test(); User user = order.getUser(); Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(orderRepository.getOrderDetails(1L)).thenReturn(Optional.of(order)); - when(bagRepository.findBagsByOrderId(1L)).thenReturn(ModelUtils.getBaglist()); + when(bagRepository.findBagsByOrderId(1L)).thenReturn(getBaglist()); when(certificateRepository.findCertificate(order.getId())).thenReturn(getCertificateList()); - ubsManagementService.addBonusesToUser(ModelUtils.getAddBonusesToUserDto(), 1L, employee.getEmail()); + ubsManagementService.addBonusesToUser(getAddBonusesToUserDto(), 1L, employee.getEmail()); verify(orderRepository).findById(1L); verify(orderRepository).save(order); @@ -2580,16 +2644,16 @@ void addBonusesToUserTest() { @Test void addBonusesToUserIfOrderStatusIsCanceled() { - Order order = ModelUtils.getOrderForGetOrderStatusData2Test(); + Order order = getOrderForGetOrderStatusData2Test(); order.setOrderStatus(OrderStatus.CANCELED); User user = order.getUser(); Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(orderRepository.getOrderDetails(1L)).thenReturn(Optional.of(order)); - when(bagRepository.findBagsByOrderId(1L)).thenReturn(ModelUtils.getBaglist()); + when(bagRepository.findBagsByOrderId(1L)).thenReturn(getBaglist()); when(certificateRepository.findCertificate(order.getId())).thenReturn(getCertificateList()); - ubsManagementService.addBonusesToUser(ModelUtils.getAddBonusesToUserDto(), 1L, employee.getEmail()); + ubsManagementService.addBonusesToUser(getAddBonusesToUserDto(), 1L, employee.getEmail()); verify(orderRepository).findById(1L); verify(orderRepository).save(order); @@ -2605,10 +2669,10 @@ void addBonusesToUserWithoutExportedBagsTest() { Employee employee = getEmployee(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(orderRepository.getOrderDetails(1L)).thenReturn(Optional.of(order)); - when(bagRepository.findBagsByOrderId(1L)).thenReturn(ModelUtils.getBaglist()); + when(bagRepository.findBagsByOrderId(1L)).thenReturn(getBaglist()); when(certificateRepository.findCertificate(order.getId())).thenReturn(getCertificateList()); - ubsManagementService.addBonusesToUser(ModelUtils.getAddBonusesToUserDto(), 1L, employee.getEmail()); + ubsManagementService.addBonusesToUser(getAddBonusesToUserDto(), 1L, employee.getEmail()); verify(orderRepository).findById(1L); verify(orderRepository).save(order); @@ -2631,20 +2695,20 @@ void addBonusesToUserWithNoOverpaymentTest() { String email = getEmployee().getEmail(); when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); when(orderRepository.getOrderDetails(1L)).thenReturn(Optional.of(order)); - when(bagRepository.findBagsByOrderId(1L)).thenReturn(ModelUtils.getBag3list()); + when(bagRepository.findBagsByOrderId(1L)).thenReturn(getBag3list()); when(certificateRepository.findCertificate(order.getId())).thenReturn(getCertificateList()); - AddBonusesToUserDto addBonusesToUserDto = ModelUtils.getAddBonusesToUserDto(); + AddBonusesToUserDto addBonusesToUserDto = getAddBonusesToUserDto(); assertThrows(BadRequestException.class, () -> ubsManagementService.addBonusesToUser(addBonusesToUserDto, 1L, email)); } @Test void checkEmployeeForOrderTest() { - User user = ModelUtils.getTestUser(); + User user = getTestUser(); Order order = user.getOrders().get(0); order.setOrderStatus(OrderStatus.CANCELED).setTariffsInfo(getTariffsInfo()); - Employee employee = ModelUtils.getEmployee(); + Employee employee = getEmployee(); List tariffsInfoIds = new ArrayList<>(); tariffsInfoIds.add(1L); when(orderRepository.findById(order.getId())).thenReturn(Optional.of(order)); @@ -2667,7 +2731,7 @@ void updateOrderExportDetailsSettingForDifferentInitialExportDetailsTest(Order o Employee employee = getEmployee(); List receivingStations = List.of(getReceivingStation()); ExportDetailsDtoUpdate testDetails = getExportDetailsRequest(); - var receivingStation = ModelUtils.getReceivingStation(); + var receivingStation = getReceivingStation(); when(receivingStationRepository.findById(1L)).thenReturn(Optional.of(receivingStation)); when(orderRepository.findById(anyLong())).thenReturn(Optional.of(order)); when(receivingStationRepository.findAll()).thenReturn(receivingStations); @@ -2714,7 +2778,7 @@ void updateOrderExportDetailsWhenDeliverFromIsNull() { List receivingStations = List.of(getReceivingStation()); ExportDetailsDtoUpdate testDetails = getExportDetailsRequest(); Order order = getOrderExportDetails(); - var receivingStation = ModelUtils.getReceivingStation(); + var receivingStation = getReceivingStation(); order.setDeliverFrom(null); testDetails.setTimeDeliveryFrom(null); String expectedHistoryEvent = OrderHistory.UPDATE_EXPORT_DETAILS @@ -2738,7 +2802,7 @@ void updateOrderExportDetailsWhenDeliverToIsNull() { List receivingStations = List.of(getReceivingStation()); ExportDetailsDtoUpdate testDetails = getExportDetailsRequest(); Order order = getOrderExportDetails(); - var receivingStation = ModelUtils.getReceivingStation(); + var receivingStation = getReceivingStation(); order.setDeliverTo(null); testDetails.setTimeDeliveryTo(null); String expectedHistoryEvent = OrderHistory.UPDATE_EXPORT_DETAILS @@ -2800,4 +2864,22 @@ void saveNewManualPaymentWithoutLinkAndImageTest() { assertThrows(BadRequestException.class, () -> ubsManagementService.saveNewManualPayment(1L, paymentDetails, null, "test@gmail.com")); } + + @Test + void saveOrderIdForRefundTest() { + Order order = getOrder(); + Refund refund = getRefund(order.getId()); + when(orderRepository.findById(1L)).thenReturn(Optional.of(order)); + when(refundRepository.save(refund)).thenReturn(refund); + ubsManagementService.saveOrderIdForRefund(1L); + verify(orderRepository).findById(1L); + verify(refundRepository).save(refund); + } + + @Test + void saveOrderIdForRefundThrowsNotFoundExceptionTest() { + when(orderRepository.findById(1L)).thenReturn(Optional.empty()); + assertThrows(NotFoundException.class, () -> ubsManagementService.getNotTakenOrderReason(1L)); + verify(orderRepository).findById(1L); + } } \ No newline at end of file From 5b286b1a0369712c04107b0694322da9fa6c6d6d Mon Sep 17 00:00:00 2001 From: Anton Bondar Date: Sun, 9 Jul 2023 23:20:55 +0300 Subject: [PATCH 2/2] fix bug --- .../greencity/service/ubs/UBSManagementServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java b/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java index bf0a85efb..2ac6fae8b 100644 --- a/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java +++ b/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java @@ -129,13 +129,13 @@ import static greencity.constant.ErrorMessage.EMPLOYEE_NOT_FOUND; import static greencity.constant.ErrorMessage.INCORRECT_ECO_NUMBER; import static greencity.constant.ErrorMessage.NOT_FOUND_ADDRESS_BY_ORDER_ID; +import static greencity.constant.ErrorMessage.ORDER_CAN_NOT_BE_UPDATED; import static greencity.constant.ErrorMessage.ORDER_WITH_CURRENT_ID_DOES_NOT_EXIST; import static greencity.constant.ErrorMessage.PAYMENT_NOT_FOUND; import static greencity.constant.ErrorMessage.RECEIVING_STATION_NOT_FOUND; import static greencity.constant.ErrorMessage.RECEIVING_STATION_NOT_FOUND_BY_ID; import static greencity.constant.ErrorMessage.USER_HAS_NO_OVERPAYMENT; import static greencity.constant.ErrorMessage.USER_WITH_CURRENT_UUID_DOES_NOT_EXIST; -import static greencity.constant.ErrorMessage.ORDER_CAN_NOT_BE_UPDATED; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; @@ -1837,8 +1837,8 @@ public NotTakenOrderReasonDto getNotTakenOrderReason(Long orderId) { @Override public void saveOrderIdForRefund(Long orderId) { - orderRepository.findById(orderId) + Order order = orderRepository.findById(orderId) .orElseThrow(() -> new NotFoundException(ORDER_WITH_CURRENT_ID_DOES_NOT_EXIST + orderId)); - refundRepository.save(Refund.builder().orderId(orderId).build()); + refundRepository.save(Refund.builder().orderId(order.getId()).build()); } }