33383: apply suggestions

Author: khrystynastolbova

app/code/Magento/CustomerGraphQl/Model/Customer/DeleteCustomer.php

@@ -8,14 +8,13 @@
 namespace Magento\CustomerGraphQl\Model\Customer;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
- * Get customer
+ * Delete customer
  */
 class DeleteCustomer
 {
@@ -34,30 +33,15 @@ public function __construct(
     }
 
     /**
-     * Get customer
+     * Delete customer
      *
-     * @param ContextInterface $context
+     * @param CustomerInterface
      * @return void
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
      */
-    public function execute(ContextInterface $context): void
+    public function execute(CustomerInterface $customer): void
     {
-        $currentUserId = $context->getUserId();
-
-        try {
-            $customer = $this->customerRepository->getById($currentUserId);
-            // @codeCoverageIgnoreStart
-        } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(
-                __('Customer with id "%customer_id" does not exist.', ['customer_id' => $currentUserId]),
-                $e
-            );
-        } catch (LocalizedException $e) {
-            throw new GraphQlInputException(__($e->getMessage()));
-            // @codeCoverageIgnoreEnd
-        }
-
         try {
             $this->customerRepository->delete($customer);
         } catch (LocalizedException $e) {

app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomer.php

@@ -8,6 +8,7 @@
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
 use Magento\CustomerGraphQl\Model\Customer\DeleteCustomer as DeleteCustomerModel;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -20,22 +21,32 @@
  */
 class DeleteCustomer implements ResolverInterface
 {
+    /**
+     * @var GetCustomer
+     */
+    private $getCustomer;
+
     /**
      * @var DeleteCustomerModel
      */
     private $deleteCustomer;
 
-    /** @var Registry */
+    /**
+     * @var Registry
+     */
     private $registry;
 
     /**
+     * @param GetCustomer $getCustomer
      * @param DeleteCustomerModel $deleteCustomer
      * @param Registry $registry
      */
     public function __construct(
+        GetCustomer $getCustomer,
         DeleteCustomerModel $deleteCustomer,
         Registry $registry
     ) {
+        $this->getCustomer = $getCustomer;
         $this->deleteCustomer = $deleteCustomer;
         $this->registry =$registry;
     }
@@ -60,7 +71,8 @@ public function resolve(
         $this->registry->unregister('isSecureArea');
         $this->registry->register('isSecureArea', true);
 
-        $this->deleteCustomer->execute($context);
+        $customer = $this->getCustomer->execute($context);
+        $this->deleteCustomer->execute($customer);
 
         $this->registry->unregister('isSecureArea');
         $this->registry->register('isSecureArea', $isSecure);

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\GraphQl\Customer;
 
-use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -23,64 +22,56 @@ class DeleteCustomerTest extends GraphQlAbstract
      */
     private $customerTokenService;
 
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    private $customerRepository;
-
-    /**
-     * @var LockCustomer
-     */
-    private $lockCustomer;
-
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         parent::setUp();
         $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
-        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
-        $this->lockCustomer = Bootstrap::getObjectManager()->get(LockCustomer::class);
     }
 
     /**
+     * Test deleting customer
+     *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      */
-    public function testDeleteCustomer()
+    public function testDeleteCustomer(): void
     {
         $response = $this->graphQlMutation($this->getMutation(), [], '', $this->getHeaderMap());
         $this->assertArrayHasKey('deleteCustomer', $response);
         $this->assertTrue($response['deleteCustomer']);
     }
 
     /**
+     * Test deleting non authorized customer
      */
-    public function testDeleteCustomerIfUserIsNotAuthorized()
+    public function testDeleteCustomerIfUserIsNotAuthorized(): void
     {
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('The current customer isn\'t authorized.');
         $this->graphQlMutation($this->getMutation());
     }
 
     /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * Test deleting locked customer
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/locked_customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
      */
-    public function testDeleteCustomerIfAccountIsLocked()
+    public function testDeleteCustomerIfAccountIsLocked(): void
     {
-        $this->lockCustomer->execute(1);
-        $response = $this->graphQlMutation($this->getMutation(), [], '', $this->getHeaderMap());
-        $this->assertArrayHasKey('deleteCustomer', $response);
-        $this->assertTrue($response['deleteCustomer']);
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later');
+        $this->graphQlMutation($this->getMutation(), [], '', $this->getHeaderMap());
     }
 
     /**
      * Retrieve deleteCustomer mutation
      *
      * @return string
      */
-    private function getMutation()
+    private function getMutation(): string
     {
         return <<<MUTATION
 mutation {