Merge remote-tracking branch 'origin/AC1096' into Spartans_246_quality_graphql_mainlinepr

Author: glo24157

app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php

@@ -8,6 +8,7 @@
 namespace Magento\QuoteGraphQl\Model\Cart;
 
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Framework\GraphQl\Query\Uid;
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
 
@@ -24,9 +25,20 @@ class ExtractQuoteAddressData
     /**
      * @param ExtensibleDataObjectConverter $dataObjectConverter
      */
-    public function __construct(ExtensibleDataObjectConverter $dataObjectConverter)
-    {
+
+    /** @var Uid */
+    private Uid $uidEncoder;
+
+    /**
+     * @param ExtensibleDataObjectConverter $dataObjectConverter
+     * @param Uid $uidEncoder
+     */
+    public function __construct(
+        ExtensibleDataObjectConverter $dataObjectConverter,
+        Uid $uidEncoder
+    ) {
         $this->dataObjectConverter = $dataObjectConverter;
+        $this->uidEncoder = $uidEncoder;
     }
 
     /**
@@ -52,6 +64,7 @@ public function execute(QuoteAddress $address): array
                     'label' => $address->getRegion(),
                     'region_id'=> $address->getRegionId()
                 ],
+                'uid' => $this->uidEncoder->encode((string)$address->getAddressId()) ,
                 'street' => $address->getStreet(),
                 'items_weight' => $address->getWeight(),
                 'customer_notes' => $address->getCustomerNotes()

app/code/Magento/QuoteGraphQl/etc/schema.graphqls

@@ -221,6 +221,7 @@ type Cart @doc(description: "Contains the contents and other details about a gue
 }
 
 interface CartAddressInterface @typeResolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\CartAddressTypeResolver") {
+    uid: String! @doc(description: "The unique id of the customer address.")
     firstname: String! @doc(description: "The first name of the customer or guest.")
     lastname: String! @doc(description: "The last name of the customer or guest.")
     company: String @doc(description: "The company specified for the billing or shipping address.")

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/GetSpecifiedShippingAddressTest.php

@@ -52,8 +52,9 @@ public function testGetSpecifiedShippingAddress()
         $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
         self::assertArrayHasKey('cart', $response);
         self::assertArrayHasKey('shipping_addresses', $response['cart']);
-
+        $uid = $response['cart']['shipping_addresses'][0]['uid'];
         $expectedShippingAddressData = [
+            'uid' => $uid,
             'firstname' => 'John',
             'lastname' => 'Smith',
             'company' => 'CompanyName',
@@ -160,18 +161,19 @@ private function getQuery(string $maskedQuoteId): string
 {
   cart(cart_id: "$maskedQuoteId") {
     shipping_addresses {
+      uid
       firstname
       lastname
       company
       street
       city
-      region 
+      region
       {
         code
         label
       }
       postcode
-      country 
+      country
       {
         code
         label