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

- Added test assertions

Author: avattam06

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

@@ -7,12 +7,11 @@
 
 namespace Magento\SalesGraphQl\Model\Order;
 
-use Magento\Quote\Model\Quote\Address;
 use Magento\Sales\Api\Data\OrderAddressInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 
 /**
- * Class to fetch the order address details
+ * Class to get the order address details
  */
 class OrderAddress
 {
@@ -26,11 +25,8 @@ public function getOrderShippingAddress(
         OrderInterface $order
     ) {
         $shippingAddress = null;
-        $orderShippingAddress = $order->getShippingAddress() ?? null;
-        if ($orderShippingAddress) {
-            if ($orderShippingAddress->getAddressType()  === ADDRESS::TYPE_SHIPPING) {
-                $shippingAddress = $this->OrderAddressDataFormatter($orderShippingAddress);
-            }
+        if ($order->getShippingAddress()) {
+            $shippingAddress = $this->OrderAddressDataFormatter($order->getShippingAddress());
         }
         return $shippingAddress;
     }
@@ -45,11 +41,8 @@ public function getOrderBillingAddress(
         OrderInterface $order
     ) {
         $billingAddress = null;
-        $orderBillingAddress = $order->getBillingAddress() ?? null;
-        if ($orderBillingAddress) {
-            if ($orderBillingAddress->getAddressType() === ADDRESS::TYPE_BILLING) {
-                $billingAddress = $this->OrderAddressDataFormatter($orderBillingAddress);
-            }
+        if ($order->getBillingAddress()) {
+            $billingAddress = $this->OrderAddressDataFormatter($order->getBillingAddress());
         }
         return $billingAddress;
     }

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

@@ -10,7 +10,7 @@
 use Magento\Sales\Api\Data\OrderInterface;
 
 /**
- * Class to fetch the order payment details
+ * Class to get the order payment details
  */
 class OrderPayments
 {
@@ -21,37 +21,11 @@ class OrderPayments
     public function getOrderPaymentMethod(OrderInterface $orderModel): array
     {
         $orderPayment = $orderModel->getPayment();
-        $paymentAdditionalInfo =  $orderModel->getExtensionAttributes()->getPaymentAdditionalInfo();
-        $paymentAdditionalData = [];
-        foreach ($paymentAdditionalInfo as $key => $paymentAdditionalInfoDetails) {
-            $paymentAdditionalData[$key]['name'] = $paymentAdditionalInfoDetails->getKey();
-            $paymentAdditionalData[$key]['value'] = $paymentAdditionalInfoDetails->getValue();
-        }
-        $additionalInformationCcType = $orderPayment->getCcType();
-        $additionalInformationCcNumber = $orderPayment->getCcLast4();
-        if ($orderPayment->getMethod() === 'checkmo' || $orderPayment->getMethod() === 'free' ||
-            $orderPayment->getMethod() === 'purchaseorder' ||$orderPayment->getMethod() === 'cashondelivery' ||
-            $orderPayment->getMethod() === 'banktransfer'
-        ) {
-            $additionalData = [];
-        } else {
-            $additionalData = [
-                [
-                    'name' => 'Credit Card Type',
-                    'value' => $additionalInformationCcType ?? null
-                ],
-                [
-                    'name' => 'Credit Card Number',
-                    'value' => $additionalInformationCcNumber ?? null
-                ]
-            ];
-        }
-
         return [
             [
-                'name' => $orderPayment->getAdditionalInformation()['method_title'] ?? null,
+                'name' => $orderPayment->getAdditionalInformation()['method_title'] ?? 'method_title',
                 'type' => $orderPayment->getMethod() ?? null,
-                'additional_data' => $additionalData
+                'additional_data' => []
             ]
         ];
     }

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

@@ -63,6 +63,11 @@ 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}
       items{
         quantity_ordered
         product_sku
@@ -105,6 +110,9 @@ public function testGetCustomerOrdersSimpleProductQuery()
         $customerOrderItemsInResponse = $response['customer']['orders']['items'][0];
         $this->assertArrayHasKey('items', $customerOrderItemsInResponse);
         $this->assertNotEmpty($customerOrderItemsInResponse['items']);
+        $this->assertNotEmpty($response["customer"]["orders"]["items"][0]["billing_address"]);
+        $this->assertNotEmpty($response["customer"]["orders"]["items"][0]["shipping_address"]);
+        $this->assertNotEmpty($response["customer"]["orders"]["items"][0]["payment_methods"]);
 
         $searchCriteria = $this->searchCriteriaBuilder->addFilter('increment_id', '100000002')
             ->create();
@@ -154,6 +162,9 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
         $this->setPaymentMethod($cartId, $paymentMethod);
         $orderNumber = $this->placeOrder($cartId);
         $customerOrderResponse = $this->getCustomerOrderQuery($orderNumber);
+        $this->assertOrderBillingAddress($customerOrderResponse[0]["billing_address"]);
+        $this->assertOrderShippingAddress($customerOrderResponse[0]["shipping_address"]);
+        $this->assertOrderPaymentMethod($customerOrderResponse[0]["payment_methods"]);
         // Asserting discounts on order item level
         $this->assertEquals(4, $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['value']);
         $this->assertEquals('USD', $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['currency']);
@@ -166,6 +177,77 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
         $this->deleteOrder();
     }
 
+    /**
+     * Check order billing address
+     *
+     * @param array $customerOrderBillingAddress
+     */
+    private function assertOrderBillingAddress(array $customerOrderBillingAddress): void
+    {
+        $assertionMap = [
+            'firstname' => 'John',
+            'lastname' => 'Smith',
+            'city' => 'Texas City',
+            'company' => 'Test company',
+            'country_code' => 'US',
+            'postcode' => '78717',
+            'prefix' => 'John',
+            'region' => 'Texas',
+            'region_id' => '57',
+            'street' => [
+                0 => 'test street 1',
+                1 => 'test street 2',
+            ],
+            'suffix' => 'John',
+            'telephone' => '5123456677'
+        ];
+        $this->assertResponseFields($customerOrderBillingAddress, $assertionMap);
+    }
+
+    /**
+     * Check order shipping address
+     *
+     * @param array $customerOrderShippingAddress
+     */
+    private function assertOrderShippingAddress(array $customerOrderShippingAddress): void
+    {
+        $assertionMap = [
+            'firstname' => 'test shipFirst',
+            'lastname' => 'test shipLast',
+            'city' => 'Montgomery',
+            'company' => 'test company',
+            'country_code' => 'US',
+            'postcode' => '36013',
+            'prefix' => 'test shipFirst',
+            'street' => [
+                0 => 'test street 1',
+                1 => 'test street 2',
+            ],
+            'region_id' => '1',
+            'region' => 'Alabama',
+            'suffix' => 'test shipFirst',
+            'telephone' => '3347665522'
+        ];
+        $this->assertResponseFields($customerOrderShippingAddress, $assertionMap);
+    }
+
+    /**
+     * Check order payment method
+     *
+     * @param array $customerOrderPaymentMethod
+     */
+    private function assertOrderPaymentMethod(array $customerOrderPaymentMethod): void
+    {
+        $assertionMap = [
+            [
+                'name' => 'Check / Money order',
+                'type' => 'checkmo',
+                'additional_data' => []
+            ]
+        ];
+        $this->assertResponseFields($customerOrderPaymentMethod, $assertionMap);
+    }
+
     /**
      * @param array $customerOrderItemTotal
      */
@@ -1218,6 +1300,11 @@ 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}}
            total {
              base_grand_total{value currency}