Merge pull request #98 from IrinaZhadzinets/issue-2685

#2685 - Revert previous solution
scandipwa · Jun 9, 2022 · 96ea1c2 · 96ea1c2
2 parents e6f2df4 + 0197a59
commit 96ea1c2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 35 deletions.
diff --git a/src/Model/Resolver/ExpandedOrderResolver.php b/src/Model/Resolver/ExpandedOrderResolver.php
@@ -21,7 +21,6 @@
 use ScandiPWA\QuoteGraphQl\Model\Customer\CheckCustomerAccount;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Sales\Model\OrderRepository;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 
 /**
  * Orders data resolver
@@ -43,27 +42,19 @@ class ExpandedOrderResolver implements ResolverInterface
      */
     protected $orderRepository;
 
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    protected $customerRepository;
-
     /**
      * @param CollectionFactoryInterface $collectionFactory
      * @param CheckCustomerAccount $checkCustomerAccount
      * @param OrderRepository $orderRepository
-     * @param CustomerRepositoryInterface $customerRepository
      */
     public function __construct(
         CollectionFactoryInterface $collectionFactory,
         CheckCustomerAccount $checkCustomerAccount,
-        OrderRepository $orderRepository,
-        CustomerRepositoryInterface $customerRepository
+        OrderRepository $orderRepository
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->checkCustomerAccount = $checkCustomerAccount;
         $this->orderRepository = $orderRepository;
-        $this->customerRepository = $customerRepository;
     }
 
     /**
@@ -85,9 +76,7 @@ public function resolve(
         $orderId = $args['id'];
         $order = $this->orderRepository->get($orderId);
 
-        $customer = $this->customerRepository->getById($customerId);
-
-        if ($customerId !== $order->getCustomerId() && $customer->getEmail() !== $order->getCustomerEmail()) {
+        if ($customerId != $order->getCustomerId()) {
             throw new GraphQlNoSuchEntityException(__('Customer ID is invalid.'));
         }
 

diff --git a/src/Model/Resolver/OrderListResolver.php b/src/Model/Resolver/OrderListResolver.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * ScandiPWA - Progressive Web App for Magento
  *
@@ -20,7 +19,6 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
 use ScandiPWA\QuoteGraphQl\Model\Customer\CheckCustomerAccount;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 
 /**
  * Orders data reslover
@@ -30,32 +28,23 @@ class OrderListResolver implements ResolverInterface
     /**
      * @var CollectionFactoryInterface
      */
-    protected $collectionFactory;
+    protected CollectionFactoryInterface $collectionFactory;
 
     /**
      * @var CheckCustomerAccount
      */
-    protected $checkCustomerAccount;
-
-
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    protected $customerRepository;
+    protected CheckCustomerAccount $checkCustomerAccount;
 
     /**
      * @param CollectionFactoryInterface $collectionFactory
      * @param CheckCustomerAccount $checkCustomerAccount
-     * @param CustomerRepositoryInterface $customerRepository
      */
     public function __construct(
         CollectionFactoryInterface $collectionFactory,
-        CheckCustomerAccount $checkCustomerAccount,
-        CustomerRepositoryInterface $customerRepository
+        CheckCustomerAccount $checkCustomerAccount
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->checkCustomerAccount = $checkCustomerAccount;
-        $this->customerRepository = $customerRepository;
     }
 
     /**
@@ -74,14 +63,7 @@ public function resolve(
 
         $this->checkCustomerAccount->execute($customerId, $context->getUserType());
 
-        $customer = $this->customerRepository->getById($customerId);
-
-        $ordersCollection = $this->collectionFactory->create();
-        $ordersCollection->addFieldToFilter(
-            ['customer_id', 'customer_email'],
-            [['eq' => $customerId], ['eq' => $customer->getEmail()]]
-        );
-        $orders = $ordersCollection->load();
+        $orders = $this->collectionFactory->create($customerId);
 
         foreach ($orders as $order) {
             $trackNumbers = [];