ENGCOM-4138: Provide available shipping rates for addresses #339

magento · Feb 14, 2019 · 2d09e02 · 2d09e02
2 parents 3acf405 + c39db0d
commit 2d09e02
Show file tree

Hide file tree

Showing 12 changed files with 340 additions and 328 deletions.
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/Address/AddressDataProvider.php b/app/code/Magento/QuoteGraphQl/Model/Cart/Address/AddressDataProvider.php
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/Address/BillingAddressDataProvider.php b/app/code/Magento/QuoteGraphQl/Model/Cart/Address/BillingAddressDataProvider.php
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/Address/ShippingAddressesDataProvider.php b/app/code/Magento/QuoteGraphQl/Model/Cart/Address/ShippingAddressesDataProvider.php
diff --git a/...hQl/Model/Cart/Address/Mapper/Address.php → ...hQl/Model/Cart/ExtractDataFromAddress.php b/...hQl/Model/Cart/Address/Mapper/Address.php → ...hQl/Model/Cart/ExtractDataFromAddress.php
@@ -5,26 +5,42 @@
  */
 declare(strict_types=1);
 
-namespace Magento\QuoteGraphQl\Model\Cart\Address\Mapper;
+namespace Magento\QuoteGraphQl\Model\Cart;
 
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
 
 /**
- * Class Address
- *
  * Extract the necessary address fields from an Address model
  */
-class Address
+class ExtractDataFromAddress
 {
     /**
-     * Converts Address model data to nested array
+     * @var ExtensibleDataObjectConverter
+     */
+    private $dataObjectConverter;
+
+    /**
+     * @param ExtensibleDataObjectConverter $dataObjectConverter
+     */
+    public function __construct(ExtensibleDataObjectConverter $dataObjectConverter)
+    {
+        $this->dataObjectConverter = $dataObjectConverter;
+    }
+
+    /**
+     * Converts Address model to flat array
      *
      * @param QuoteAddress $address
      * @return array
      */
-    public function toNestedArray(QuoteAddress $address): array
+    public function execute(QuoteAddress $address): array
     {
-        $addressData = [
+        $addressData = $this->dataObjectConverter->toFlatArray($address, [], AddressInterface::class);
+        $addressData['model'] = $address;
+
+        $addressData = array_merge($addressData, [
             'country' => [
                 'code' => $address->getCountryId(),
                 'label' => $address->getCountry()
@@ -41,7 +57,7 @@ public function toNestedArray(QuoteAddress $address): array
             ],
             'items_weight' => $address->getWeight(),
             'customer_notes' => $address->getCustomerNotes()
-        ];
+        ]);
 
         if (!$address->hasItems()) {
             return $addressData;

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php
@@ -11,25 +11,24 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\QuoteGraphQl\Model\Cart\Address\BillingAddressDataProvider;
+use Magento\QuoteGraphQl\Model\Cart\ExtractDataFromAddress;
 
 /**
  * @inheritdoc
  */
 class BillingAddress implements ResolverInterface
 {
     /**
-     * @var BillingAddressDataProvider
+     * @var ExtractDataFromAddress
      */
-    private $addressDataProvider;
+    private $extractDataFromAddress;
 
     /**
-     * @param BillingAddressDataProvider $addressDataProvider
+     * @param ExtractDataFromAddress $extractDataFromAddress
      */
-    public function __construct(
-        BillingAddressDataProvider $addressDataProvider
-    ) {
-        $this->addressDataProvider = $addressDataProvider;
+    public function __construct(ExtractDataFromAddress $extractDataFromAddress)
+    {
+        $this->extractDataFromAddress = $extractDataFromAddress;
     }
 
     /**
@@ -40,9 +39,14 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if (!isset($value['model'])) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
-
         $cart = $value['model'];
 
-        return $this->addressDataProvider->getCartAddresses($cart);
+        $billingAddress = $cart->getBillingAddress();
+        if (null === $billingAddress) {
+            return null;
+        }
+
+        $addressData = $this->extractDataFromAddress->execute($billingAddress);
+        return $addressData;
     }
 }