ENGCOM-4441: address_type is null after setting billing and shipping addresses on cart #415

naydav · web-flow · commit 8b838d7d78d1 · 2019-03-05T12:27:57.000-06:00
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromAddress.php b/app/code/Magento/QuoteGraphQl/Model/Cart/ExtractDataFromAddress.php
@@ -42,6 +42,7 @@ public function execute(QuoteAddress $address): array
 
         $addressData = array_merge($addressData, [
             'address_id' => $address->getId(),
+            'address_type' => $address->getAddressType(),
             'country' => [
                 'code' => $address->getCountryId(),
                 'label' => $address->getCountry()
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetBillingAddressOnCartTest.php
@@ -90,6 +90,7 @@ public function testSetNewBillingAddress()
           code
           label
         }
+        address_type
       }
     }
   }
@@ -147,6 +148,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
           code
           label
         }
+        address_type
       }
       shipping_addresses {
         firstname
@@ -160,6 +162,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
           code
           label
         }
+        address_type
       }
     }
   }
@@ -174,7 +177,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
         self::assertArrayHasKey('shipping_addresses', $cartResponse);
         $shippingAddressResponse = current($cartResponse['shipping_addresses']);
         $this->assertNewAddressFields($billingAddressResponse);
-        $this->assertNewAddressFields($shippingAddressResponse);
+        $this->assertNewAddressFields($shippingAddressResponse, 'shipping');
     }
 
     /**
@@ -403,9 +406,10 @@ public function testSetBillingAddressIfCustomerIsNotOwnerOfAddress()
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
-     * @param array $billingAddressResponse
+     * @param array $addressResponse
+     * @param string $addressType
      */
-    private function assertNewAddressFields(array $billingAddressResponse): void
+    private function assertNewAddressFields(array $addressResponse, string $addressType = 'billing'): void
     {
         $assertionMap = [
             ['response_field' => 'firstname', 'expected_value' => 'test firstname'],
@@ -416,9 +420,10 @@ private function assertNewAddressFields(array $billingAddressResponse): void
             ['response_field' => 'postcode', 'expected_value' => '887766'],
             ['response_field' => 'telephone', 'expected_value' => '88776655'],
             ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
+            ['response_field' => 'address_type', 'expected_value' => $addressType]
         ];
 
-        $this->assertResponseFields($billingAddressResponse, $assertionMap);
+        $this->assertResponseFields($addressResponse, $assertionMap);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetBillingAddressOnCartTest.php
@@ -82,6 +82,7 @@ public function testSetNewBillingAddress()
           code
           label
         }
+        address_type
       }
     }
   }
@@ -138,6 +139,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
           code
           label
         }
+        address_type
       }
       shipping_addresses {
         firstname
@@ -151,6 +153,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
           code
           label
         }
+        address_type
       }
     }
   }
@@ -165,7 +168,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()
         self::assertArrayHasKey('shipping_addresses', $cartResponse);
         $shippingAddressResponse = current($cartResponse['shipping_addresses']);
         $this->assertNewAddressFields($billingAddressResponse);
-        $this->assertNewAddressFields($shippingAddressResponse);
+        $this->assertNewAddressFields($shippingAddressResponse, 'shipping');
     }
 
     /**
@@ -244,9 +247,10 @@ public function testSetBillingAddressFromAddressBook()
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *
-     * @param array $billingAddressResponse
+     * @param array $addressResponse
+     * @param string $addressType
      */
-    private function assertNewAddressFields(array $billingAddressResponse): void
+    private function assertNewAddressFields(array $addressResponse, string $addressType = 'billing'): void
     {
         $assertionMap = [
             ['response_field' => 'firstname', 'expected_value' => 'test firstname'],
@@ -257,9 +261,10 @@ private function assertNewAddressFields(array $billingAddressResponse): void
             ['response_field' => 'postcode', 'expected_value' => '887766'],
             ['response_field' => 'telephone', 'expected_value' => '88776655'],
             ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
+            ['response_field' => 'address_type', 'expected_value' => $addressType]
         ];
 
-        $this->assertResponseFields($billingAddressResponse, $assertionMap);
+        $this->assertResponseFields($addressResponse, $assertionMap);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/SetShippingAddressOnCartTest.php
@@ -94,6 +94,7 @@ public function testSetNewShippingAddressByGuest()
           code
           label
         }
+        address_type
       }
     }
   }
@@ -184,6 +185,7 @@ public function testSetNewShippingAddressByRegisteredCustomer()
           label
           code
         }
+        address_type
       }
     }
   }
@@ -472,6 +474,7 @@ private function assertNewShippingAddressFields(array $shippingAddressResponse):
             ['response_field' => 'postcode', 'expected_value' => '887766'],
             ['response_field' => 'telephone', 'expected_value' => '88776655'],
             ['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],
+            ['response_field' => 'address_type', 'expected_value' => 'shipping']
         ];
 
         $this->assertResponseFields($shippingAddressResponse, $assertionMap);

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ public function testSetNewBillingAddress()`
`90`	`90`	`code`
`91`	`91`	`label`
`92`	`92`	`}`
	`93`	`+ address_type`
`93`	`94`	`}`
`94`	`95`	`}`
`95`	`96`	`}`
`@@ -147,6 +148,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()`
`147`	`148`	`code`
`148`	`149`	`label`
`149`	`150`	`}`
	`151`	`+ address_type`
`150`	`152`	`}`
`151`	`153`	`shipping_addresses {`
`152`	`154`	`firstname`
`@@ -160,6 +162,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()`
`160`	`162`	`code`
`161`	`163`	`label`
`162`	`164`	`}`
	`165`	`+ address_type`
`163`	`166`	`}`
`164`	`167`	`}`
`165`	`168`	`}`
`@@ -174,7 +177,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()`
`174`	`177`	`self::assertArrayHasKey('shipping_addresses', $cartResponse);`
`175`	`178`	`$shippingAddressResponse = current($cartResponse['shipping_addresses']);`
`176`	`179`	`$this->assertNewAddressFields($billingAddressResponse);`
`177`		`- $this->assertNewAddressFields($shippingAddressResponse);`
	`180`	`+ $this->assertNewAddressFields($shippingAddressResponse, 'shipping');`
`178`	`181`	`}`
`179`	`182`
`180`	`183`	`/**`
`@@ -403,9 +406,10 @@ public function testSetBillingAddressIfCustomerIsNotOwnerOfAddress()`
`403`	`406`	`/**`
`404`	`407`	`* Verify the all the whitelisted fields for a New Address Object`
`405`	`408`	`*`
`406`		`- * @param array $billingAddressResponse`
	`409`	`+ * @param array $addressResponse`
	`410`	`+ * @param string $addressType`
`407`	`411`	`*/`
`408`		`- private function assertNewAddressFields(array $billingAddressResponse): void`
	`412`	`+ private function assertNewAddressFields(array $addressResponse, string $addressType = 'billing'): void`
`409`	`413`	`{`
`410`	`414`	`$assertionMap = [`
`411`	`415`	`['response_field' => 'firstname', 'expected_value' => 'test firstname'],`
`@@ -416,9 +420,10 @@ private function assertNewAddressFields(array $billingAddressResponse): void`
`416`	`420`	`['response_field' => 'postcode', 'expected_value' => '887766'],`
`417`	`421`	`['response_field' => 'telephone', 'expected_value' => '88776655'],`
`418`	`422`	`['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],`
	`423`	`+ ['response_field' => 'address_type', 'expected_value' => $addressType]`
`419`	`424`	`];`
`420`	`425`
`421`		`- $this->assertResponseFields($billingAddressResponse, $assertionMap);`
	`426`	`+ $this->assertResponseFields($addressResponse, $assertionMap);`
`422`	`427`	`}`
`423`	`428`
`424`	`429`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public function testSetNewBillingAddress()`
`82`	`82`	`code`
`83`	`83`	`label`
`84`	`84`	`}`
	`85`	`+ address_type`
`85`	`86`	`}`
`86`	`87`	`}`
`87`	`88`	`}`
`@@ -138,6 +139,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()`
`138`	`139`	`code`
`139`	`140`	`label`
`140`	`141`	`}`
	`142`	`+ address_type`
`141`	`143`	`}`
`142`	`144`	`shipping_addresses {`
`143`	`145`	`firstname`
`@@ -151,6 +153,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()`
`151`	`153`	`code`
`152`	`154`	`label`
`153`	`155`	`}`
	`156`	`+ address_type`
`154`	`157`	`}`
`155`	`158`	`}`
`156`	`159`	`}`
`@@ -165,7 +168,7 @@ public function testSetNewBillingAddressWithUseForShippingParameter()`
`165`	`168`	`self::assertArrayHasKey('shipping_addresses', $cartResponse);`
`166`	`169`	`$shippingAddressResponse = current($cartResponse['shipping_addresses']);`
`167`	`170`	`$this->assertNewAddressFields($billingAddressResponse);`
`168`		`- $this->assertNewAddressFields($shippingAddressResponse);`
	`171`	`+ $this->assertNewAddressFields($shippingAddressResponse, 'shipping');`
`169`	`172`	`}`
`170`	`173`
`171`	`174`	`/**`
`@@ -244,9 +247,10 @@ public function testSetBillingAddressFromAddressBook()`
`244`	`247`	`/**`
`245`	`248`	`* Verify the all the whitelisted fields for a New Address Object`
`246`	`249`	`*`
`247`		`- * @param array $billingAddressResponse`
	`250`	`+ * @param array $addressResponse`
	`251`	`+ * @param string $addressType`
`248`	`252`	`*/`
`249`		`- private function assertNewAddressFields(array $billingAddressResponse): void`
	`253`	`+ private function assertNewAddressFields(array $addressResponse, string $addressType = 'billing'): void`
`250`	`254`	`{`
`251`	`255`	`$assertionMap = [`
`252`	`256`	`['response_field' => 'firstname', 'expected_value' => 'test firstname'],`
`@@ -257,9 +261,10 @@ private function assertNewAddressFields(array $billingAddressResponse): void`
`257`	`261`	`['response_field' => 'postcode', 'expected_value' => '887766'],`
`258`	`262`	`['response_field' => 'telephone', 'expected_value' => '88776655'],`
`259`	`263`	`['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],`
	`264`	`+ ['response_field' => 'address_type', 'expected_value' => $addressType]`
`260`	`265`	`];`
`261`	`266`
`262`		`- $this->assertResponseFields($billingAddressResponse, $assertionMap);`
	`267`	`+ $this->assertResponseFields($addressResponse, $assertionMap);`
`263`	`268`	`}`
`264`	`269`
`265`	`270`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ public function testSetNewShippingAddressByGuest()`
`94`	`94`	`code`
`95`	`95`	`label`
`96`	`96`	`}`
	`97`	`+ address_type`
`97`	`98`	`}`
`98`	`99`	`}`
`99`	`100`	`}`
`@@ -184,6 +185,7 @@ public function testSetNewShippingAddressByRegisteredCustomer()`
`184`	`185`	`label`
`185`	`186`	`code`
`186`	`187`	`}`
	`188`	`+ address_type`
`187`	`189`	`}`
`188`	`190`	`}`
`189`	`191`	`}`
`@@ -472,6 +474,7 @@ private function assertNewShippingAddressFields(array $shippingAddressResponse):`
`472`	`474`	`['response_field' => 'postcode', 'expected_value' => '887766'],`
`473`	`475`	`['response_field' => 'telephone', 'expected_value' => '88776655'],`
`474`	`476`	`['response_field' => 'country', 'expected_value' => ['code' => 'US', 'label' => 'US']],`
	`477`	`+ ['response_field' => 'address_type', 'expected_value' => 'shipping']`
`475`	`478`	`];`
`476`	`479`
`477`	`480`	`$this->assertResponseFields($shippingAddressResponse, $assertionMap);`