Merge pull request #13 from gillesbourgeat/bump-1-2-1

Bump version 1.2.1 and improvment login listener
thelia-modules · Dec 9, 2016 · 1133388 · 1133388
2 parents 3255ab7 + a2c728f
commit 1133388
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/Config/module.xml b/Config/module.xml
@@ -7,7 +7,7 @@
     <descriptive locale="en_US">
         <title>Wish list</title>
     </descriptive>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <author>
         <name>Michaël Espeche</name>
         <email>mespeche@openstudio.fr</email>

diff --git a/EventListener/CustomerListener.php b/EventListener/CustomerListener.php
@@ -8,6 +8,7 @@
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Core\Security\SecurityContext;
 use WishList\Controller\Front\WishListController;
+use WishList\Model\WishList;
 use WishList\Model\WishListQuery;
 
 /**
@@ -35,9 +36,27 @@ public function customerLogout(Event $event)
     public function customerLogin(Event $event)
     {
         if ($this->securityContext->hasCustomerUser()) {
-            $ids = WishListQuery::create()->filterByCustomerId($this->securityContext->getCustomerUser()->getId())->select('id')->find()->toArray();
+            $productIds = array_unique(
+                array_merge(
+                    is_array($this->requestStack->getCurrentRequest()->getSession()->get(WishListController::SESSION_NAME)) ?
+                        $this->requestStack->getCurrentRequest()->getSession()->get(WishListController::SESSION_NAME) : [],
+                    WishListQuery::create()->filterByCustomerId($this->securityContext->getCustomerUser()->getId())->select('product_id')->find()->toArray()
+                ), SORT_REGULAR
+            );
 
-            $this->requestStack->getCurrentRequest()->getSession()->set(WishListController::SESSION_NAME, $ids);
+            foreach ($productIds as $productId) {
+                if (null === WishListQuery::create()
+                        ->filterByCustomerId($this->securityContext->getCustomerUser()->getId())
+                        ->filterByProductId($productId)
+                        ->findOne()) {
+                    (new WishList())
+                        ->setCustomerId($this->securityContext->getCustomerUser()->getId())
+                        ->setProductId($productId)
+                        ->save();
+                }
+            }
+
+            $this->requestStack->getCurrentRequest()->getSession()->set(WishListController::SESSION_NAME, $productIds);
         }
     }