[UBS] - Exception occurs when we try to update order page admin info #6128

core/src/main/java/greencity/controller/ManagementOrderController.java

@@ -888,7 +888,6 @@ public ResponseEntity<HttpStatus> 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<HttpStatus> updateEcoStoreIdToOrder(
     public ResponseEntity<HttpStatus> 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();
     }
 

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();
     }
 }

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());

service-api/src/main/java/greencity/dto/order/UpdateOrderPageAdminDto.java

@@ -22,4 +22,5 @@ public class UpdateOrderPageAdminDto {
     private List<UpdateResponsibleEmployeeDto> updateResponsibleEmployeeDto;
     private Double writeOffStationSum;
     private Double ubsCourierSum;
+    private String notTakenOutReason;
 }

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.

service/src/main/java/greencity/service/ubs/UBSManagementServiceImpl.java

@@ -1675,21 +1675,19 @@ 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.
      */
     @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);
     }
 
     /**

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", "[email protected]", "desc",
-            multipartFiles);
+        ubsManagementService.updateOrderAdminPageInfoAndSaveReason(1L, dto, "en", "[email protected]", multipartFiles);
 
         verify(orderRepository).findById(1L);
         verify(employeeRepository).findByEmail("[email protected]");