previous implementation of state / region was not passing mandatory region id field (#516)

Author: sol-loup

app/code/Meta/Sales/Helper/ShippingHelper.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\Helper\Context;
 use Magento\Sales\Model\Order\Shipment\Track;
 use Psr\Log\LoggerInterface;
+use Magento\Directory\Model\Region;
 
 class ShippingHelper extends AbstractHelper
 {
@@ -83,19 +84,13 @@ public function getRegionName($stateId)
      *
      * @param null|string $stateCode - State code
      * @param null|string $countryCode - Country code
-     * @return null|string
+     * @return Region
      */
-    public function getRegionNameFromCode(?string $stateCode, ?string $countryCode): ?string
+    public function getRegionFromCode(?string $stateCode, ?string $countryCode): Region
     {
-        $regionName = $stateCode ?? null;
-        try {
-            $region = $this->regionFactory->create();
-            $region = $region->loadByCode($stateCode, $countryCode);
-            $regionName = $region->getDefaultName() ?? $regionName;
-        } catch (Exception $e) {
-            $this->logger->critical($e->getMessage());
-        }
-        return $regionName;
+        $region = $this->regionFactory->create();
+        $region = $region->loadByCode($stateCode, $countryCode);
+        return $region;
     }
 
     /**

app/code/Meta/Sales/Model/Mapper/OrderMapper.php

@@ -290,13 +290,14 @@ private function getOrderBillingAddress(array $data): Order\Address
             ? [$data['shipping_address']['street1'], $data['shipping_address']['street2']]
             : $data['shipping_address']['street1'];
 
-        $regionName = $this->shippingHelper->getRegionNameFromCode(
+        $region = $this->shippingHelper->getRegionFromCode(
             $data['shipping_address']['state'],
             $data['shipping_address']['country']
         );
 
         $addressData = [
-            'region' => $regionName,
+            'region_id' => $region->getRegionId() ?? null,
+            'region' => $region->getDefaultName() ?? $data['shipping_address']['state'],
             'postcode' => $data['shipping_address']['postal_code'],
             'firstname' => $data['shipping_address']['first_name'],
             'lastname' => $data['shipping_address']['last_name'],
@@ -309,8 +310,8 @@ private function getOrderBillingAddress(array $data): Order\Address
 
         /** @var Order\Address $billingAddress */
         $billingAddress = $this->orderAddressFactory->create(['data' => $addressData]);
-        $billingAddress->setAddressType(Order\Address::TYPE_BILLING);
 
+        $billingAddress->setAddressType(Order\Address::TYPE_BILLING);
         return $billingAddress;
     }