Merge remote-tracking branch 'origin/2.4-develop' into MC-25022

Author: oleg-onufer

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminSetStoreInformationConfigurationActionGroup.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSetStoreInformationConfigurationActionGroup">
+        <annotations>
+            <description>Set Store Information configurations</description>
+        </annotations>
+        <arguments>
+            <argument name="storeName" type="string" defaultValue="{{AdminGeneralSetStoreNameConfigData.value}}"/>
+            <argument name="storeHoursOfOperation" type="string" defaultValue="{{AdminGeneralSetStoreHoursConfigData.value}}"/>
+            <argument name="vatNumber" type="string" defaultValue="{{AdminGeneralSetVatNumberConfigData.value}}"/>
+            <argument name="telephone" type="string" defaultValue="{{US_Address_TX.telephone}}"/>
+            <argument name="country" type="string" defaultValue="{{US_Address_TX.country_id}}"/>
+            <argument name="state" type="string" defaultValue="{{US_Address_TX.state}}"/>
+            <argument name="city" type="string" defaultValue="{{US_Address_TX.city}}"/>
+            <argument name="postcode" type="string" defaultValue="{{US_Address_TX.postcode}}"/>
+            <argument name="street" type="string" defaultValue="{{US_Address_TX.street[0]}}"/>
+        </arguments>
+        <magentoCLI command="config:set {{AdminGeneralSetStoreNameConfigData.path}} '{{storeName}}'" stepKey="setStoreInformationName"/>
+        <magentoCLI command="config:set {{AdminGeneralSetStorePhoneConfigData.path}} '{{telephone}}'" stepKey="setStoreInformationPhone"/>
+        <magentoCLI command="config:set {{AdminGeneralSetStoreHoursConfigData.path}} '{{storeHoursOfOperation}}'" stepKey="setStoreHoursInformation"/>
+        <magentoCLI command="config:set {{AdminGeneralSetCountryConfigData.path}} '{{country}}'" stepKey="setStoreInformationCountry"/>
+        <magentoCLI command="config:set {{AdminGeneralSetStateConfigData.path}} '{{state}}'" stepKey="setStoreInformationState"/>
+        <magentoCLI command="config:set {{AdminGeneralSetCityConfigData.path}} '{{city}}'" stepKey="setStoreInformationCity"/>
+        <magentoCLI command="config:set {{AdminGeneralSetPostcodeConfigData.path}} '{{postcode}}'" stepKey="setStoreInformationPostcode"/>
+        <magentoCLI command="config:set {{AdminGeneralSetStreetAddressConfigData.path}} '{{street}}'" stepKey="setStoreInformationStreetAddress"/>
+        <magentoCLI command="config:set {{AdminGeneralSetVatNumberConfigData.path}} '{{vatNumber}}'" stepKey="setStoreInformationVatNumber"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/Data/AdminGeneralStoreInfomationConfigData.xml

@@ -30,4 +30,11 @@
     <entity name="AdminGeneralSetStreetAddress2ConfigData">
         <data key="path">general/store_information/street_line2</data>
     </entity>
+    <entity name="AdminGeneralSetStateConfigData">
+        <data key="path">general/store_information/region_id</data>
+    </entity>
+    <entity name="AdminGeneralSetStoreHoursConfigData">
+        <data key="path">general/store_information/hours</data>
+        <data key="value">8AM-8PM</data>
+    </entity>
 </entities>

app/code/Magento/Catalog/Model/Product/Webapi/ProductOutputProcessor.php

@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Webapi;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Webapi\Request;
+use Magento\Framework\Webapi\Rest\Request\DeserializerInterface;
+
+/**
+ * Class for checking empty array and remove it from the output result
+ */
+class ProductOutputProcessor
+{
+    /**
+     * @var Request
+     */
+    private $request;
+
+    /**
+     * @var DeserializerInterface
+     */
+    private $deserializer;
+
+    /**
+     * @param Request $request
+     * @param DeserializerInterface $deserializer
+     */
+    public function __construct(
+        Request $request,
+        DeserializerInterface $deserializer
+    ) {
+        $this->request = $request;
+        $this->deserializer = $deserializer;
+    }
+
+    /**
+     * Removing attribute from the result array if its null or empty
+     *
+     * @param ProductInterface $product
+     * @param array $result
+     * @return array
+     */
+    public function execute(
+        ProductInterface $product,
+        array $result
+    ): array {
+        $requestContent = $this->request->getContent() ?? [];
+        if (empty($requestContent)) {
+            return $result;
+        }
+        $requestContentDetails = (array)$this->deserializer->deserialize($requestContent);
+        $requestProductList = $this->extractProductList($requestContentDetails);
+
+        $requestProductList = array_filter(
+            $requestProductList,
+            function ($requestProduct) use ($product) {
+                return isset($requestProduct['sku']) && $requestProduct['sku'] === $product->getSku();
+            }
+        );
+
+        if (empty($requestProductList)) {
+            return $result;
+        }
+
+        $requestProduct = current($requestProductList);
+
+        if (empty($product->getTierPrices()) && !array_key_exists('tier_prices', $requestProduct)) {
+            unset($result['tier_prices']);
+        }
+
+        if (empty($product->getProductLinks()) && !array_key_exists('product_links', $requestProduct)) {
+            unset($result['product_links']);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Extract product list from the request content details
+     *
+     * @param array $contentDetails
+     * @return array
+     */
+    private function extractProductList(array $contentDetails): array
+    {
+        $productList = [];
+        $arrayIterator = new \RecursiveArrayIterator($contentDetails);
+        $iterator = new \RecursiveIteratorIterator($arrayIterator, \RecursiveIteratorIterator::SELF_FIRST);
+        foreach ($iterator as $iteratorKey => $iteratorValue) {
+            if ($iteratorKey === 'product') {
+                array_push($productList, $iteratorValue);
+            }
+        }
+        return $productList;
+    }
+}