Task 290 import export source code

app/code/Magento/Inventory/Controller/Adminhtml/Source/Edit.php

@@ -49,9 +49,9 @@ public function __construct(
      */
     public function execute(): ResultInterface
     {
-        $sourceId = (int)$this->getRequest()->getParam(SourceInterface::SOURCE_ID);
+        $sourceCode = $this->getRequest()->getParam(SourceInterface::SOURCE_CODE);
         try {
-            $source = $this->sourceRepository->get($sourceId);
+            $source = $this->sourceRepository->get($sourceCode);
 
             /** @var Page $result */
             $result = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
@@ -64,7 +64,7 @@ public function execute(): ResultInterface
             /** @var Redirect $result */
             $result = $this->resultRedirectFactory->create();
             $this->messageManager->addErrorMessage(
-                __('Source with id "%value" does not exist.', ['value' => $sourceId])
+                __('Source with source code "%value" does not exist.', ['value' => $sourceCode])
             );
             $result->setPath('*/*');
         }

app/code/Magento/Inventory/Controller/Adminhtml/Source/InlineEdit.php

@@ -66,27 +66,27 @@ public function execute(): ResultInterface
         if ($request->isXmlHttpRequest() && $request->isPost() && $requestData) {
             foreach ($requestData as $itemData) {
                 try {
-                    $sourceId = (int)$itemData[SourceInterface::SOURCE_ID];
-                    $source = $this->sourceRepository->get($sourceId);
+                    $sourceCode = $itemData[SourceInterface::SOURCE_CODE];
+                    $source = $this->sourceRepository->get($sourceCode);
                     $this->dataObjectHelper->populateWithArray($source, $itemData, SourceInterface::class);
                     $this->sourceRepository->save($source);
                 } catch (NoSuchEntityException $e) {
                     $errorMessages[] = __(
                         '[ID: %value] The Source does not exist.',
-                        ['value' => $sourceId]
+                        ['value' => $sourceCode]
                     );
                 } catch (ValidationException $e) {
                     foreach ($e->getErrors() as $localizedError) {
                         $errorMessages[] = __('[ID: %value] %message', [
-                            'value' => $sourceId,
+                            'value' => $sourceCode,
                             'message' => $localizedError->getMessage()
                         ]);
                     }
                 } catch (CouldNotSaveException $e) {
                     $errorMessages[] = __(
                         '[ID: %value] %message',
                         [
-                            'value' => $sourceId,
+                            'value' => $sourceCode,
                             'message' => $e->getMessage()
                         ]
                     );

app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php

@@ -69,55 +69,49 @@ public function execute(): ResultInterface
     {
         $resultRedirect = $this->resultRedirectFactory->create();
         $request = $this->getRequest();
-        $requestData = $request->getParams();
+        $requestData = $request->getPost()->toArray();
+
         if (!$request->isPost() || empty($requestData['general'])) {
             $this->messageManager->addErrorMessage(__('Wrong request.'));
             $this->processRedirectAfterFailureSave($resultRedirect);
-
             return $resultRedirect;
         }
 
+        $sourceCodeQueryParam = $request->getQuery(SourceInterface::SOURCE_CODE);
         try {
-            $sourceId = isset($requestData['general'][SourceInterface::SOURCE_ID])
-                ? (int)$requestData['general'][SourceInterface::SOURCE_ID]
-                : null;
-            $sourceId = $this->processSave($requestData, $sourceId);
+            $source = (null !== $sourceCodeQueryParam)
+                ? $this->sourceRepository->get($sourceCodeQueryParam)
+                : $this->sourceFactory->create();
+
+            $this->processSave($source, $requestData);
 
             $this->messageManager->addSuccessMessage(__('The Source has been saved.'));
-            $this->processRedirectAfterSuccessSave($resultRedirect, $sourceId);
+            $this->processRedirectAfterSuccessSave($resultRedirect, $source->getSourceCode());
         } catch (NoSuchEntityException $e) {
             $this->messageManager->addErrorMessage(__('The Source does not exist.'));
             $this->processRedirectAfterFailureSave($resultRedirect);
         } catch (ValidationException $e) {
             foreach ($e->getErrors() as $localizedError) {
                 $this->messageManager->addErrorMessage($localizedError->getMessage());
             }
-            $this->processRedirectAfterFailureSave($resultRedirect, $sourceId);
+            $this->processRedirectAfterFailureSave($resultRedirect, $sourceCodeQueryParam ?? $sourceCodeQueryParam);
         } catch (CouldNotSaveException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
-            $this->processRedirectAfterFailureSave($resultRedirect, $sourceId);
+            $this->processRedirectAfterFailureSave($resultRedirect, $sourceCodeQueryParam ?? $sourceCodeQueryParam);
         } catch (Exception $e) {
             $this->messageManager->addErrorMessage(__('Could not save Source.'));
-            $this->processRedirectAfterFailureSave($resultRedirect, $sourceId ?? null);
+            $this->processRedirectAfterFailureSave($resultRedirect, $sourceCodeQueryParam ?? $sourceCodeQueryParam);
         }
-
         return $resultRedirect;
     }
 
     /**
+     * @param SourceInterface $source
      * @param array $requestData
-     * @param int|null $sourceId
-     *
-     * @return int
+     * @return void
      */
-    private function processSave(array $requestData, int $sourceId = null): int
+    private function processSave(SourceInterface $source, array $requestData)
     {
-        if (null === $sourceId) {
-            /** @var SourceInterface $source */
-            $source = $this->sourceFactory->create();
-        } else {
-            $source = $this->sourceRepository->get($sourceId);
-        }
         $source = $this->sourceHydrator->hydrate($source, $requestData);
 
         $this->_eventManager->dispatch(
@@ -128,7 +122,7 @@ private function processSave(array $requestData, int $sourceId = null): int
             ]
         );
 
-        $sourceId = $this->sourceRepository->save($source);
+        $this->sourceRepository->save($source);
 
         $this->_eventManager->dispatch(
             'controller_action_inventory_source_save_after',
@@ -137,21 +131,18 @@ private function processSave(array $requestData, int $sourceId = null): int
                 'source' => $source,
             ]
         );
-
-        return $sourceId;
     }
 
     /**
      * @param Redirect $resultRedirect
-     * @param int $sourceId
-     *
+     * @param string $sourceCode
      * @return void
      */
-    private function processRedirectAfterSuccessSave(Redirect $resultRedirect, int $sourceId)
+    private function processRedirectAfterSuccessSave(Redirect $resultRedirect, string $sourceCode)
     {
         if ($this->getRequest()->getParam('back')) {
             $resultRedirect->setPath('*/*/edit', [
-                SourceInterface::SOURCE_ID => $sourceId,
+                SourceInterface::SOURCE_CODE => $sourceCode,
                 '_current' => true,
             ]);
         } elseif ($this->getRequest()->getParam('redirect_to_new')) {
@@ -165,17 +156,16 @@ private function processRedirectAfterSuccessSave(Redirect $resultRedirect, int $
 
     /**
      * @param Redirect $resultRedirect
-     * @param int|null $sourceId
-     *
+     * @param string|null $sourceCode
      * @return void
      */
-    private function processRedirectAfterFailureSave(Redirect $resultRedirect, int $sourceId = null)
+    private function processRedirectAfterFailureSave(Redirect $resultRedirect, string $sourceCode = null)
     {
-        if (null === $sourceId) {
+        if (null === $sourceCode) {
             $resultRedirect->setPath('*/*/new');
         } else {
             $resultRedirect->setPath('*/*/edit', [
-                SourceInterface::SOURCE_ID => $sourceId,
+                SourceInterface::SOURCE_CODE => $sourceCode,
                 '_current' => true,
             ]);
         }

app/code/Magento/Inventory/Controller/Adminhtml/Stock/StockSourceLinkProcessor.php

@@ -78,23 +78,23 @@ public function process(int $stockId, array $stockSourceLinksData)
         $this->validateStockSourceData($stockSourceLinksData);
 
         $assignedSources = $this->getAssignedSourcesForStock->execute($stockId);
-        $sourceIdsForSave = array_flip(array_column($stockSourceLinksData, StockSourceLink::SOURCE_ID));
-        $sourceIdsForDelete = [];
+        $sourceCodesForSave = array_flip(array_column($stockSourceLinksData, StockSourceLink::SOURCE_CODE));
+        $sourceCodesForDelete = [];
 
         foreach ($assignedSources as $assignedSource) {
-            if (array_key_exists($assignedSource->getSourceId(), $sourceIdsForSave)) {
-                unset($sourceIdsForSave[$assignedSource->getSourceId()]);
+            if (array_key_exists($assignedSource->getSourceCode(), $sourceCodesForSave)) {
+                unset($sourceCodesForSave[$assignedSource->getSourceCode()]);
             } else {
-                $sourceIdsForDelete[] = $assignedSource->getSourceId();
+                $sourceCodesForDelete[] = $assignedSource->getSourceCode();
             }
         }
 
-        if ($sourceIdsForSave) {
-            $this->assignSourcesToStock->execute(array_keys($sourceIdsForSave), $stockId);
+        if ($sourceCodesForSave) {
+            $this->assignSourcesToStock->execute(array_keys($sourceCodesForSave), $stockId);
         }
-        if ($sourceIdsForDelete) {
-            foreach ($sourceIdsForDelete as $sourceIdForDelete) {
-                $this->unassignSourceFromStock->execute((int) $sourceIdForDelete, $stockId);
+        if ($sourceCodesForDelete) {
+            foreach ($sourceCodesForDelete as $sourceCodeForDelete) {
+                $this->unassignSourceFromStock->execute($sourceCodeForDelete, $stockId);
             }
         }
     }
@@ -107,7 +107,7 @@ public function process(int $stockId, array $stockSourceLinksData)
     private function validateStockSourceData(array $stockSourceLinksData)
     {
         foreach ($stockSourceLinksData as $stockSourceLinkData) {
-            if (!isset($stockSourceLinkData[StockSourceLink::SOURCE_ID])) {
+            if (!isset($stockSourceLinkData[StockSourceLink::SOURCE_CODE])) {
                 throw new InputException(__('Wrong Stock to Source relation parameters given.'));
             }
         }

app/code/Magento/Inventory/Indexer/SelectBuilder.php

@@ -51,11 +51,11 @@ public function execute($stockId): Select
 
         // find all enabled sources
         $select = $connection->select()
-            ->from($sourceTable, [SourceInterface::SOURCE_ID])
+            ->from($sourceTable, [SourceInterface::SOURCE_CODE])
             ->where(SourceInterface::ENABLED . ' = ?', 1);
-        $sourceIds = $connection->fetchCol($select);
+        $sourceCodes = $connection->fetchCol($select);
 
-        if (0 === count($sourceIds)) {
+        if (0 === count($sourceCodes)) {
             return $select;
         }
 
@@ -71,11 +71,15 @@ public function execute($stockId): Select
             )
             ->joinLeft(
                 ['stock_source_link' => $sourceStockLinkTable],
-                'source_item.' . SourceItemInterface::SOURCE_ID . ' = stock_source_link.' . StockSourceLink::SOURCE_ID,
+                sprintf(
+                    'source_item.%s = stock_source_link.%s',
+                    SourceItemInterface::SOURCE_CODE,
+                    StockSourceLink::SOURCE_CODE
+                ),
                 []
             )
             ->where('stock_source_link.' . StockSourceLink::STOCK_ID . ' = ?', $stockId)
-            ->where('stock_source_link.' . StockSourceLink::SOURCE_ID . ' IN (?)', $sourceIds)
+            ->where('stock_source_link.' . StockSourceLink::SOURCE_CODE . ' IN (?)', $sourceCodes)
             ->group([SourceItemInterface::SKU]);
         return $select;
     }

app/code/Magento/Inventory/Indexer/Source/GetAssignedStockIds.php

@@ -31,10 +31,10 @@ public function __construct(
     }
 
     /**
-     * @param int[] $sourceIds
+     * @param string[] $sourceCodes
      * @return int[]
      */
-    public function execute(array $sourceIds): array
+    public function execute(array $sourceCodes): array
     {
         $connection = $this->resourceConnection->getConnection();
         $sourceStockLinkTable = $this->resourceConnection->getTableName(
@@ -44,7 +44,7 @@ public function execute(array $sourceIds): array
         $select = $connection
             ->select()
             ->from($sourceStockLinkTable, StockSourceLink::STOCK_ID)
-            ->where(StockSourceLink::SOURCE_ID . ' IN (?)', $sourceIds)
+            ->where(StockSourceLink::SOURCE_CODE . ' IN (?)', $sourceCodes)
             ->group(StockSourceLink::STOCK_ID);
 
         $stockIds = $connection->fetchCol($select);

app/code/Magento/Inventory/Indexer/Source/SourceIndexer.php

@@ -56,17 +56,17 @@ public function executeFull()
     /**
      * @inheritdoc
      */
-    public function executeRow($sourceId)
+    public function executeRow($sourceCode)
     {
-        $this->executeList([$sourceId]);
+        $this->executeList([$sourceCode]);
     }
 
     /**
      * @inheritdoc
      */
-    public function executeList(array $sourceIds)
+    public function executeList(array $sourceCodes)
     {
-        $stockIds = $this->getAssignedStockIds->execute($sourceIds);
+        $stockIds = $this->getAssignedStockIds->execute($sourceCodes);
         $this->stockIndexer->executeList($stockIds);
     }
 }

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_ID . ' = stock_source_link.' . StockSourceLink::SOURCE_ID,
+                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]);

app/code/Magento/Inventory/Indexer/SourceItem/SourceItemIndexer.php

@@ -13,7 +13,6 @@
 use Magento\Framework\MultiDimensionalIndex\IndexHandlerInterface;
 use Magento\Framework\MultiDimensionalIndex\IndexNameBuilder;
 use Magento\Framework\MultiDimensionalIndex\IndexStructureInterface;
-use Magento\Inventory\Indexer\IndexDataProvider;
 use Magento\Inventory\Indexer\Stock\StockIndexer;
 
 /**
@@ -96,9 +95,9 @@ public function executeFull()
     /**
      * @inheritdoc
      */
-    public function executeRow($sourceId)
+    public function executeRow($sourceItemId)
     {
-        $this->executeList([$sourceId]);
+        $this->executeList([$sourceItemId]);
     }
 
     /**

app/code/Magento/Inventory/Model/ResourceModel/Source.php

@@ -30,6 +30,13 @@ class Source extends AbstractDb
     const TABLE_NAME_SOURCE = 'inventory_source';
     /**#@-*/
 
+    /**
+     * Primary key auto increment flag
+     *
+     * @var bool
+     */
+    protected $_isPkAutoIncrement = false;
+
     /**
      * @var SourceCarrierLinkManagementInterface
      */
@@ -54,7 +61,7 @@ public function __construct(
      */
     protected function _construct()
     {
-        $this->_init(self::TABLE_NAME_SOURCE, SourceInterface::SOURCE_ID);
+        $this->_init(self::TABLE_NAME_SOURCE, SourceInterface::SOURCE_CODE);
     }
 
     /**

app/code/Magento/Inventory/Model/ResourceModel/SourceItem/DeleteMultiple.php

@@ -63,11 +63,11 @@ private function buildWhereSqlPart(array $sourceItems): string
                 SourceItemInterface::SKU . ' = ?',
                 $sourceItem->getSku()
             );
-            $sourceIdCondition = $connection->quoteInto(
-                SourceItemInterface::SOURCE_ID . ' = ?',
-                $sourceItem->getSourceId()
+            $sourceCodeCondition = $connection->quoteInto(
+                SourceItemInterface::SOURCE_CODE . ' = ?',
+                $sourceItem->getSourceCode()
             );
-            $condition[] = '(' . $skuCondition . ' AND ' . $sourceIdCondition . ')';
+            $condition[] = '(' . $skuCondition . ' AND ' . $sourceCodeCondition . ')';
         }
         return implode(' OR ', $condition);
     }

app/code/Magento/Inventory/Model/ResourceModel/SourceItem/SaveMultiple.php

@@ -46,7 +46,7 @@ public function execute(array $sourceItems)
         $tableName = $this->resourceConnection->getTableName(SourceItemResourceModel::TABLE_NAME_SOURCE_ITEM);
 
         $columnsSql = $this->buildColumnsSqlPart([
-            SourceItemInterface::SOURCE_ID,
+            SourceItemInterface::SOURCE_CODE,
             SourceItemInterface::SKU,
             SourceItemInterface::QUANTITY,
             SourceItemInterface::STATUS
@@ -100,7 +100,7 @@ private function getSqlBindData(array $sourceItems): array
         $bind = [];
         foreach ($sourceItems as $sourceItem) {
             $bind = array_merge($bind, [
-                $sourceItem->getSourceId(),
+                $sourceItem->getSourceCode(),
                 $sourceItem->getSku(),
                 $sourceItem->getQuantity(),
                 $sourceItem->getStatus(),