extensible customer structure (#1543)

config/forms.yml

@@ -25,7 +25,7 @@ services:
 
     App\Form\Admin\UserFormTypeExtension:
         tags:
-            - { name: form.type_extension, extended_type: Shopsys\FrameworkBundle\Form\Admin\Customer\UserFormType }
+            - { name: form.type_extension, extended_type: Shopsys\FrameworkBundle\Form\Admin\Customer\User\UserFormType }
 
     App\Form\Admin\OrderFormTypeExtension:
         tags:

config/packages/security.yml

@@ -12,7 +12,7 @@ security:
             id: Shopsys\FrameworkBundle\Model\Administrator\Security\AdministratorUserProvider
 
         user_identities:
-            id: Shopsys\FrameworkBundle\Model\Customer\FrontendUserProvider
+            id: Shopsys\FrameworkBundle\Model\Customer\User\FrontendCustomerUserProvider
 
     firewalls:
         # see Shopsys\FrameworkBundle\Model\Administrator\Security\AdministratorFrontSecurityFacade

config/parameters_common.yml

@@ -23,7 +23,7 @@ parameters:
         Shopsys\FrameworkBundle\Model\Article\Article: App\Model\Article\Article
         Shopsys\FrameworkBundle\Model\Administrator\Administrator: App\Model\Administrator\Administrator
         Shopsys\FrameworkBundle\Model\Category\Category: App\Model\Category\Category
-        Shopsys\FrameworkBundle\Model\Customer\User: App\Model\Customer\User
+        Shopsys\FrameworkBundle\Model\Customer\User\CustomerUser: App\Model\Customer\User\CustomerUser
         Shopsys\FrameworkBundle\Model\Order\Order: App\Model\Order\Order
         Shopsys\FrameworkBundle\Model\Order\Item\OrderItem: App\Model\Order\Item\OrderItem
         Shopsys\FrameworkBundle\Model\Transport\Transport: App\Model\Transport\Transport

config/services.yaml

@@ -41,7 +41,7 @@ services:
 
     Shopsys\FrameworkBundle\Model\Category\CategoryDataFactoryInterface: '@App\Model\Category\CategoryDataFactory'
 
-    Shopsys\FrameworkBundle\Model\Customer\UserDataFactoryInterface: '@App\Model\Customer\UserDataFactory'
+    Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserDataFactoryInterface: '@App\Model\Customer\User\CustomerUserDataFactory'
 
     Shopsys\FrameworkBundle\Model\Order\OrderDataFactoryInterface: '@App\Model\Order\OrderDataFactory'
 
@@ -78,7 +78,7 @@ services:
         arguments:
             - "%shopsys.performance_data.product.total_count%"
 
-    App\DataFixtures\Performance\UserDataFixture:
+    App\DataFixtures\Performance\CustomerUserDataFixture:
         arguments:
             - "%shopsys.performance_data.user.count_per_domain%"
 

config/services_test.yml

@@ -40,7 +40,7 @@ services:
 
     Shopsys\FrameworkBundle\Model\Category\CategoryDataFactoryInterface: '@App\Model\Category\CategoryDataFactory'
 
-    Shopsys\FrameworkBundle\Model\Customer\UserDataFactoryInterface: '@App\Model\Customer\UserDataFactory'
+    Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserDataFactoryInterface: '@App\Model\Customer\User\CustomerUserDataFactory'
 
     Shopsys\FrameworkBundle\Model\Order\Item\OrderItemDataFactoryInterface: '@App\Model\Order\Item\OrderItemDataFactory'
 

src/Command/PerformanceDataCommand.php

@@ -5,9 +5,9 @@
 namespace App\Command;
 
 use App\DataFixtures\Performance\CategoryDataFixture;
+use App\DataFixtures\Performance\CustomerUserDataFixture;
 use App\DataFixtures\Performance\OrderDataFixture;
 use App\DataFixtures\Performance\ProductDataFixture;
-use App\DataFixtures\Performance\UserDataFixture;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -30,9 +30,9 @@ class PerformanceDataCommand extends Command
     private $productDataFixture;
 
     /**
-     * @var \App\DataFixtures\Performance\UserDataFixture
+     * @var \App\DataFixtures\Performance\CustomerUserDataFixture
      */
-    private $userDataFixture;
+    private $customerUserDataFixture;
 
     /**
      * @var \App\DataFixtures\Performance\OrderDataFixture
@@ -42,18 +42,18 @@ class PerformanceDataCommand extends Command
     /**
      * @param \App\DataFixtures\Performance\CategoryDataFixture $categoryDataFixture
      * @param \App\DataFixtures\Performance\ProductDataFixture $productDataFixture
-     * @param \App\DataFixtures\Performance\UserDataFixture $userDataFixture
+     * @param \App\DataFixtures\Performance\CustomerUserDataFixture $customerUserDataFixture
      * @param \App\DataFixtures\Performance\OrderDataFixture $orderDataFixture
      */
     public function __construct(
         CategoryDataFixture $categoryDataFixture,
         ProductDataFixture $productDataFixture,
-        UserDataFixture $userDataFixture,
+        CustomerUserDataFixture $customerUserDataFixture,
         OrderDataFixture $orderDataFixture
     ) {
         $this->categoryDataFixture = $categoryDataFixture;
         $this->productDataFixture = $productDataFixture;
-        $this->userDataFixture = $userDataFixture;
+        $this->customerUserDataFixture = $customerUserDataFixture;
         $this->orderDataFixture = $orderDataFixture;
 
         parent::__construct();
@@ -75,8 +75,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->categoryDataFixture->load($output);
         $output->writeln('<fg=green>loading ' . ProductDataFixture::class . '</fg=green>');
         $this->productDataFixture->load($output);
-        $output->writeln('<fg=green>loading ' . UserDataFixture::class . '</fg=green>');
-        $this->userDataFixture->load($output);
+        $output->writeln('<fg=green>loading ' . CustomerUserDataFixture::class . '</fg=green>');
+        $this->customerUserDataFixture->load($output);
         $output->writeln('<fg=green>loading ' . OrderDataFixture::class . '</fg=green>');
         $this->orderDataFixture->load($output);
     }

src/Controller/Front/BestsellingProductController.php

@@ -6,7 +6,7 @@
 
 use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Model\Category\Category;
-use Shopsys\FrameworkBundle\Model\Customer\CurrentCustomer;
+use Shopsys\FrameworkBundle\Model\Customer\User\CurrentCustomerUser;
 use Shopsys\FrameworkBundle\Model\Product\BestsellingProduct\BestsellingProductFacade;
 use Shopsys\FrameworkBundle\Model\Product\BestsellingProduct\CachedBestsellingProductFacade;
 
@@ -23,23 +23,23 @@ class BestsellingProductController extends FrontBaseController
     private $domain;
 
     /**
-     * @var \Shopsys\FrameworkBundle\Model\Customer\CurrentCustomer
+     * @var \Shopsys\FrameworkBundle\Model\Customer\User\CurrentCustomerUser
      */
-    private $currentCustomer;
+    private $currentCustomerUser;
 
     /**
      * @param \Shopsys\FrameworkBundle\Model\Product\BestsellingProduct\CachedBestsellingProductFacade $cachedBestsellingProductFacade
      * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
-     * @param \Shopsys\FrameworkBundle\Model\Customer\CurrentCustomer $currentCustomer
+     * @param \Shopsys\FrameworkBundle\Model\Customer\User\CurrentCustomerUser $currentCustomerUser
      */
     public function __construct(
         CachedBestsellingProductFacade $cachedBestsellingProductFacade,
         Domain $domain,
-        CurrentCustomer $currentCustomer
+        CurrentCustomerUser $currentCustomerUser
     ) {
         $this->cachedBestsellingProductFacade = $cachedBestsellingProductFacade;
         $this->domain = $domain;
-        $this->currentCustomer = $currentCustomer;
+        $this->currentCustomerUser = $currentCustomerUser;
     }
 
     /**
@@ -50,7 +50,7 @@ public function listAction(Category $category)
         $bestsellingProducts = $this->cachedBestsellingProductFacade->getAllOfferedBestsellingProducts(
             $this->domain->getId(),
             $category,
-            $this->currentCustomer->getPricingGroup()
+            $this->currentCustomerUser->getPricingGroup()
         );
 
         return $this->render('Front/Content/Product/bestsellingProductsList.html.twig', [

src/Controller/Front/CartController.php

@@ -84,7 +84,7 @@ public function __construct(
      */
     public function indexAction(Request $request)
     {
-        $cart = $this->cartFacade->findCartOfCurrentCustomer();
+        $cart = $this->cartFacade->findCartOfCurrentCustomerUser();
         $cartItems = $cart === null ? [] : $cart->getItems();
 
         $cartFormData = ['quantities' => []];
@@ -143,7 +143,7 @@ public function boxAction()
         $orderPreview = $this->orderPreviewFactory->createForCurrentUser();
 
         return $this->render('Front/Inline/Cart/cartBox.html.twig', [
-            'cart' => $this->cartFacade->findCartOfCurrentCustomer(),
+            'cart' => $this->cartFacade->findCartOfCurrentCustomerUser(),
             'productsPrice' => $orderPreview->getProductsPrice(),
         ]);
     }

src/Controller/Front/CategoryController.php

@@ -8,7 +8,7 @@
 use Shopsys\FrameworkBundle\Component\Domain\Domain;
 use Shopsys\FrameworkBundle\Model\Category\CategoryFacade;
 use Shopsys\FrameworkBundle\Model\Category\TopCategory\TopCategoryFacade;
-use Shopsys\FrameworkBundle\Model\Customer\CurrentCustomer;
+use Shopsys\FrameworkBundle\Model\Customer\User\CurrentCustomerUser;
 use Symfony\Component\HttpFoundation\Request;
 
 class CategoryController extends FrontBaseController
@@ -34,29 +34,29 @@ class CategoryController extends FrontBaseController
     private $topCategoryFacade;
 
     /**
-     * @var \Shopsys\FrameworkBundle\Model\Customer\CurrentCustomer
+     * @var \Shopsys\FrameworkBundle\Model\Customer\User\CurrentCustomerUser
      */
-    private $currentCustomer;
+    private $currentCustomerUser;
 
     /**
      * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
      * @param \Shopsys\FrameworkBundle\Model\Category\CategoryFacade $categoryFacade
      * @param \App\Model\Category\CurrentCategoryResolver $currentCategoryResolver
      * @param \Shopsys\FrameworkBundle\Model\Category\TopCategory\TopCategoryFacade $topCategoryFacade
-     * @param \Shopsys\FrameworkBundle\Model\Customer\CurrentCustomer $currentCustomer
+     * @param \Shopsys\FrameworkBundle\Model\Customer\User\CurrentCustomerUser $currentCustomerUser
      */
     public function __construct(
         Domain $domain,
         CategoryFacade $categoryFacade,
         CurrentCategoryResolver $currentCategoryResolver,
         TopCategoryFacade $topCategoryFacade,
-        CurrentCustomer $currentCustomer
+        CurrentCustomerUser $currentCustomerUser
     ) {
         $this->domain = $domain;
         $this->categoryFacade = $categoryFacade;
         $this->currentCategoryResolver = $currentCategoryResolver;
         $this->topCategoryFacade = $topCategoryFacade;
-        $this->currentCustomer = $currentCustomer;
+        $this->currentCustomerUser = $currentCustomerUser;
     }
 
     /**
@@ -121,7 +121,7 @@ public function topAction()
     public function categoryListAction(array $categories, $showProductsCountByCategory = true)
     {
         if ($showProductsCountByCategory === true) {
-            $pricingGroup = $this->currentCustomer->getPricingGroup();
+            $pricingGroup = $this->currentCustomerUser->getPricingGroup();
             $domainId = $this->domain->getId();
 
             $listableProductCountsIndexedByCategoryId = $this->categoryFacade

src/Controller/Front/CustomerController.php

@@ -4,10 +4,10 @@
 
 namespace App\Controller\Front;
 
-use App\Form\Front\Customer\CustomerFormType;
+use App\Form\Front\Customer\User\CustomerUserUpdateFormType;
 use Shopsys\FrameworkBundle\Component\Domain\Domain;
-use Shopsys\FrameworkBundle\Model\Customer\CustomerDataFactoryInterface;
-use Shopsys\FrameworkBundle\Model\Customer\CustomerFacade;
+use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserFacade;
+use Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserUpdateDataFactoryInterface;
 use Shopsys\FrameworkBundle\Model\Order\Item\OrderItemPriceCalculation;
 use Shopsys\FrameworkBundle\Model\Order\OrderFacade;
 use Shopsys\FrameworkBundle\Model\Security\LoginAsUserFacade;
@@ -17,9 +17,9 @@
 class CustomerController extends FrontBaseController
 {
     /**
-     * @var \Shopsys\FrameworkBundle\Model\Customer\CustomerFacade
+     * @var \Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserFacade
      */
-    private $customerFacade;
+    private $customerUserFacade;
 
     /**
      * @var \Shopsys\FrameworkBundle\Component\Domain\Domain
@@ -42,32 +42,32 @@ class CustomerController extends FrontBaseController
     private $loginAsUserFacade;
 
     /**
-     * @var \Shopsys\FrameworkBundle\Model\Customer\CustomerDataFactoryInterface
+     * @var \Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserUpdateDataFactoryInterface
      */
-    private $customerDataFactory;
+    private $customerUserUpdateDataFactory;
 
     /**
-     * @param \Shopsys\FrameworkBundle\Model\Customer\CustomerFacade $customerFacade
+     * @param \Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserFacade $customerUserFacade
      * @param \Shopsys\FrameworkBundle\Model\Order\OrderFacade $orderFacade
      * @param \Shopsys\FrameworkBundle\Component\Domain\Domain $domain
      * @param \Shopsys\FrameworkBundle\Model\Order\Item\OrderItemPriceCalculation $orderItemPriceCalculation
      * @param \Shopsys\FrameworkBundle\Model\Security\LoginAsUserFacade $loginAsUserFacade
-     * @param \Shopsys\FrameworkBundle\Model\Customer\CustomerDataFactoryInterface $customerDataFactory
+     * @param \Shopsys\FrameworkBundle\Model\Customer\User\CustomerUserUpdateDataFactoryInterface $customerUserUpdateDataFactory
      */
     public function __construct(
-        CustomerFacade $customerFacade,
+        CustomerUserFacade $customerUserFacade,
         OrderFacade $orderFacade,
         Domain $domain,
         OrderItemPriceCalculation $orderItemPriceCalculation,
         LoginAsUserFacade $loginAsUserFacade,
-        CustomerDataFactoryInterface $customerDataFactory
+        CustomerUserUpdateDataFactoryInterface $customerUserUpdateDataFactory
     ) {
-        $this->customerFacade = $customerFacade;
+        $this->customerUserFacade = $customerUserFacade;
         $this->orderFacade = $orderFacade;
         $this->domain = $domain;
         $this->orderItemPriceCalculation = $orderItemPriceCalculation;
         $this->loginAsUserFacade = $loginAsUserFacade;
-        $this->customerDataFactory = $customerDataFactory;
+        $this->customerUserUpdateDataFactory = $customerUserUpdateDataFactory;
     }
 
     /**
@@ -80,18 +80,18 @@ public function editAction(Request $request)
             return $this->redirectToRoute('front_login');
         }
 
-        $user = $this->getUser();
-        $customerData = $this->customerDataFactory->createFromUser($user);
+        $customerUser = $this->getUser();
+        $customerUserUpdateData = $this->customerUserUpdateDataFactory->createFromCustomerUser($customerUser);
 
-        $form = $this->createForm(CustomerFormType::class, $customerData, [
+        $form = $this->createForm(CustomerUserUpdateFormType::class, $customerUserUpdateData, [
             'domain_id' => $this->domain->getId(),
         ]);
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $customerData = $form->getData();
+            $customerUserUpdateData = $form->getData();
 
-            $this->customerFacade->editByCustomer($user->getId(), $customerData);
+            $this->customerUserFacade->editByCustomer($customerUser->getId(), $customerUserUpdateData);
 
             $this->getFlashMessageSender()->addSuccessFlash(t('Your data had been successfully updated'));
             return $this->redirectToRoute('front_customer_edit');
@@ -113,10 +113,10 @@ public function ordersAction()
             return $this->redirectToRoute('front_login');
         }
 
-        /** @var \App\Model\Customer\User $user */
-        $user = $this->getUser();
+        /** @var \App\Model\Customer\User\CustomerUser $customerUser */
+        $customerUser = $this->getUser();
 
-        $orders = $this->orderFacade->getCustomerOrderList($user);
+        $orders = $this->orderFacade->getCustomerUserOrderList($customerUser);
         return $this->render('Front/Content/Customer/orders.html.twig', [
             'orders' => $orders,
         ]);
@@ -150,10 +150,10 @@ private function orderDetailAction($urlHash = null, $orderNumber = null)
                 return $this->redirectToRoute('front_login');
             }
 
-            $user = $this->getUser();
+            $customerUser = $this->getUser();
             try {
                 /** @var \App\Model\Order\Order $order */
-                $order = $this->orderFacade->getByOrderNumberAndUser($orderNumber, $user);
+                $order = $this->orderFacade->getByOrderNumberAndUser($orderNumber, $customerUser);
             } catch (\Shopsys\FrameworkBundle\Model\Order\Exception\OrderNotFoundException $ex) {
                 $this->getFlashMessageSender()->addErrorFlash(t('Order not found'));
                 return $this->redirectToRoute('front_customer_orders');
@@ -179,7 +179,7 @@ public function loginAsRememberedUserAction(Request $request)
     {
         try {
             $this->loginAsUserFacade->loginAsRememberedUser($request);
-        } catch (\Shopsys\FrameworkBundle\Model\Customer\Exception\UserNotFoundException $e) {
+        } catch (\Shopsys\FrameworkBundle\Model\Customer\Exception\CustomerUserNotFoundException $e) {
             /** @var \Shopsys\FrameworkBundle\Component\FlashMessage\FlashMessageSender $adminFlashMessageSender */
             $adminFlashMessageSender = $this->get('shopsys.shop.component.flash_message.sender.admin');
             $adminFlashMessageSender->addErrorFlash(t('User not found.'));