From 4650cdd166d02cbf6dfc5f29aa2044a17ff332bf Mon Sep 17 00:00:00 2001
From: Tomanhez <tomek.sut@gmail.com>
Date: Thu, 10 Sep 2020 09:32:02 +0200
Subject: [PATCH] Fix for doctrine extensions

---
 .../ApiBundle/Doctrine/ApiRequestTypes.php    | 32 +++++++++++++++++++
 .../OrderDeleteMethodItemExtension.php        |  7 +++-
 .../OrderGetMethodItemExtension.php           |  7 +++-
 .../OrderPatchMethodItemExtension.php         | 14 +++++++-
 4 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 src/Sylius/Bundle/ApiBundle/Doctrine/ApiRequestTypes.php

diff --git a/src/Sylius/Bundle/ApiBundle/Doctrine/ApiRequestTypes.php b/src/Sylius/Bundle/ApiBundle/Doctrine/ApiRequestTypes.php
new file mode 100644
index 000000000000..c69289c32215
--- /dev/null
+++ b/src/Sylius/Bundle/ApiBundle/Doctrine/ApiRequestTypes.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\ApiBundle\Doctrine;
+
+final class ApiRequestTypes
+{
+    const SHOP_GET = 'SHOP_GET';
+    const SHOP_PATCH = 'SHOP_PATCH';
+    const SHOP_DELETE = 'SHOP_DELETE';
+    const SHOP_ADD_ITEM = 'SHOP_ADD_ITEM';
+    const SHOP_ADDRESS = 'SHOP_ADDRESS';
+    const SHOP_SELECT_SHIPPING_METHOD = 'SHOP_SELECT_SHIPPING_METHOD';
+    const SHOP_SELECT_PAYMENT_METHOD = 'SHOP_SELECT_PAYMENT_METHOD';
+    const SHOP_COMPLETE = 'SHOP_COMPLETE';
+    const SHOP_REMOVE_ITEM = 'SHOP_REMOVE_ITEM';
+    const SHOP_CHANGE_QUANTITY = 'SHOP_CHANGE_QUANTITY';
+
+    const ADMIN_GET = 'SHOP_GET';
+    const ADMIN_PATCH = 'SHOP_PATCH';
+    const ADMIN_DELETE = 'SHOP_DELETE';
+}
diff --git a/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderDeleteMethodItemExtension.php b/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderDeleteMethodItemExtension.php
index 80c4359fbee1..3226462471ba 100644
--- a/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderDeleteMethodItemExtension.php
+++ b/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderDeleteMethodItemExtension.php
@@ -17,6 +17,7 @@
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use Doctrine\ORM\QueryBuilder;
 use Sylius\Bundle\ApiBundle\Context\UserContextInterface;
+use Sylius\Bundle\ApiBundle\Doctrine\ApiRequestTypes;
 use Sylius\Component\Core\Model\AdminUserInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;
@@ -49,7 +50,11 @@ public function applyToItem(
             return;
         }
 
-        if ($operationName !== Request::METHOD_DELETE) {
+        if (
+            $operationName !== Request::METHOD_DELETE &&
+            $operationName !== ApiRequestTypes::SHOP_DELETE &&
+            $operationName !== ApiRequestTypes::ADMIN_DELETE
+        ) {
             return;
         }
 
diff --git a/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderGetMethodItemExtension.php b/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderGetMethodItemExtension.php
index 91b2bc3549a9..283ebb6494b0 100644
--- a/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderGetMethodItemExtension.php
+++ b/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderGetMethodItemExtension.php
@@ -17,6 +17,7 @@
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use Doctrine\ORM\QueryBuilder;
 use Sylius\Bundle\ApiBundle\Context\UserContextInterface;
+use Sylius\Bundle\ApiBundle\Doctrine\ApiRequestTypes;
 use Sylius\Component\Core\Model\AdminUserInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;
@@ -49,7 +50,11 @@ public function applyToItem(
             return;
         }
 
-        if ($operationName !== Request::METHOD_GET) {
+        if (
+            $operationName !== Request::METHOD_GET &&
+            $operationName !== ApiRequestTypes::SHOP_GET &&
+            $operationName !== ApiRequestTypes::ADMIN_GET
+        ) {
             return;
         }
 
diff --git a/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderPatchMethodItemExtension.php b/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderPatchMethodItemExtension.php
index 2e5b1152d065..a55a5fe17128 100644
--- a/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderPatchMethodItemExtension.php
+++ b/src/Sylius/Bundle/ApiBundle/Doctrine/QueryItemExtension/OrderPatchMethodItemExtension.php
@@ -17,6 +17,7 @@
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
 use Doctrine\ORM\QueryBuilder;
 use Sylius\Bundle\ApiBundle\Context\UserContextInterface;
+use Sylius\Bundle\ApiBundle\Doctrine\ApiRequestTypes;
 use Sylius\Component\Core\Model\AdminUserInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;
@@ -49,7 +50,18 @@ public function applyToItem(
             return;
         }
 
-        if ($operationName !== Request::METHOD_PATCH) {
+        if (
+            $operationName !== Request::METHOD_PATCH &&
+            $operationName !== ApiRequestTypes::SHOP_PATCH &&
+            $operationName !== ApiRequestTypes::SHOP_ADD_ITEM &&
+            $operationName !== ApiRequestTypes::SHOP_ADDRESS &&
+            $operationName !== ApiRequestTypes::SHOP_COMPLETE &&
+            $operationName !== ApiRequestTypes::SHOP_REMOVE_ITEM &&
+            $operationName !== ApiRequestTypes::SHOP_SELECT_PAYMENT_METHOD &&
+            $operationName !== ApiRequestTypes::SHOP_SELECT_SHIPPING_METHOD &&
+            $operationName !== ApiRequestTypes::SHOP_CHANGE_QUANTITY &&
+            $operationName !== ApiRequestTypes::ADMIN_PATCH
+        ) {
             return;
         }