MAGETWO-36935: Orders placed in different store views should not have duplicated IDs

Author: akaplya

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

@@ -136,7 +136,7 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
             $object->setIncrementId(
                 $this->sequenceManager->getSequence(
                     $object->getEntityType(),
-                    $object->getStore()->getId()
+                    $object->getStore()->getGroup()->getDefaultStoreId()
                 )->getNextValue()
             );
         }

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

@@ -89,6 +89,10 @@ class OrderTest extends \PHPUnit_Framework_TestCase
      */
     protected $relationCompositeMock;
 
+    /**
+     * @var \Magento\Framework\Model\Resource\Db\ObjectRelationProcessor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectRelationProcessorMock;
     /**
      * Mock class dependencies
      */
@@ -106,10 +110,16 @@ public function setUp()
             '',
             false
         );
-        $this->storeMock = $this->getMock('Magento\Store\Model\Store', ['__wakeup'], [], '', false);
-        $this->storeGroupMock = $this->getMock('Magento\Store\Model\Group', ['__wakeup'], [], '', false);
-        $this->websiteMock = $this->getMock('Magento\Sales\Model\Website', ['__wakeup'], [], '', false);
-        $this->customerMock = $this->getMock('Magento\Customer\Model\Customer', ['__wakeup'], [], '', false);
+        $this->storeMock = $this->getMock(
+            'Magento\Store\Model\Store',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->storeGroupMock = $this->getMock('Magento\Store\Model\Group', [], [], '', false);
+        $this->websiteMock = $this->getMock('Magento\Sales\Model\Website', [], [], '', false);
+        $this->customerMock = $this->getMock('Magento\Customer\Model\Customer', [], [], '', false);
         $this->orderItemCollectionMock = $this->getMock(
             'Magento\Sales\Model\Resource\Order\Item\Collection',
             [],
@@ -154,7 +164,7 @@ public function setUp()
             '',
             false
         );
-        $this->salesSequenceMock = $this->getMock('Magento\SalesSequence\Sequence', [], [], '', false);
+        $this->salesSequenceMock = $this->getMock('Magento\SalesSequence\Model\Sequence', [], [], '', false);
         $this->entitySnapshotMock = $this->getMock(
             'Magento\Sales\Model\Resource\EntitySnapshot',
             [],
@@ -169,8 +179,18 @@ public function setUp()
             '',
             false
         );
+        $this->objectRelationProcessorMock = $this->getMock(
+            'Magento\Framework\Model\Resource\Db\ObjectRelationProcessor',
+            [],
+            [],
+            '',
+            false
+        );
         $contextMock = $this->getMock('\Magento\Framework\Model\Resource\Db\Context', [], [], '', false);
         $contextMock->expects($this->once())->method('getResources')->willReturn($this->resourceMock);
+        $contextMock->expects($this->once())
+            ->method('getObjectRelationProcessor')
+            ->willReturn($this->objectRelationProcessorMock);
 
         $this->resource = new Order(
             $contextMock,
@@ -184,6 +204,51 @@ public function setUp()
 
     public function testSave()
     {
+
+        $this->orderMock->expects($this->once())
+            ->method('validateBeforeSave')
+            ->willReturnSelf();
+        $this->orderMock->expects($this->once())
+            ->method('beforeSave')
+            ->willReturnSelf();
+        $this->orderMock->expects($this->once())
+            ->method('isSaveAllowed')
+            ->willReturn(true);
+        $this->orderMock->expects($this->once())
+            ->method('getEntityType')
+            ->willReturn('order');
+        $this->orderMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+        $this->storeMock->expects($this->once())
+            ->method('getGroup')
+            ->willReturn($this->storeGroupMock);
+        $this->storeGroupMock->expects($this->once())
+            ->method('getDefaultStoreId')
+            ->willReturn(1);
+        $this->salesSequenceManagerMock->expects($this->once())
+            ->method('getSequence')
+            ->with('order', 1)
+            ->willReturn($this->salesSequenceMock);
+        $this->salesSequenceMock->expects($this->once())
+            ->method('getNextValue')
+            ->willReturn('10000001');
+        $this->orderMock->expects($this->once())
+            ->method('setIncrementId')
+            ->with('10000001')
+            ->willReturnSelf();
+        $this->orderMock->expects($this->once())
+            ->method('getIncrementId')
+            ->willReturn(null);
+        $this->orderMock->expects($this->once())
+            ->method('getData')
+            ->willReturn(['increment_id' => '10000001']);
+        $this->objectRelationProcessorMock->expects($this->once())
+            ->method('validateDataIntegrity')
+            ->with(null, ['increment_id' => '10000001']);
+        $this->relationCompositeMock->expects($this->once())
+            ->method('processRelations')
+            ->with($this->orderMock);
         $this->resourceMock->expects($this->any())
             ->method('getConnection')
             ->willReturn($this->adapterMock);