Fixes in configuration

Sylius · Jan 31, 2019 · 978ce87 · 978ce87
1 parent 0727784
commit 978ce87
Show file tree

Hide file tree

Showing 9 changed files with 125 additions and 92 deletions.
diff --git a/src/Doctrine/ORM/ProductRepository.php b/src/Doctrine/ORM/ProductRepository.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\ShopApiPlugin\Doctrine\ORM;
+
+use Sylius\Bundle\CoreBundle\Doctrine\ORM\ProductRepository as BaseProductRepository;
+use Sylius\Component\Core\Model\ChannelInterface;
+use Sylius\Component\Core\Model\TaxonInterface;
+use Doctrine\ORM\QueryBuilder;
+
+final class ProductRepository extends BaseProductRepository
+{
+    public function createShopListQueryBuilder(
+        ChannelInterface $channel,
+        TaxonInterface $taxon,
+        string $locale,
+        array $sorting = [],
+        bool $includeAllDescendants = false
+    ): QueryBuilder {
+        $queryBuilder = parent::createShopListQueryBuilder($channel, $taxon, $locale, $sorting, $includeAllDescendants);
+
+        $queryBuilder->addSelect('productTaxon');
+
+        return $queryBuilder;
+    }
+}
diff --git a/src/Resources/config/app/config.yml b/src/Resources/config/app/config.yml
@@ -16,3 +16,10 @@ sylius_customer:
         customer:
             classes:
                 controller: Sylius\ShopApiPlugin\Controller\Customer\CustomerController
+
+sylius_product:
+    resources:
+        product:
+            classes:
+                # temporarily, until Sylius 1.4 release
+                repository: Sylius\ShopApiPlugin\Doctrine\ORM\ProductRepository
diff --git a/tests/Application/config/packages/_sylius.yaml b/tests/Application/config/packages/_sylius.yaml
@@ -6,6 +6,9 @@ imports:
 
     - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
 
+    - { resource: "@ShopApiPlugin/Resources/config/app/config.yml" }
+    - { resource: "@ShopApiPlugin/Resources/config/app/sylius_mailer.yml" }
+
 parameters:
     sylius_core.public_dir: '%kernel.project_dir%/public'
 

diff --git a/tests/Application/config/packages/security.yaml b/tests/Application/config/packages/security.yaml
@@ -51,6 +51,27 @@ security:
             stateless: true
             anonymous: true
 
+        sylius_shop_api_login:
+            pattern:  "%shop_api.security.regex%/login"
+            stateless: true
+            anonymous: true
+            form_login:
+                provider: sylius_shop_user_provider
+                login_path: /shop-api/login_check
+                check_path: /shop-api/login_check
+                success_handler: lexik_jwt_authentication.handler.authentication_success
+                failure_handler: lexik_jwt_authentication.handler.authentication_failure
+                require_previous_session: false
+
+        shop_api:
+            pattern: "%shop_api.security.regex%"
+            stateless: true
+            anonymous: true
+            guard:
+                provider: sylius_shop_user_provider
+                authenticators:
+                    - lexik_jwt_authentication.jwt_token_authenticator
+
         shop:
             switch_user: { role: ROLE_ALLOWED_TO_SWITCH }
             context: shop
@@ -85,27 +106,6 @@ security:
             pattern:  ^/(_(profiler|wdt)|css|images|js)/
             security: false
 
-        sylius_shop_api_login:
-            pattern:  "%shop_api.security.regex%/login"
-            stateless: true
-            anonymous: true
-            form_login:
-                provider: sylius_shop_user_provider
-                login_path: sylius_shop_api_login_check
-                check_path: sylius_shop_api_login_check
-                success_handler: lexik_jwt_authentication.handler.authentication_success
-                failure_handler: lexik_jwt_authentication.handler.authentication_failure
-                require_previous_session: false
-
-        shop_api:
-            pattern: "%shop_api.security.regex%"
-            stateless: true
-            anonymous: true
-            guard:
-                provider: sylius_shop_user_provider
-                authenticators:
-                    - lexik_jwt_authentication.jwt_token_authenticator
-
     access_control:
         - { path: "%sylius.security.admin_regex%/_partial", role: IS_AUTHENTICATED_ANONYMOUSLY, ips: [127.0.0.1, ::1] }
         - { path: "%sylius.security.admin_regex%/_partial", role: ROLE_NO_ACCESS }

diff --git a/tests/Application/config/services.yaml b/tests/Application/config/services.yaml
@@ -1,4 +1,4 @@
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 parameters:
-    locale: en_US
+    locale: en_GB
diff --git a/tests/Controller/TaxonShowDetailsApiTest.php b/tests/Controller/TaxonShowDetailsApiTest.php
@@ -8,31 +8,31 @@
 
 final class TaxonShowDetailsApiTest extends JsonApiTestCase
 {
-//    /**
-//     * @test
-//     */
-//    public function it_shows_summary_of_a_chosen_taxon_with_fallback_locale_from_channel()
-//    {
-//        $this->loadFixturesFromFiles(['shop.yml']);
-//
-//        $this->client->request('GET', '/shop-api/WEB_GB/taxons/T_SHIRTS', [], [], ['ACCEPT' => 'application/json']);
-//        $response = $this->client->getResponse();
-//
-//        $this->assertResponse($response, 'taxon/one_of_taxons_response', Response::HTTP_OK);
-//    }
-//
-//    /**
-//     * @test
-//     */
-//    public function it_shows_summary_of_a_chosen_taxon_with_strange_code()
-//    {
-//        $this->loadFixturesFromFiles(['shop.yml']);
-//
-//        $this->client->request('GET', '/shop-api/WEB_GB/taxons/de%3Flol%3Dxd%23boom?locale=en_GB', [], [], ['ACCEPT' => 'application/json']);
-//        $response = $this->client->getResponse();
-//
-//        $this->assertResponse($response, 'taxon/strange_taxon_code_response', Response::HTTP_OK);
-//    }
+    /**
+     * @test
+     */
+    public function it_shows_summary_of_a_chosen_taxon_with_fallback_locale_from_channel()
+    {
+        $this->loadFixturesFromFiles(['shop.yml']);
+
+        $this->client->request('GET', '/shop-api/WEB_GB/taxons/T_SHIRTS', [], [], ['ACCEPT' => 'application/json']);
+        $response = $this->client->getResponse();
+
+        $this->assertResponse($response, 'taxon/one_of_taxons_response', Response::HTTP_OK);
+    }
+
+    /**
+     * @test
+     */
+    public function it_shows_summary_of_a_chosen_taxon_with_strange_code()
+    {
+        $this->loadFixturesFromFiles(['shop.yml']);
+
+        $this->client->request('GET', '/shop-api/WEB_GB/taxons/de%3Flol%3Dxd%23boom?locale=en_GB', [], [], ['ACCEPT' => 'application/json']);
+        $response = $this->client->getResponse();
+
+        $this->assertResponse($response, 'taxon/strange_taxon_code_response', Response::HTTP_OK);
+    }
 
     /**
      * @test
@@ -47,16 +47,16 @@ public function it_shows_summary_of_a_chosen_taxon_in_different_language()
         $this->assertResponse($response, 'taxon/german_one_of_taxons_response', Response::HTTP_OK);
     }
 
-//    /**
-//     * @test
-//     */
-//    public function it_does_not_show_taxon_details_in_non_existent_channel()
-//    {
-//        $this->loadFixturesFromFiles(['shop.yml']);
-//
-//        $this->client->request('GET', '/shop-api/SPACE_KLINGON/taxons/T_SHIRTS?locale=en_GB', [], [], ['ACCEPT' => 'application/json']);
-//        $response = $this->client->getResponse();
-//
-//        $this->assertResponse($response, 'channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
-//    }
+    /**
+     * @test
+     */
+    public function it_does_not_show_taxon_details_in_non_existent_channel()
+    {
+        $this->loadFixturesFromFiles(['shop.yml']);
+
+        $this->client->request('GET', '/shop-api/SPACE_KLINGON/taxons/T_SHIRTS?locale=en_GB', [], [], ['ACCEPT' => 'application/json']);
+        $response = $this->client->getResponse();
+
+        $this->assertResponse($response, 'channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
+    }
 }
diff --git a/tests/Controller/TaxonShowTreeApiTest.php b/tests/Controller/TaxonShowTreeApiTest.php
@@ -8,19 +8,19 @@
 
 final class TaxonShowTreeApiTest extends JsonApiTestCase
 {
-//    /**
-//     * @test
-//     */
-//    public function it_shows_tree_of_all_taxons_with_fallback_locale_from_channel()
-//    {
-//        $this->loadFixturesFromFiles(['shop.yml']);
-//
-//        $this->client->request('GET', '/shop-api/WEB_GB/taxons/', [], [], ['ACCEPT' => 'application/json']);
-//
-//        $response = $this->client->getResponse();
-//
-//        $this->assertResponse($response, 'taxon/all_taxons_response', Response::HTTP_OK);
-//    }
+    /**
+     * @test
+     */
+    public function it_shows_tree_of_all_taxons_with_fallback_locale_from_channel()
+    {
+        $this->loadFixturesFromFiles(['shop.yml']);
+
+        $this->client->request('GET', '/shop-api/WEB_GB/taxons/', [], [], ['ACCEPT' => 'application/json']);
+
+        $response = $this->client->getResponse();
+
+        $this->assertResponse($response, 'taxon/all_taxons_response', Response::HTTP_OK);
+    }
 
     /**
      * @test
@@ -35,18 +35,18 @@ public function it_shows_tree_of_all_taxons_in_different_language()
 
         $this->assertResponse($response, 'taxon/german_all_taxons_response', Response::HTTP_OK);
     }
-//
-//    /**
-//     * @test
-//     */
-//    public function it_does_not_show_taxons_tree_in_non_existent_channel()
-//    {
-//        $this->loadFixturesFromFiles(['shop.yml']);
-//
-//        $this->client->request('GET', '/shop-api/SPACE_KLINGON/taxons/', [], [], ['ACCEPT' => 'application/json']);
-//
-//        $response = $this->client->getResponse();
-//
-//        $this->assertResponse($response, 'channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
-//    }
+
+    /**
+     * @test
+     */
+    public function it_does_not_show_taxons_tree_in_non_existent_channel()
+    {
+        $this->loadFixturesFromFiles(['shop.yml']);
+
+        $this->client->request('GET', '/shop-api/SPACE_KLINGON/taxons/', [], [], ['ACCEPT' => 'application/json']);
+
+        $response = $this->client->getResponse();
+
+        $this->assertResponse($response, 'channel_has_not_been_found_response', Response::HTTP_NOT_FOUND);
+    }
 }
diff --git a/tests/DataFixtures/ORM/channel.yml b/tests/DataFixtures/ORM/channel.yml
@@ -6,7 +6,7 @@ Sylius\Component\Core\Model\Channel:
         description: "Lorem ipsum"
         baseCurrency: "@pound"
         defaultLocale: "@locale_en_gb"
-        locales: ["@locale_en_gb", "@locale_de_de", "@locale_en_US"]
+        locales: ["@locale_en_gb", "@locale_de_de"]
         color: "black"
         enabled: true
         taxCalculationStrategy: "order_items_based"
@@ -35,5 +35,3 @@ Sylius\Component\Locale\Model\Locale:
         code: en_GB
     locale_de_de:
         code: de_DE
-    locale_en_US:
-        code: en_US
diff --git a/tests/DataFixtures/ORM/shop.yml b/tests/DataFixtures/ORM/shop.yml
@@ -6,7 +6,7 @@ Sylius\Component\Core\Model\Channel:
         description: "Lorem ipsum"
         baseCurrency: "@pound"
         defaultLocale: "@locale_en_gb"
-        locales: ["@locale_en_gb", "@locale_de_de", "@locale_en_us"]
+        locales: ["@locale_en_gb", "@locale_de_de"]
         color: "black"
         enabled: true
         taxCalculationStrategy: "order_items_based"
@@ -33,8 +33,6 @@ Sylius\Component\Locale\Model\Locale:
         code: en_GB
     locale_de_de:
         code: de_DE
-    locale_en_us:
-        code: en_US
 
 Sylius\Component\Core\Model\Product:
     mug: