Merge pull request #334 from cod40403/LYNX-699

LYNX-699 Cannot return null for non-nullable field TaxItem.title on placeOrder GQL

Author: deepak-soni1

app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php

@@ -8,16 +8,29 @@
 namespace Magento\SalesGraphQl\Model\Resolver;
 
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Tax\Api\OrderTaxManagementInterface;
 
 /**
  * Resolve order totals taxes and discounts for order
  */
 class OrderTotal implements ResolverInterface
 {
+
+    /**
+     * OrderTotal Constructor
+     *
+     * @param OrderTaxManagementInterface $orderTaxManagement
+     */
+    public function __construct(
+        private readonly OrderTaxManagementInterface $orderTaxManagement,
+    ) {
+    }
+
     /**
      * @inheritDoc
      */
@@ -35,10 +48,12 @@ public function resolve(
         /** @var OrderInterface $order */
         $order = $value['model'];
         $currency = $order->getOrderCurrencyCode();
-        $baseCurrency = $order->getBaseCurrencyCode();
 
         return [
-            'base_grand_total' => ['value' => $order->getBaseGrandTotal(), 'currency' => $baseCurrency],
+            'base_grand_total' => [
+                'value' => $order->getBaseGrandTotal(),
+                'currency' => $order->getBaseCurrencyCode()
+            ],
             'grand_total' => ['value' => $order->getGrandTotal(), 'currency' => $currency],
             'subtotal' => ['value' => $order->getSubtotal(), 'currency' => $currency],
             'subtotal_incl_tax' => ['value' => $order->getSubtotalInclTax(), 'currency' => $currency],
@@ -72,44 +87,40 @@ public function resolve(
      *
      * @param OrderInterface $order
      * @return array
+     * @throws NoSuchEntityException
      */
     private function getAllAppliedTaxesOnOrders(OrderInterface $order): array
     {
-        $extensionAttributes = $order->getExtensionAttributes();
-        $appliedTaxes = $extensionAttributes->getAppliedTaxes() ?? [];
-        $allAppliedTaxOnOrders = [];
-        foreach ($appliedTaxes as $taxIndex => $appliedTaxesData) {
-            $allAppliedTaxOnOrders[$taxIndex] = [
+        return array_map(
+            fn($appliedTaxesData) => [
                 'title' => $appliedTaxesData->getDataByKey('title'),
                 'percent' => $appliedTaxesData->getDataByKey('percent'),
                 'amount' => $appliedTaxesData->getDataByKey('amount'),
-            ];
-        }
-        return $allAppliedTaxOnOrders;
+            ],
+            $this->orderTaxManagement->getOrderTaxDetails($order->getEntityId())->getAppliedTaxes()
+        );
     }
 
     /**
      * Return taxes applied to the current order
      *
      * @param OrderInterface $order
      * @return array
+     * @throws NoSuchEntityException
      */
     private function getAppliedTaxesDetails(OrderInterface $order): array
     {
-        $allAppliedTaxOnOrders = $this->getAllAppliedTaxesOnOrders($order);
-        $taxes = [];
-        foreach ($allAppliedTaxOnOrders as $appliedTaxes) {
-            $appliedTaxesArray = [
+        return array_map(
+            fn($appliedTaxes) => [
                 'rate' => $appliedTaxes['percent'] ?? 0,
                 'title' => $appliedTaxes['title'] ?? null,
                 'amount' => [
                     'value' => $appliedTaxes['amount'] ?? 0,
                     'currency' => $order->getOrderCurrencyCode()
                 ]
-            ];
-            $taxes[] = $appliedTaxesArray;
-        }
-        return $taxes;
+            ],
+            $this->getAllAppliedTaxesOnOrders($order)
+        );
     }
 
     /**