MSI: issue #290

- Fixed setup schema script for creatind default source; - Tests fexes - part;
magento · Dec 20, 2017 · bb971db · bb971db
1 parent c070521
commit bb971db
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/app/code/Magento/Inventory/Indexer/SelectBuilder.php b/app/code/Magento/Inventory/Indexer/SelectBuilder.php
@@ -71,7 +71,11 @@ public function execute($stockId): Select
             )
             ->joinLeft(
                 ['stock_source_link' => $sourceStockLinkTable],
-                'source_item.' . SourceItemInterface::SOURCE_CODE . ' = stock_source_link.' . StockSourceLink::SOURCE_CODE,
+                sprintf(
+                    'source_item.%s = stock_source_link.%s',
+                    SourceItemInterface::SOURCE_CODE,
+                    StockSourceLink::SOURCE_CODE
+                ),
                 []
             )
             ->where('stock_source_link.' . StockSourceLink::STOCK_ID . ' = ?', $stockId)

diff --git a/app/code/Magento/Inventory/Indexer/SourceItem/GetSkuListInStock.php b/app/code/Magento/Inventory/Indexer/SourceItem/GetSkuListInStock.php
@@ -76,7 +76,11 @@ public function execute(array $sourceItemIds): array
                 ]
             )->joinInner(
                 ['stock_source_link' => $sourceStockLinkTable],
-                'source_item.' . SourceItemInterface::SOURCE_CODE . ' = stock_source_link.' . StockSourceLink::SOURCE_CODE,
+                sprintf(
+                    'source_item.%s = stock_source_link.%s',
+                    SourceItemInterface::SOURCE_CODE,
+                    StockSourceLink::SOURCE_CODE
+                ),
                 [StockSourceLink::STOCK_ID]
             )->where('source_item.source_item_id IN (?)', $sourceItemIds)
             ->group(['stock_source_link.' . StockSourceLink::STOCK_ID]);

diff --git a/app/code/Magento/Inventory/Setup/Operation/CreateSourceCarrierLinkTable.php b/app/code/Magento/Inventory/Setup/Operation/CreateSourceCarrierLinkTable.php
@@ -53,7 +53,7 @@ private function createSourceCarrierLinkTable(SchemaSetupInterface $setup): Tabl
             ],
             'Source Carrier Link ID'
         )->addColumn(
-            SourceInterface::CODE,
+            SourceCarrierLinkInterface::SOURCE_CODE,
             Table::TYPE_TEXT,
             255,
             [
@@ -80,11 +80,11 @@ private function createSourceCarrierLinkTable(SchemaSetupInterface $setup): Tabl
         )->addForeignKey(
             $setup->getFkName(
                 $sourceCarrierLinkTable,
-                SourceInterface::CODE,
+                SourceCarrierLinkInterface::SOURCE_CODE,
                 $sourceTable,
                 SourceInterface::CODE
             ),
-            SourceInterface::CODE,
+            SourceCarrierLinkInterface::SOURCE_CODE,
             $sourceTable,
             SourceInterface::CODE,
             AdapterInterface::FK_ACTION_CASCADE

diff --git a/app/code/Magento/Inventory/Test/Unit/Model/SourceRepositoryTest.php b/app/code/Magento/Inventory/Test/Unit/Model/SourceRepositoryTest.php
@@ -104,7 +104,7 @@ public function testGet()
         $this->commandGet
             ->expects($this->once())
             ->method('execute')
-            ->with($sourceId)
+            ->with($sourceCode)
             ->willReturn($this->source);
 
         self::assertEquals($this->source, $this->sourceRepository->get($sourceCode));

diff --git a/app/code/Magento/InventoryApi/Api/Data/SourceCarrierLinkInterface.php b/app/code/Magento/InventoryApi/Api/Data/SourceCarrierLinkInterface.php
@@ -23,6 +23,7 @@ interface SourceCarrierLinkInterface extends ExtensibleDataInterface
      */
     const CARRIER_CODE = 'carrier_code';
     const POSITION = 'position';
+    const SOURCE_CODE = 'source_code';
     /**#@-*/
 
     /**

diff --git a/app/code/Magento/InventoryCatalog/Setup/Operation/CreateDefaultSource.php b/app/code/Magento/InventoryCatalog/Setup/Operation/CreateDefaultSource.php
@@ -64,7 +64,6 @@ public function __construct(
     public function execute()
     {
         $data = [
-            SourceInterface::SOURCE_ID => $this->defaultSourceProvider->getId(),
             SourceInterface::CODE => 'default',
             SourceInterface::NAME => 'Default Source',
             SourceInterface::ENABLED => 1,