Merge pull request #29 from BrunoPYT/main

fix: add missing wishlish data
thelia-modules · Oct 31, 2024 · c0757bb · c0757bb
2 parents 014125f + cd1d41f
commit c0757bb
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 15 deletions.
diff --git a/Config/module.xml b/Config/module.xml
@@ -13,7 +13,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>2.1.3</version>
+    <version>2.1.4</version>
     <authors>
         <author>
             <name>Michaël Espeche</name>

diff --git a/Loop/WishList.php b/Loop/WishList.php
@@ -1,4 +1,5 @@
 <?php
+
 /*************************************************************************************/
 /*                                                                                   */
 /*      Thelia	                                                                     */
@@ -55,7 +56,9 @@ protected function getArgDefinitions()
     {
         return new ArgumentCollection(
             Argument::createIntListTypeArgument('id'),
-            Argument::createIntListTypeArgument('customer_id')
+            Argument::createIntListTypeArgument('customer_id'),
+            Argument::createAlphaNumStringTypeArgument('code'),
+            Argument::createBooleanTypeArgument('default'),
         );
     }
 
@@ -83,6 +86,10 @@ public function buildModelCriteria()
             $wishList->filterById($id);
         }
 
+        if (null !== $code = $this->getCode()) {
+            $wishList->filterByCode($code);
+        }
+
         if (null !== $customerId) {
             $wishList->filterByCustomerId($customerId);
         }
@@ -91,6 +98,10 @@ public function buildModelCriteria()
             $wishList->filterBySessionId($sessionId);
         }
 
+        if (null !== $default = $this->getDefault()) {
+            $wishList->filterByDefault($default);
+        }
+
         return $wishList;
     }
 
@@ -103,7 +114,7 @@ public function buildModelCriteria()
     public function parseResults(LoopResult $loopResult)
     {
         /** @var \WishList\Model\WishList $wishlist */
-        foreach ($loopResult->getResultDataCollection() as $wishlist){
+        foreach ($loopResult->getResultDataCollection() as $wishlist) {
 
             $loopResultRow = new LoopResultRow($wishlist);
 
@@ -112,6 +123,7 @@ public function parseResults(LoopResult $loopResult)
 
             $loopResultRow
                 ->set("ID", $wishlist->getId())
+                ->set("DEFAULT", $wishlist->getDefault())
                 ->set("TITLE", $wishlist->getTitle())
                 ->set("CODE", $wishlist->getCode())
                 ->set("CUSTOMER_ID", $wishlist->getCustomerId())

diff --git a/Model/Api/WishList.php b/Model/Api/WishList.php
@@ -24,6 +24,15 @@ class WishList extends BaseApiModel
      */
     protected $id;
 
+    /**
+     * @var boolean
+     * @OA\Property(
+     *    type="boolean",
+     * )
+     * @Constraint\NotBlank(groups={"read", "update"})
+     */
+    protected $default;
+
     /**
      * @var integer
      * @OA\Property(
@@ -110,6 +119,24 @@ public function setId($id): WishList
         return $this;
     }
 
+    /**
+     * @return boolean
+     */
+    public function getDefault()
+    {
+        return $this->default;
+    }
+
+    /**
+     * @param boolean $default
+     * @return WishList
+     */
+    public function setDefault($default): WishList
+    {
+        $this->default = $default;
+        return $this;
+    }
+
     /**
      * @return int
      */

diff --git a/Service/WishListService.php b/Service/WishListService.php
@@ -58,7 +58,7 @@ public function addProduct($pseId, $quantity, $wishListId = null)
                 ->setQuantity($quantity)
                 ->save();
         } catch (\Exception $e) {
-            Tlog::getInstance()->error('Error during wishlist add :'.$e->getMessage());
+            Tlog::getInstance()->error('Error during wishlist add :' . $e->getMessage());
 
             return false;
         }
@@ -83,7 +83,7 @@ public function removeProduct($pseId, $wishListId = null)
                 $productWishList->delete();
             }
         } catch (\Exception $e) {
-            Tlog::getInstance()->error('Error during wishlist remove :'.$e->getMessage());
+            Tlog::getInstance()->error('Error during wishlist remove :' . $e->getMessage());
 
             return false;
         }
@@ -218,6 +218,10 @@ public function createUpdateWishList($title, $products = null, $wishListId = nul
             $rewrittenUrl = $hash;
         }
 
+        if (null !== $title) {
+            $wishList->setTitle($title);
+        }
+
         $wishList->save();
 
         if (null !== $rewrittenUrl) {
@@ -256,8 +260,7 @@ public function duplicateWishList($wishListId, $title)
         $newWishList = (new WishList())
             ->setTitle($title)
             ->setCustomerId($customerId)
-            ->setSessionId($sessionId)
-        ;
+            ->setSessionId($sessionId);
 
         $code = $this->getWishList($newWishList);
 
@@ -326,8 +329,7 @@ public function cloneWishList($wishListId)
         $newWishList = (new WishList())
             ->setTitle($wishList->getTitle())
             ->setCustomerId($customerId)
-            ->setSessionId($sessionId)
-        ;
+            ->setSessionId($sessionId);
 
         $code = $this->getWishList($newWishList);
 
@@ -346,7 +348,7 @@ public function cloneWishList($wishListId)
         return $newWishList;
     }
 
-    protected function getWishListObject($wishListId, $customerId, $sessionId)
+    protected function getWishListObject($wishListId, $customerId, $sessionId): ?WishList
     {
         $wishList = WishListQuery::create()
             ->filterById($wishListId);
@@ -401,14 +403,16 @@ public function createWishlistSlug(Wishlist $wishlist)
         $count = 0;
 
         while (true) {
-            if (WishListQuery::create()
-                    ->filterByCode($wishlistHash)
-                    ->filterById($wishlist->getId(), Criteria::NOT_EQUAL)
-                    ->count() === 0) {
+            if (
+                WishListQuery::create()
+                ->filterByCode($wishlistHash)
+                ->filterById($wishlist->getId(), Criteria::NOT_EQUAL)
+                ->count() === 0
+            ) {
                 break;
             }
 
-            $wishlistHash = Slugify::create()->slugify($wishlist->getTitle().'-'.++$count, '-');
+            $wishlistHash = Slugify::create()->slugify($wishlist->getTitle() . '-' . ++$count, '-');
         }
 
         return $wishlistHash;