From 6d1f8a608b2f26e20b389bc789c268413cb2f9ea Mon Sep 17 00:00:00 2001 From: Anton Bondar Date: Tue, 15 Aug 2023 10:58:46 +0300 Subject: [PATCH] update order params --- .../greencity/controller/ManagementOrderController.java | 5 ++--- core/src/test/java/greencity/ModelUtils.java | 1 + .../greencity/controller/ManagementOrderControllerTest.java | 1 - .../java/greencity/dto/order/UpdateOrderPageAdminDto.java | 1 + .../java/greencity/service/ubs/UBSManagementService.java | 4 +--- .../greencity/service/ubs/UBSManagementServiceImpl.java | 6 ++---- .../greencity/service/ubs/UBSManagementServiceImplTest.java | 3 +-- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/greencity/controller/ManagementOrderController.java b/core/src/main/java/greencity/controller/ManagementOrderController.java index 43656c871..e30347559 100644 --- a/core/src/main/java/greencity/controller/ManagementOrderController.java +++ b/core/src/main/java/greencity/controller/ManagementOrderController.java @@ -888,7 +888,6 @@ public ResponseEntity updateEcoStoreIdToOrder( * @param updateOrderPageAdminDto {@link UpdateOrderPageAdminDto}. * @param language {@link String}. * @param principal {@link Principal}. - * @param description {@link String}. * @param images {@link MultipartFile}. * * @author Bahlay Yuriy. @@ -910,10 +909,10 @@ public ResponseEntity updateEcoStoreIdToOrder( public ResponseEntity updatePageAdminInfo(@PathVariable(name = "id") Long orderId, @Valid @RequestPart UpdateOrderPageAdminDto updateOrderPageAdminDto, @RequestParam String language, - @ApiIgnore Principal principal, String description, + @ApiIgnore Principal principal, @RequestPart(required = false) @Nullable MultipartFile[] images) { ubsManagementService.updateOrderAdminPageInfoAndSaveReason(orderId, updateOrderPageAdminDto, language, - principal.getName(), description, images); + principal.getName(), images); return ResponseEntity.status(HttpStatus.CREATED).build(); } diff --git a/core/src/test/java/greencity/ModelUtils.java b/core/src/test/java/greencity/ModelUtils.java index 6637796c4..6e108bb3e 100644 --- a/core/src/test/java/greencity/ModelUtils.java +++ b/core/src/test/java/greencity/ModelUtils.java @@ -606,6 +606,7 @@ public static UpdateOrderPageAdminDto getUpdateOrderPageAdminDto() { .builder() .orderStatus("NOT_TAKEN_OUT") .build()) + .notTakenOutReason("not taken out") .build(); } } diff --git a/core/src/test/java/greencity/controller/ManagementOrderControllerTest.java b/core/src/test/java/greencity/controller/ManagementOrderControllerTest.java index 0d620c303..73617dbfd 100644 --- a/core/src/test/java/greencity/controller/ManagementOrderControllerTest.java +++ b/core/src/test/java/greencity/controller/ManagementOrderControllerTest.java @@ -532,7 +532,6 @@ void updatePageAdminInfoTest() throws Exception { mockMvc.perform( builder.file(jsonFile) .param("language", "en") - .param("description", "false") .principal(principal) .contentType(MediaType.MULTIPART_FORM_DATA)) .andExpect(status().isCreated()); diff --git a/service-api/src/main/java/greencity/dto/order/UpdateOrderPageAdminDto.java b/service-api/src/main/java/greencity/dto/order/UpdateOrderPageAdminDto.java index 99b7ac911..d3187406b 100644 --- a/service-api/src/main/java/greencity/dto/order/UpdateOrderPageAdminDto.java +++ b/service-api/src/main/java/greencity/dto/order/UpdateOrderPageAdminDto.java @@ -22,4 +22,5 @@ public class UpdateOrderPageAdminDto { private List updateResponsibleEmployeeDto; private Double writeOffStationSum; private Double ubsCourierSum; + private String notTakenOutReason; } 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 cfda1e4eb..bee326cf9 100644 --- a/service-api/src/main/java/greencity/service/ubs/UBSManagementService.java +++ b/service-api/src/main/java/greencity/service/ubs/UBSManagementService.java @@ -281,14 +281,12 @@ ManualPaymentResponseDto updateManualPayment(Long paymentId, ManualPaymentReques * @param updateOrderPageAdminDto {@link UpdateOrderPageAdminDto}. * @param language {@link String}. * @param email {@link String}. - * @param description {@link String}. * @param images {@link MultipartFile}. * * @author Anton Bondar. */ void updateOrderAdminPageInfoAndSaveReason(Long orderId, UpdateOrderPageAdminDto updateOrderPageAdminDto, - String language, - String email, String description, MultipartFile[] images); + String language, String email, MultipartFile[] images); /** * This is method which is updates admin page info for order. diff --git a/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java b/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java index c2f220b76..3717bd731 100644 --- a/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java +++ b/service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java @@ -1675,7 +1675,6 @@ private void updateOrderPageFields(UpdateOrderPageAdminDto updateOrderPageDto, O * @param updateOrderPageAdminDto {@link UpdateOrderPageAdminDto}. * @param language {@link String}. * @param email {@link String}. - * @param description {@link String}. * @param images {@link MultipartFile}. * * @author Anton Bondar. @@ -1683,13 +1682,12 @@ private void updateOrderPageFields(UpdateOrderPageAdminDto updateOrderPageDto, O @Override @Transactional public void updateOrderAdminPageInfoAndSaveReason(Long orderId, UpdateOrderPageAdminDto updateOrderPageAdminDto, - String language, - String email, String description, MultipartFile[] images) { + String language, String email, MultipartFile[] images) { Order order = orderRepository.findById(orderId) .orElseThrow(() -> new NotFoundException(ORDER_WITH_CURRENT_ID_DOES_NOT_EXIST + orderId)); updateOrderAdminPageInfo(updateOrderPageAdminDto, order, language, email); - saveReason(order, description, images); + saveReason(order, updateOrderPageAdminDto.getNotTakenOutReason(), images); } /** diff --git a/service/src/test/java/greencity/service/ubs/UBSManagementServiceImplTest.java b/service/src/test/java/greencity/service/ubs/UBSManagementServiceImplTest.java index 9934a1ac6..162a70aab 100644 --- a/service/src/test/java/greencity/service/ubs/UBSManagementServiceImplTest.java +++ b/service/src/test/java/greencity/service/ubs/UBSManagementServiceImplTest.java @@ -2914,8 +2914,7 @@ void updateOrderAdminPageInfoAndSaveReasonTest() { when(receivingStationRepository.findById(1L)).thenReturn(Optional.of(receivingStation)); when(orderRepository.getOrderDetails(1L)).thenReturn(Optional.ofNullable(getOrdersStatusFormedDto())); - ubsManagementService.updateOrderAdminPageInfoAndSaveReason(1L, dto, "en", "test@gmail.com", "desc", - multipartFiles); + ubsManagementService.updateOrderAdminPageInfoAndSaveReason(1L, dto, "en", "test@gmail.com", multipartFiles); verify(orderRepository).findById(1L); verify(employeeRepository).findByEmail("test@gmail.com");