MAGETWO-70885: [SOAP] The 'incrementId' property of the order with state 'complete' is increased after order status update

- Modified implementation without additional model loading;
- Fixed tests;

Author: Aliaksei Yakimovich2

app/code/Magento/Sales/Model/OrderRepository.php

@@ -266,17 +266,6 @@ public function save(\Magento\Sales\Api\Data\OrderInterface $entity)
             }
         }
 
-        $entityId = $entity->getEntityId();
-        if ($entityId && $entity->getIncrementId() == null) {
-            try {
-                $loadedEntity = $this->get($entityId);
-                $entity->setIncrementId($loadedEntity->getIncrementId());
-                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock
-            } catch (NoSuchEntityException $e) {
-                // non-existent entity
-            }
-        }
-
         $this->metadata->getMapper()->save($entity);
         $this->registry[$entity->getEntityId()] = $entity;
         return $this->registry[$entity->getEntityId()];

app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php

@@ -14,6 +14,7 @@
 /**
  * Abstract sales entity provides to its children knowledge about eventPrefix and eventObject
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @since 100.0.2
@@ -96,6 +97,7 @@ public function saveAttribute(\Magento\Framework\Model\AbstractModel $object, $a
 
     /**
      * Prepares data for saving and removes update time (if exists).
+     *
      * This prevents saving same update time on each entity update.
      *
      * @param \Magento\Framework\Model\AbstractModel $object
@@ -114,6 +116,7 @@ protected function _prepareDataForSave(\Magento\Framework\Model\AbstractModel $o
 
     /**
      * Perform actions before object save
+     *
      * Perform actions before object save, calculate next sequence value for increment Id
      *
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
@@ -122,7 +125,7 @@ protected function _prepareDataForSave(\Magento\Framework\Model\AbstractModel $o
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
         /** @var \Magento\Sales\Model\AbstractModel $object */
-        if ($object instanceof EntityInterface && $object->getIncrementId() == null) {
+        if ($object instanceof EntityInterface && $object->getEntityId() == null) {
             $store = $object->getStore();
             $storeId = $store->getId();
             if ($storeId === null) {

app/code/Magento/Sales/Test/Unit/Model/OrderRepositoryTest.php

@@ -176,7 +176,6 @@ public function testSave()
         $shippingMock->expects($this->once())->method('getAddress');
         $shippingMock->expects($this->once())->method('getMethod');
         $this->metadata->expects($this->once())->method('getMapper')->willReturn($mapperMock);
-        $orderEntity->expects($this->once())->method('getIncrementId')->willReturn('0000000001');
         $mapperMock->expects($this->once())->method('save');
         $orderEntity->expects($this->any())->method('getEntityId')->willReturn(1);
         $this->orderRepository->save($orderEntity);

app/code/Magento/Sales/Test/Unit/Model/ResourceModel/OrderTest.php

@@ -198,7 +198,7 @@ public function testSave()
             ->with('10000001')
             ->willReturnSelf();
         $this->orderMock->expects($this->once())
-            ->method('getIncrementId')
+            ->method('getEntityId')
             ->willReturn(null);
         $this->orderMock->expects($this->once())
             ->method('getData')

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderUpdateTest.php

@@ -45,11 +45,8 @@ public function testOrderUpdate()
         $order = $this->objectManager->get(\Magento\Sales\Model\Order::class)
             ->loadByIncrementId(self::ORDER_INCREMENT_ID);
 
-        $entityData = [
-            OrderInterface::ENTITY_ID => $order->getId(),
-            OrderInterface::STATE => 'processing',
-            OrderInterface::STATUS => 'processing'
-        ];
+        $entityData = $this->getOrderData($order);
+
         $requestData = ['entity' => $entityData];
 
         $serviceInfo = [
@@ -73,4 +70,50 @@ public function testOrderUpdate()
             $actualOrder->getData(OrderInterface::INCREMENT_ID)
         );
     }
+
+    /**
+     * Prepare order data for request
+     *
+     * @param \Magento\Sales\Model\Order $order
+     * @return array
+     */
+    private function getOrderData(\Magento\Sales\Model\Order $order)
+    {
+        if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
+            $entityData = $order->getData();
+            unset($entityData[OrderInterface::INCREMENT_ID]);
+            $entityData[OrderInterface::STATE] = 'processing';
+            $entityData[OrderInterface::STATUS] = 'processing';
+
+            $orderData = $order->getData();
+            $orderData['billing_address'] = $order->getBillingAddress()->getData();
+            $orderData['billing_address']['street'] = ['Street'];
+
+            $orderItems = [];
+            foreach ($order->getItems() as $item) {
+                $orderItems[] = $item->getData();
+            }
+            $orderData['items'] = $orderItems;
+
+            $shippingAddress = $order->getShippingAddress()->getData();
+            $orderData['extension_attributes']['shipping_assignments'] =
+                [
+                    [
+                        'shipping' => [
+                            'address' => $shippingAddress,
+                            'method' => 'flatrate_flatrate'
+                        ],
+                        'items' => $order->getItems(),
+                        'stock_id' => null,
+                    ]
+                ];
+        } else {
+            $orderData = [
+                OrderInterface::ENTITY_ID => $order->getId(),
+                OrderInterface::STATE => 'processing',
+                OrderInterface::STATUS => 'processing'
+            ];
+        }
+        return $orderData;
+    }
 }