MC-35653:MyAccount :: Order Details :: Payments Methods, shipping address, billing address by Order Number

- Added changes from review

Author: avattam06

app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php

@@ -23,7 +23,7 @@ class OrderAddress
      */
     public function getOrderShippingAddress(
         OrderInterface $order
-    ) {
+    ): ?array {
         $shippingAddress = null;
         if ($order->getShippingAddress()) {
             $shippingAddress = $this->orderAddressDataFormatter($order->getShippingAddress());
@@ -39,7 +39,7 @@ public function getOrderShippingAddress(
      */
     public function getOrderBillingAddress(
         OrderInterface $order
-    ) {
+    ): ?array {
         $billingAddress = null;
         if ($order->getBillingAddress()) {
             $billingAddress = $this->orderAddressDataFormatter($order->getBillingAddress());

app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php

@@ -25,8 +25,8 @@ public function getOrderPaymentMethod(OrderInterface $orderModel): array
         $orderPayment = $orderModel->getPayment();
         return [
             [
-                'name' => $orderPayment->getAdditionalInformation()['method_title'] ?? 'method_title',
-                'type' => $orderPayment->getMethod() ?? null,
+                'name' => $orderPayment->getAdditionalInformation()['method_title'] ?? ' ',
+                'type' => $orderPayment->getMethod(),
                 'additional_data' => []
             ]
         ];

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php

@@ -63,11 +63,51 @@ public function testGetCustomerOrdersSimpleProductQuery()
       number
       status
       order_date
-      payment_methods{name type additional_data{ name value}}
-      shipping_address{firstname lastname city company country_code fax middlename postcode prefix street region
-      region_id suffix telephone vat_id}
-      billing_address{firstname lastname city company country_code fax middlename postcode prefix street region
-      region_id suffix telephone vat_id}
+      payment_methods
+      {
+        name
+        type
+        additional_data
+        {
+         name
+         value
+         }
+      }
+      shipping_address {
+          firstname
+          lastname
+          city
+          company
+          country_code
+          fax
+          middlename
+          postcode
+          prefix
+          street
+          region
+          region_id
+          suffix
+          telephone
+          vat_id
+        }
+        billing_address
+        {
+          firstname
+          lastname
+          city
+          company
+          country_code
+          fax
+          middlename
+          postcode
+          prefix
+          region
+          region_id
+          street
+          suffix
+          telephone
+          vat_id
+        }
       items{
         quantity_ordered
         product_sku
@@ -1300,12 +1340,52 @@ private function getCustomerOrderQuery($orderNumber): array
            number
            order_date
            status
-           payment_methods{name type additional_data{ name value}}
-           shipping_address{firstname lastname city company country_code fax middlename postcode prefix street region
-           region_id suffix telephone vat_id}
-           billing_address{firstname lastname city company country_code fax middlename postcode prefix street region
-           region_id suffix telephone vat_id}
-           items{product_name product_sku quantity_ordered discounts {amount{value currency} label}}
+           payment_methods
+           {
+            name
+            type
+            additional_data
+            {
+            name
+            value
+            }
+            }
+         shipping_address {
+          firstname
+          lastname
+          city
+          company
+          country_code
+          fax
+          middlename
+          postcode
+          prefix
+          street
+          region
+          region_id
+          suffix
+          telephone
+          vat_id
+        }
+        billing_address
+        {
+          firstname
+          lastname
+          city
+          company
+          country_code
+          fax
+          middlename
+          postcode
+          prefix
+          region
+          region_id
+          street
+          suffix
+          telephone
+          vat_id
+        }
+        items{product_name product_sku quantity_ordered discounts {amount{value currency} label}}
            total {
              base_grand_total{value currency}
              grand_total{value currency}