[API] move const to core, cs fixes

SirDomin · SirDomin · commit 8a348bda7e38 · 2021-08-31T08:29:27.000+02:00
diff --git a/features/promotion/managing_catalog_promotions/creating_catalog_promotion.feature b/features/promotion/managing_catalog_promotions/creating_catalog_promotion.feature
@@ -27,7 +27,7 @@ Feature: Creating a catalog promotion
         And I specify its label as "Winter -50%" in "English (United States)"
         And I describe it as "This promotion gives a 50% discount on all products" in "English (United States)"
         And it applies on variants "PHP T-Shirt" variant and "Kotlin T-Shirt" variant
-        And I add the percentage discount catalog promotion action configured with amount of "50%"
+        And it gives the "50%" percentage discount
         And I add it
         Then there should be 1 new catalog promotion on the list
         And it should have "winter_sale" code and "Winter sale" name
diff --git a/features/promotion/managing_catalog_promotions/editing_catalog_promotion.feature b/features/promotion/managing_catalog_promotions/editing_catalog_promotion.feature
@@ -52,6 +52,6 @@ Feature: Editing catalog promotion
 
     @api
     Scenario: Editing catalog promotion action
-        When I want "Christmas sale" catalog promotion to have "40%" discount
+        When I edit "Christmas sale" catalog promotion to have "40%" discount
         Then I should be notified that it has been successfully edited
         And this catalog promotion should have "40%" percentage discount
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php
@@ -172,18 +172,16 @@ public function iWantToModifyACatalogPromotion(CatalogPromotionInterface $catalo
     }
 
     /**
-     * @When I add the percentage discount catalog promotion action configured with amount of :amount
+     * @When it gives the :amount percentage discount
      */
     public function iAddThePercentageDiscountCatalogPromotionActionConfiguredWithAmountOf(string $amount): void
     {
-        $actions = [
-            [
-                'type' => CatalogPromotionInterface::TYPE_PERCENTAGE_DISCOUNT,
-                'configuration' => [
-                    'amount' => $amount
-                ],
+        $actions = [[
+            'type' => CatalogPromotionActionInterface::TYPE_PERCENTAGE_DISCOUNT,
+            'configuration' => [
+                'amount' => $amount
             ],
-        ];
+        ]];
 
         $this->client->addRequestData('actions', $actions);
     }
@@ -240,13 +238,13 @@ public function iWantCatalogPromotionToBeAppliedOn(CatalogPromotionInterface $ca
     }
 
     /**
-     * @When /^I want ("[^"]+" catalog promotion) to have "([^"]+)" discount$/
+     * @When /^I edit ("[^"]+" catalog promotion) to have "([^"]+)" discount$/
      */
     public function iWantPromotionToHaveDiscount(CatalogPromotionInterface $catalogPromotion, string $amount): void
     {
         $this->client->buildUpdateRequest($catalogPromotion->getCode());
         $rules = [[
-            'type' => CatalogPromotionInterface::TYPE_PERCENTAGE_DISCOUNT,
+            'type' => CatalogPromotionActionInterface::TYPE_PERCENTAGE_DISCOUNT,
             'configuration' => [
                 'amount' => $amount,
             ],
@@ -266,14 +264,6 @@ public function thereShouldBeNewCatalogPromotionOnTheList(int $amount = 0): void
         Assert::count($this->responseChecker->getCollection($this->client->index()), $amount);
     }
 
-    /**
-     * @Then I should be notified that it has been successfully created
-     */
-    public function iShouldBeNotifiedThatItHasBeenSuccessfullyCreated(): void
-    {
-        Assert::same($this->client->getLastResponse()->getStatusCode(), 201);
-    }
-
     /**
      * @Then /^it should have "([^"]+)" discount$/
      */
@@ -292,7 +282,7 @@ public function itShouldHavePercentageDiscount(string $amount): void
         $catalogPromotionAction = $this->responseChecker->getResponseContent($this->client->getLastResponse())['actions'][0];
 
         Assert::same($amount, $catalogPromotionAction['configuration']['amount']);
-        Assert::same(CatalogPromotionInterface::TYPE_PERCENTAGE_DISCOUNT, $catalogPromotionAction['type']);
+        Assert::same(CatalogPromotionActionInterface::TYPE_PERCENTAGE_DISCOUNT, $catalogPromotionAction['type']);
     }
 
     /**
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/CatalogPromotion.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/CatalogPromotion.xml
@@ -49,7 +49,6 @@
             <group>admin:catalog_promotion:read</group>
             <group>admin:catalog_promotion:create</group>
             <group>admin:catalog_promotion:update</group>
-
         </attribute>
     </class>
 </serializer>
diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20210826063828.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20210826063828.php
@@ -14,7 +14,7 @@ final class Version20210826063828 extends AbstractMigration
 {
     public function getDescription(): string
     {
-        return '';
+        return 'Add catalog promotion actions';
     }
 
     public function up(Schema $schema): void
diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/doctrine/model/CatalogPromotionAction.orm.xml b/src/Sylius/Bundle/PromotionBundle/Resources/config/doctrine/model/CatalogPromotionAction.orm.xml
@@ -17,7 +17,7 @@
             <generator strategy="AUTO" />
         </id>
 
-        <field name="type" type="string" />
+        <field name="type" />
         <field name="configuration" type="array" />
 
         <many-to-one field="catalogPromotion" target-entity="Sylius\Component\Promotion\Model\CatalogPromotionInterface" inversed-by="actions">
diff --git a/src/Sylius/Component/Core/Model/CatalogPromotionInterface.php b/src/Sylius/Component/Core/Model/CatalogPromotionInterface.php
@@ -18,4 +18,5 @@
 
 interface CatalogPromotionInterface extends BaseCatalogPromotionInterface, ChannelsAwareInterface
 {
+    public const TYPE_CONTAINS_VARIANTS = 'contains_variants';
 }
diff --git a/src/Sylius/Component/Promotion/Model/CatalogPromotion.php b/src/Sylius/Component/Promotion/Model/CatalogPromotion.php
@@ -46,7 +46,6 @@ public function __construct()
         $this->initializeTranslationsCollection();
 
         $this->rules = new ArrayCollection();
-
         $this->actions = new ArrayCollection();
     }
 
diff --git a/src/Sylius/Component/Promotion/Model/CatalogPromotionAction.php b/src/Sylius/Component/Promotion/Model/CatalogPromotionAction.php
@@ -18,7 +18,7 @@ class CatalogPromotionAction implements CatalogPromotionActionInterface
     /** @var mixed */
     protected $id;
 
-    protected ?string $type;
+    protected ?string $type = null;
 
     protected array $configuration = [];
 
diff --git a/src/Sylius/Component/Promotion/Model/CatalogPromotionActionInterface.php b/src/Sylius/Component/Promotion/Model/CatalogPromotionActionInterface.php
@@ -17,6 +17,8 @@
 
 interface CatalogPromotionActionInterface extends ResourceInterface
 {
+    public const TYPE_PERCENTAGE_DISCOUNT = 'percentage_product_discount';
+
     public function setType(?string $type): void;
 
     public function setConfiguration(array $configuration): void;
diff --git a/src/Sylius/Component/Promotion/Model/CatalogPromotionInterface.php b/src/Sylius/Component/Promotion/Model/CatalogPromotionInterface.php
@@ -21,10 +21,6 @@
 
 interface CatalogPromotionInterface extends ResourceInterface, CodeAwareInterface, TranslatableInterface
 {
-    public const TYPE_PERCENTAGE_DISCOUNT = 'percentage_product_discount';
-
-    public const TYPE_CONTAINS_VARIANTS = 'contains_variants';
-
     public function getName(): ?string;
 
     public function setName(?string $name): void;
diff --git a/tests/Api/Admin/CatalogPromotionsTest.php b/tests/Api/Admin/CatalogPromotionsTest.php
@@ -13,7 +13,8 @@
 
 namespace Sylius\Tests\Api\Admin;
 
-use Sylius\Component\Promotion\Model\CatalogPromotionInterface;
+use Sylius\Component\Core\Model\CatalogPromotionInterface;
+use Sylius\Component\Promotion\Model\CatalogPromotionActionInterface;
 use Sylius\Tests\Api\JsonApiTestCase;
 use Sylius\Tests\Api\Utils\AdminUserLoginTrait;
 use Symfony\Component\HttpFoundation\Response;
@@ -80,7 +81,7 @@ public function it_creates_a_catalog_promotion(): void
                 ],
                 'actions' => [
                     [
-                        'type' => CatalogPromotionInterface::TYPE_PERCENTAGE_DISCOUNT,
+                        'type' => CatalogPromotionActionInterface::TYPE_PERCENTAGE_DISCOUNT,
                         'configuration' => [
                             'amount' => '50%'
                         ]
@@ -175,7 +176,7 @@ public function it_updates_catalog_promotion(): void
                 'code' => 'new_code',
                 'actions' => [
                     [
-                        'type' => CatalogPromotionInterface::TYPE_PERCENTAGE_DISCOUNT,
+                        'type' => CatalogPromotionActionInterface::TYPE_PERCENTAGE_DISCOUNT,
                         'configuration' => [
                             'amount' => '40%'
                         ]

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ final class Version20210826063828 extends AbstractMigration`
`14`	`14`	`{`
`15`	`15`	`public function getDescription(): string`
`16`	`16`	`{`
`17`		`- return '';`
	`17`	`+ return 'Add catalog promotion actions';`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public function up(Schema $schema): void`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,5 @@`
`18`	`18`
`19`	`19`	`interface CatalogPromotionInterface extends BaseCatalogPromotionInterface, ChannelsAwareInterface`
`20`	`20`	`{`
	`21`	`+ public const TYPE_CONTAINS_VARIANTS = 'contains_variants';`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ public function __construct()`
`46`	`46`	`$this->initializeTranslationsCollection();`
`47`	`47`
`48`	`48`	`$this->rules = new ArrayCollection();`
`49`		`-`
`50`	`49`	`$this->actions = new ArrayCollection();`
`51`	`50`	`}`
`52`	`51`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`
`18`	`18`	`interface CatalogPromotionActionInterface extends ResourceInterface`
`19`	`19`	`{`
	`20`	`+ public const TYPE_PERCENTAGE_DISCOUNT = 'percentage_product_discount';`
	`21`	`+`
`20`	`22`	`public function setType(?string $type): void;`
`21`	`23`
`22`	`24`	`public function setConfiguration(array $configuration): void;`