Merge pull request #63 from magento-south/PRS

Fixed issues:
- MAGETWO-70299 Error during Sample Data deploying using " auto_increment_increment = 3" as Mysql option (2.2)

Author: slavvka

app/code/Magento/TaxSampleData/Model/Tax.php

@@ -5,10 +5,13 @@
  */
 namespace Magento\TaxSampleData\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Setup\SampleData\Context as SampleDataContext;
 
 /**
  * Class Tax
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Tax
 {
@@ -57,6 +60,13 @@ class Tax
      */
     protected $csvReader;
 
+    /**
+     * Region collection factory.
+     *
+     * @var \Magento\Directory\Model\ResourceModel\Region\CollectionFactory
+     */
+    private $regionCollectionFactory;
+
     /**
      * @param SampleDataContext $sampleDataContext
      * @param \Magento\Tax\Api\TaxRuleRepositoryInterface $taxRuleRepository
@@ -66,6 +76,7 @@ class Tax
      * @param \Magento\Tax\Model\Calculation\RateFactory $taxRateFactory
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $criteriaBuilder
      * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
+     * @param \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollectionFactory
      */
     public function __construct(
         SampleDataContext $sampleDataContext,
@@ -75,7 +86,8 @@ public function __construct(
         \Magento\Tax\Api\Data\TaxRateInterfaceFactory $rateFactory,
         \Magento\Tax\Model\Calculation\RateFactory $taxRateFactory,
         \Magento\Framework\Api\SearchCriteriaBuilder $criteriaBuilder,
-        \Magento\Framework\Api\FilterBuilder $filterBuilder
+        \Magento\Framework\Api\FilterBuilder $filterBuilder,
+        \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollectionFactory = null
     ) {
         $this->fixtureManager = $sampleDataContext->getFixtureManager();
         $this->csvReader = $sampleDataContext->getCsvReader();
@@ -86,12 +98,28 @@ public function __construct(
         $this->taxRateFactory = $taxRateFactory;
         $this->criteriaBuilder = $criteriaBuilder;
         $this->filterBuilder = $filterBuilder;
+        $this->regionCollectionFactory = $regionCollectionFactory ?: ObjectManager::getInstance()->get(
+            \Magento\Directory\Model\ResourceModel\Region\CollectionFactory::class
+        );
     }
 
     /**
      * {@inheritdoc}
      */
     public function install(array $fixtures)
+    {
+        $this->createTaxRates($fixtures);
+        $this->createTaxRules();
+    }
+
+    /**
+     * Create tax rates.
+     *
+     * @param array $fixtures
+     * @return void
+     * @throws \Exception if something went wrong while saving the tax rate.
+     */
+    private function createTaxRates(array $fixtures)
     {
         foreach ($fixtures as $fileName) {
             $fileName = $this->fixtureManager->getFixture($fileName);
@@ -111,19 +139,28 @@ public function install(array $fixtures)
                     continue;
                 }
                 $taxRate = $this->rateFactory->create();
+                $regionId = $this->getRegionId($data['tax_region_name'], $data['tax_country_id']);
                 $taxRate->setCode($data['code'])
                     ->setTaxCountryId($data['tax_country_id'])
-                    ->setTaxRegionId($data['tax_region_id'])
+                    ->setTaxRegionId($regionId)
                     ->setTaxPostcode($data['tax_postcode'])
                     ->setRate($data['rate']);
                 $this->taxRateRepository->save($taxRate);
             }
+        }
+    }
 
-            $fixtureFile = 'Magento_TaxSampleData::fixtures/tax_rule.csv';
-            $fixtureFileName = $this->fixtureManager->getFixture($fixtureFile);
-            if (!file_exists($fileName)) {
-                continue;
-            }
+    /**
+     * Create tax rules.
+     *
+     * @return void
+     * @throws \Exception if something went wrong while saving the tax rule.
+     */
+    private function createTaxRules()
+    {
+        $fixtureFile = 'Magento_TaxSampleData::fixtures/tax_rule.csv';
+        $fixtureFileName = $this->fixtureManager->getFixture($fixtureFile);
+        if (file_exists($fixtureFileName)) {
 
             $rows = $this->csvReader->getData($fixtureFileName);
             $header = array_shift($rows);
@@ -155,6 +192,22 @@ public function install(array $fixtures)
                 $this->taxRuleRepository->save($taxRule);
             }
         }
+    }
+
+    /**
+     * Return region Id by code or name.
+     *
+     * @param string $region
+     * @param string $countryId
+     * @return string|null
+     */
+    private function getRegionId($region, $countryId)
+    {
+        $regionCollection = $this->regionCollectionFactory->create();
+        $regionCollection->addCountryFilter($countryId)
+            ->addRegionCodeOrNameFilter($region)
+            ->setPageSize(1);
 
+        return $regionCollection->getFirstItem()->getId();
     }
 }