merge magento/2.3.4-develop into magento-trigger/MC-21671

Author: fascinosum

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/EntityIdToId.php

@@ -53,7 +53,7 @@ public function resolve(
         $product = $value['model'];
 
         $productId = $product->getData(
-            $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField()
+            $this->metadataPool->getMetadata(ProductInterface::class)->getIdentifierField()
         );
 
         return $productId;

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -100,8 +100,8 @@ interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\
     created_at: String @doc(description: "Timestamp indicating when the product was created.")
     updated_at: String @doc(description: "Timestamp indicating when the product was updated.")
     country_of_manufacture: String @doc(description: "The product's country of origin.")
-    type_id: String @doc(description: "One of simple, virtual, bundle, downloadable, grouped, or configurable.")
-    websites: [Website] @doc(description: "An array of websites in which the product is available.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Websites")
+    type_id: String @doc(description: "One of simple, virtual, bundle, downloadable, grouped, or configurable.") @deprecated(reason: "Use __typename instead.")
+    websites: [Website] @doc(description: "An array of websites in which the product is available.") @deprecated(reason: "The field should not be used on the storefront.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Websites")
     product_links: [ProductLinksInterface] @doc(description: "An array of ProductLinks objects.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\BatchProductLinks")
     media_gallery_entries: [MediaGalleryEntry] @deprecated(reason: "Use product's `media_gallery` instead") @doc(description: "An array of MediaGalleryEntry objects.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\MediaGalleryEntries")
     price: ProductPrices @deprecated(reason: "Use price_range for product price information.") @doc(description: "A ProductPrices object, indicating the price of an item.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\Price")

app/code/Magento/Checkout/Model/Session.php

@@ -273,6 +273,10 @@ public function getQuote()
                          */
                         $quote = $this->quoteRepository->get($this->getQuoteId());
                     }
+
+                    if ($quote->getTotalsCollectedFlag() === false) {
+                        $quote->collectTotals();
+                    }
                 } catch (NoSuchEntityException $e) {
                     $this->setQuoteId(null);
                 }

app/code/Magento/MediaGallery/Model/Asset/Command/DeleteByPath.php

@@ -7,10 +7,10 @@
 
 namespace Magento\MediaGallery\Model\Asset\Command;
 
-use Magento\MediaGalleryApi\Model\Asset\Command\DeleteByPathInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\MediaGalleryApi\Model\Asset\Command\DeleteByPathInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -62,11 +62,11 @@ public function execute(string $mediaAssetPath): void
             $tableName = $this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET);
             $connection->delete($tableName, [self::MEDIA_GALLERY_ASSET_PATH . ' = ?' => $mediaAssetPath]);
         } catch (\Exception $exception) {
+            $this->logger->critical($exception);
             $message = __(
                 'Could not delete media asset with path %path: %error',
                 ['path' => $mediaAssetPath, 'error' => $exception->getMessage()]
             );
-            $this->logger->critical($message);
             throw new CouldNotDeleteException($message, $exception);
         }
     }

app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php

@@ -7,12 +7,12 @@
 
 namespace Magento\MediaGallery\Model\Asset\Command;
 
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
-use Magento\MediaGalleryApi\Model\Asset\Command\GetByIdInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\IntegrationException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use Magento\MediaGalleryApi\Model\Asset\Command\GetByIdInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -66,24 +66,34 @@ public function __construct(
     public function execute(int $mediaAssetId): AssetInterface
     {
         try {
+            $mediaAssetTable = $this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET);
             $connection = $this->resourceConnection->getConnection();
             $select = $connection->select()
-                ->from(['amg' => $this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET)])
+                ->from(['amg' => $mediaAssetTable])
                 ->where('amg.id = ?', $mediaAssetId);
-            $data = $connection->query($select)->fetch();
+            $mediaAssetData = $connection->query($select)->fetch();
+        } catch (\Exception $exception) {
+            $message = __(
+                'En error occurred during get media asset data by id %id: %error',
+                ['id' => $mediaAssetId, 'error' => $exception->getMessage()]
+            );
+            $this->logger->critical($message);
+            throw new IntegrationException($message, $exception);
+        }
 
-            if (empty($data)) {
-                $message = __('There is no such media asset with id "%1"', $mediaAssetId);
-                throw new NoSuchEntityException($message);
-            }
+        if (empty($mediaAssetData)) {
+            $message = __('There is no such media asset with id "%1"', $mediaAssetId);
+            throw new NoSuchEntityException($message);
+        }
 
-            return $this->assetFactory->create(['data' => $data]);
+        try {
+            return $this->assetFactory->create(['data' => $mediaAssetData]);
         } catch (\Exception $exception) {
+            $this->logger->critical($exception->getMessage());
             $message = __(
-                'En error occurred during get media asset with id %id by id: %error',
+                'En error occurred during initialize media asset with id %id: %error',
                 ['id' => $mediaAssetId, 'error' => $exception->getMessage()]
             );
-            $this->logger->critical($message);
             throw new IntegrationException($message, $exception);
         }
     }

app/code/Magento/MediaGallery/Model/Asset/Command/GetByPath.php

@@ -82,8 +82,8 @@ public function execute(string $mediaFilePath): AssetInterface
 
             return $mediaAssets;
         } catch (\Exception $exception) {
+            $this->logger->critical($exception);
             $message = __('An error occurred during get media asset list: %1', $exception->getMessage());
-            $this->logger->critical($message);
             throw new IntegrationException($message, $exception);
         }
     }

app/code/Magento/MediaGallery/Model/Asset/Command/Save.php

@@ -71,8 +71,8 @@ public function execute(AssetInterface $mediaAsset): int
             $connection->insertOnDuplicate($tableName, $this->extractor->extract($mediaAsset, AssetInterface::class));
             return (int) $connection->lastInsertId($tableName);
         } catch (\Exception $exception) {
+            $this->logger->critical($exception);
             $message = __('An error occurred during media asset save: %1', $exception->getMessage());
-            $this->logger->critical($message);
             throw new CouldNotSaveException($message, $exception);
         }
     }

app/code/Magento/MediaGallery/Model/DataExtractor.php

@@ -15,7 +15,13 @@
 class DataExtractor implements DataExtractorInterface
 {
     /**
-     * @inheritdoc
+     * Extract data from an object using available getters (does not process extension attributes)
+     *
+     * @param object $object
+     * @param string|null $interface
+     *
+     * @return array
+     * @throws \ReflectionException
      */
     public function extract($object, string $interface = null): array
     {

app/code/Magento/MediaGallery/Model/Keyword/Command/GetAssetKeywords.php

@@ -7,11 +7,12 @@
 
 namespace Magento\MediaGallery\Model\Keyword\Command;
 
+use Magento\Framework\Exception\IntegrationException;
 use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
 use Magento\MediaGalleryApi\Api\Data\KeywordInterfaceFactory;
 use Magento\MediaGalleryApi\Model\Keyword\Command\GetAssetKeywordsInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Exception\NotFoundException;
+use Psr\Log\LoggerInterface;
 
 /**
  * ClassGetAssetKeywords
@@ -31,27 +32,35 @@ class GetAssetKeywords implements GetAssetKeywordsInterface
      */
     private $assetKeywordFactory;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * GetAssetKeywords constructor.
      *
      * @param ResourceConnection $resourceConnection
      * @param KeywordInterfaceFactory $assetKeywordFactory
+     * @param LoggerInterface $logger
      */
     public function __construct(
         ResourceConnection $resourceConnection,
-        KeywordInterfaceFactory $assetKeywordFactory
+        KeywordInterfaceFactory $assetKeywordFactory,
+        LoggerInterface $logger
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->assetKeywordFactory = $assetKeywordFactory;
+        $this->logger = $logger;
     }
 
     /**
      * Get asset related keywords.
      *
      * @param int $assetId
      *
-     * @return KeywordInterface[]
-     * @throws NotFoundException
+     * @return KeywordInterface[]|[]
+     * @throws IntegrationException
      */
     public function execute(int $assetId): array
     {
@@ -71,8 +80,9 @@ public function execute(int $assetId): array
 
             return $keywords;
         } catch (\Exception $exception) {
+            $this->logger->critical($exception);
             $message = __('An error occurred during get asset keywords: %1', $exception->getMessage());
-            throw new NotFoundException($message, $exception);
+            throw new IntegrationException($message, $exception);
         }
     }
 }

app/code/Magento/MediaGallery/Model/Keyword/Command/SaveAssetKeywords.php

@@ -13,6 +13,7 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class SaveAssetKeywords
@@ -33,22 +34,34 @@ class SaveAssetKeywords implements SaveAssetKeywordsInterface
      */
     private $saveAssetLinks;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * SaveAssetKeywords constructor.
      *
      * @param ResourceConnection $resourceConnection
      * @param SaveAssetLinks $saveAssetLinks
+     * @param LoggerInterface $logger
      */
     public function __construct(
         ResourceConnection $resourceConnection,
-        SaveAssetLinks $saveAssetLinks
+        SaveAssetLinks $saveAssetLinks,
+        LoggerInterface $logger
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->saveAssetLinks = $saveAssetLinks;
+        $this->logger = $logger;
     }
 
     /**
-     * @inheritdoc
+     * Save asset keywords.
+     *
+     * @param KeywordInterface[] $keywords
+     * @param int $assetId
+     * @throws CouldNotSaveException
      */
     public function execute(array $keywords, int $assetId): void
     {
@@ -72,6 +85,7 @@ public function execute(array $keywords, int $assetId): void
                 $this->saveAssetLinks->execute($assetId, $this->getKeywordIds($data));
             }
         } catch (\Exception $exception) {
+            $this->logger->critical($exception);
             $message = __('An error occurred during save asset keyword: %1', $exception->getMessage());
             throw new CouldNotSaveException($message, $exception);
         }