[Catalog Promotion] refactor rule configuration change iri with code …

…- to simplify
Sylius · Aug 31, 2021 · 5490a66 · 5490a66
1 parent 698c694
commit 5490a66
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 398 deletions.
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php
@@ -195,8 +195,8 @@ public function iAddTheRuleConfiguredWithProductAnd(ProductVariantInterface $fir
         $rules = [[
             'type' => CatalogPromotionRuleInterface::TYPE_CONTAINS_VARIANTS,
             'configuration' => [
-                $this->iriConverter->getIriFromItem($firstVariant),
-                $this->iriConverter->getIriFromItem($secondVariant),
+                $firstVariant->getCode(),
+                $secondVariant->getCode(),
             ],
         ]];
 
@@ -212,7 +212,7 @@ public function iWantCatalogPromotionToBeAppliedOn(CatalogPromotionInterface $ca
         $rules = [[
             'type' => CatalogPromotionRuleInterface::TYPE_CONTAINS_VARIANTS,
             'configuration' => [
-                $this->iriConverter->getIriFromItem($productVariant),
+                $productVariant->getCode(),
             ],
         ]];
 
@@ -261,7 +261,7 @@ public function theCatalogPromotionsNamedShouldBeInTheRegistry(string ...$names)
     public function itShouldHaveRule(ProductVariantInterface $firstVariant, ProductVariantInterface $secondVariant): void
     {
         Assert::same(
-            [$this->iriConverter->getIriFromItem($firstVariant), $this->iriConverter->getIriFromItem($secondVariant)],
+            [$firstVariant->getCode(), $secondVariant->getCode()],
             $this->responseChecker->getCollection($this->client->getLastResponse())[0]['rules'][0]['configuration']
         );
     }
@@ -425,7 +425,7 @@ private function catalogPromotionAppliesOn(ProductVariantInterface ...$productVa
     private function hasVariantInConfiguration(array $configuration, ProductVariantInterface $productVariant): bool
     {
         foreach ($configuration as $productVariantIri) {
-            if ($productVariantIri === $this->iriConverter->getIriFromItem($productVariant)) {
+            if ($productVariantIri === $productVariant->getCode()) {
                 return true;
             }
         }

diff --git a/src/Sylius/Bundle/ApiBundle/DataPersister/CatalogPromotionDataPersister.php b/src/Sylius/Bundle/ApiBundle/DataPersister/CatalogPromotionDataPersister.php
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/data_persisters.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/data_persisters.xml
@@ -35,11 +35,5 @@
             <argument type="service" id="api_platform.doctrine.orm.data_persister" />
             <tag name="api_platform.data_persister" />
         </service>
-
-        <service id="Sylius\Bundle\ApiBundle\DataPersister\CatalogPromotionDataPersister">
-            <argument type="service" id="api_platform.doctrine.orm.data_persister" />
-            <argument type="service" id="api_platform.iri_converter" />
-            <tag name="api_platform.data_persister" />
-        </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/serializers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/serializers.xml
@@ -38,12 +38,6 @@
             <tag name="serializer.normalizer" priority="64" />
         </service>
 
-        <service id="Sylius\Bundle\ApiBundle\Serializer\CatalogPromotionNormalizer">
-            <argument type="service" id="api_platform.iri_converter" />
-            <argument type="service" id="sylius.repository.product_variant" />
-            <tag name="serializer.normalizer" priority="64" />
-        </service>
-
         <service id="Sylius\Bundle\ApiBundle\Serializer\ProductImageNormalizer">
             <argument type="service" id="liip_imagine.cache.manager" />
             <argument type="service" id="request_stack" />

diff --git a/src/Sylius/Bundle/ApiBundle/Serializer/CatalogPromotionNormalizer.php b/src/Sylius/Bundle/ApiBundle/Serializer/CatalogPromotionNormalizer.php
diff --git a/src/Sylius/Bundle/ApiBundle/spec/DataPersister/CatalogPromotionDataPersisterSpec.php b/src/Sylius/Bundle/ApiBundle/spec/DataPersister/CatalogPromotionDataPersisterSpec.php