[Magento Community Engineering] Community Contributions - 2.4-develop

 - merged latest code from mainline branch

Author: magento-engcom-team

app/code/Magento/AsynchronousOperations/Model/MassSchedule.php

@@ -53,7 +53,7 @@ class MassSchedule
     private $logger;
 
     /**
-     * @var OperationRepository
+     * @var OperationRepositoryInterface
      */
     private $operationRepository;
 
@@ -75,7 +75,7 @@ class MassSchedule
      * @param AsyncResponseInterfaceFactory $asyncResponseFactory
      * @param BulkManagementInterface $bulkManagement
      * @param LoggerInterface $logger
-     * @param OperationRepository $operationRepository
+     * @param OperationRepositoryInterface $operationRepository
      * @param UserContextInterface $userContext
      * @param Encryptor $encryptor
      */
@@ -85,7 +85,7 @@ public function __construct(
         AsyncResponseInterfaceFactory $asyncResponseFactory,
         BulkManagementInterface $bulkManagement,
         LoggerInterface $logger,
-        OperationRepository $operationRepository,
+        OperationRepositoryInterface $operationRepository,
         UserContextInterface $userContext,
         Encryptor $encryptor
     ) {
@@ -137,7 +137,7 @@ public function publishMass($topicName, array $entitiesArray, $groupId = null, $
             $requestItem = $this->itemStatusInterfaceFactory->create();
 
             try {
-                $operation = $this->operationRepository->createByTopic($topicName, $entityParams, $groupId);
+                $operation = $this->operationRepository->create($topicName, $entityParams, $groupId, $key);
                 $operations[] = $operation;
                 $requestItem->setId($key);
                 $requestItem->setStatus(ItemStatusInterface::STATUS_ACCEPTED);

app/code/Magento/AsynchronousOperations/Model/OperationRepositoryInterface.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+
+/**
+ * Repository interface to create operation
+ */
+interface OperationRepositoryInterface
+{
+    /**
+     * Create operation by topic, parameters and group ID
+     *
+     * @param string $topicName
+     * @param array $entityParams
+     * format: array(
+     *     '<arg1-name>' => '<arg1-value>',
+     *     '<arg2-name>' => '<arg2-value>',
+     * )
+     * @param string $groupId
+     * @param int $operationId
+     * @return OperationInterface
+     */
+    public function create($topicName, $entityParams, $groupId, $operationId): OperationInterface;
+}

app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php

@@ -10,6 +10,7 @@
 
 use Magento\AsynchronousOperations\Api\Data\OperationInterface;
 use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
+use Magento\AsynchronousOperations\Model\OperationRepositoryInterface;
 use Magento\Framework\MessageQueue\MessageValidator;
 use Magento\Framework\MessageQueue\MessageEncoder;
 use Magento\Framework\Serialize\Serializer\Json;
@@ -18,10 +19,10 @@
 /**
  * Create operation for list of bulk operations.
  */
-class OperationRepository
+class OperationRepository implements OperationRepositoryInterface
 {
     /**
-     * @var \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory
+     * @var OperationInterfaceFactory
      */
     private $operationFactory;
 
@@ -67,10 +68,14 @@ public function __construct(
     }
 
     /**
-     * @param $topicName
-     * @param $entityParams
-     * @param $groupId
-     * @return mixed
+     * Create operation by topic, parameters and group ID
+     *
+     * @param string $topicName
+     * @param array $entityParams
+     * @param string $groupId
+     * @return OperationInterface
+     * @deprecated No longer used.
+     * @see create()
      */
     public function createByTopic($topicName, $entityParams, $groupId)
     {
@@ -91,8 +96,16 @@ public function createByTopic($topicName, $entityParams, $groupId)
             ],
         ];
 
-        /** @var \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation */
+        /** @var OperationInterface $operation */
         $operation = $this->operationFactory->create($data);
         return $this->entityManager->save($operation);
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function create($topicName, $entityParams, $groupId, $operationId): OperationInterface
+    {
+        return $this->createByTopic($topicName, $entityParams, $groupId);
+    }
 }

app/code/Magento/AsynchronousOperations/etc/di.xml

@@ -18,6 +18,7 @@
     <preference for="Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface" type="Magento\AsynchronousOperations\Model\BulkStatus\Short" />
     <preference for="Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface" type="Magento\AsynchronousOperations\Model\OperationSearchResults" />
     <preference for="Magento\AsynchronousOperations\Api\OperationRepositoryInterface" type="Magento\AsynchronousOperations\Model\OperationRepository" />
+    <preference for="Magento\AsynchronousOperations\Model\OperationRepositoryInterface" type="Magento\AsynchronousOperations\Model\ResourceModel\Operation\OperationRepository" />
     <type name="Magento\Framework\EntityManager\MetadataPool">
         <arguments>
             <argument name="metadata" xsi:type="array">

app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml renamed to app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest.xml

@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="CreateAnAdminOrderUsingBraintreePaymentTest1">
+    <test name="CreateAnAdminOrderUsingBraintreePaymentTest1Test">
         <annotations>
             <features value="Backend"/>
             <stories value="Creation an admin order using Braintree payment"/>

app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscount.xml renamed to app/code/Magento/Braintree/Test/Mftf/Test/CretateAdminOrderWithOnlinePaymentIncludingTaxAndDiscountTest.xml

@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="CreateAdminOrderPayedWithOnlinePaymentIncludingTaxAndDiscount">
+    <test name="CreateAdminOrderPayedWithOnlinePaymentIncludingTaxAndDiscountTest">
         <annotations>
             <features value="Braintree"/>
             <stories value="Get access to a New Credit Memo Page from Invoice for Order payed with online payment via Admin"/>

app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProduct.xml renamed to app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml

@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminDeleteABundleProduct">
+    <test name="AdminDeleteABundleProductTest">
         <annotations>
             <features value="Bundle"/>
             <stories value="Admin list bundle products"/>

app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProduct.xml renamed to app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml

@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminFilterProductListByBundleProduct">
+    <test name="AdminFilterProductListByBundleProductTest">
         <annotations>
             <features value="Bundle"/>
             <stories value="Admin list bundle products"/>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGrid.xml renamed to app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml

@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontBundleProductShownInCategoryListAndGrid">
+    <test name="StorefrontBundleProductShownInCategoryListAndGridTest">
         <annotations>
             <features value="Bundle"/>
             <stories value="Bundle products list on Storefront"/>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPrices.xml renamed to app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCheckBundleProductOptionTierPricesTest.xml

@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontCheckBundleProductOptionTierPrices">
+    <test name="StorefrontCheckBundleProductOptionTierPricesTest">
         <annotations>
             <features value="Bundle"/>
             <stories value="View bundle products"/>