Remove legacy code from observer

Author: RBech

code/Model/Communicator.php

@@ -19,30 +19,30 @@ class Clerk_Clerk_Model_Communicator extends Mage_Core_Helper_Abstract
      *
      * In the future we should find a better solution to this problem.
      */
-    public function syncProduct($productId, $eventname)
+    public function syncProduct($productId)
     {
-        $isDeleteEvent = $eventname == 'catalog_product_delete_before';
         $product = Mage::getModel('clerk/product')->load($productId);
         $appEmulation = Mage::getSingleton('core/app_emulation');
+
         foreach ($product->getStoreIds() as $storeId) {
             $store_enabled = Mage::helper('clerk')->getSetting('clerk/general/active', $storeId);
-            if (!$store_enabled) {
+
+            if (! $store_enabled) {
                 continue;
             }
+
             $initialEnvironmentInfo = $appEmulation->startEnvironmentEmulation($storeId);
             $product = Mage::getModel('clerk/product')->load($productId);
-            if ($isDeleteEvent || $product->isExcluded()) {
-                $data = [];
-                $data['id'] = $productId;
-                $data['key'] = $this->getPublicKey($storeId);
-                $data['private_key'] = $this->getPrivateKey($storeId);
-                $this->post('product/remove', $data);
+
+            if ($product->isExcluded()) {
+                $this->removeProduct($productId);
             } else {
                 $data = $product->getClerkExportData();
                 $data['key'] = $this->getPublicKey($storeId);
                 $data['private_key'] = $this->getPrivateKey($storeId);
                 $this->post('product/add', $data);
             }
+
             $appEmulation->stopEnvironmentEmulation($initialEnvironmentInfo);
         }
     }

code/Model/Observer.php

@@ -41,7 +41,7 @@ public function itemAddedToCart(Varien_Event_Observer $observer)
     public function syncProduct(Varien_Event_Observer $observer)
     {
         $productId = $observer->getEvent()->getProduct()->getId();
-        Mage::getModel('clerk/communicator')->syncProduct($productId, $observer->getEvent()->getName());
+        Mage::getModel('clerk/communicator')->syncProduct($productId);
     }
 
     /**

code/Model/Productpage.php

@@ -32,6 +32,7 @@ private function fetch()
         foreach ($this->collection as $_product) {
             $productId = $_product->getId();
             $product = Mage::getModel('clerk/product')->load($productId);
+
             if (!$product->isExcluded()) {
                 $this->array[] = $product->getClerkExportData();
             }

code/controllers/ApiController.php

@@ -54,14 +54,14 @@ public function versionAction()
     public function storeAction()
     {
         $this->setStore();
-        $data = array();
+        $data = [];
 
         foreach (Mage::helper('clerk')->getAllStores() as $store) {
-            $data[] = array(
+            $data[] = [
                 'id' => $store->getId(),
                 'name' => $store->getName(),
                 'active' => (bool) Mage::getStoreConfig('clerk/general/active', $store),
-            );
+            ];
         }
 
         $this->getResponse()->setBody(json_encode($data));
@@ -123,7 +123,7 @@ public function categoryAction()
             ->getCollection()
             ->addIsActiveFilter()
             ->addAttributeToSelect('name')
-            ->addAttributeToFilter('path', array('like' => "1/{$rootCategoryId}/%"))
+            ->addAttributeToFilter('path', ['like' => "1/{$rootCategoryId}/%"])
             ->setOrder('entity_id', Varien_Db_Select::SQL_ASC)
             ->setPageSize($limit)
             ->setCurPage($page);
@@ -134,12 +134,12 @@ public function categoryAction()
             //Get children categories
             $children = $category->getResource()->getChildren($category);
 
-            $data = array(
+            $data = [
                 'id' => (int) $category->getId(),
                 'name' => $category->getName(),
                 'url' => $category->getUrl(),
                 'subcategories' => array_map('intval', $children),
-            );
+            ];
 
             $items[] = $data;
         }
@@ -167,7 +167,7 @@ public function orderAction()
         $days = $this->getIntParam('days');
 
         if (Mage::getStoreConfigFlag('clerk/general/disable_order_synchronization')) {
-            $this->getResponse()->setBody(json_encode(array()));
+            $this->getResponse()->setBody(json_encode([]));
         } else {
             $page = Mage::getModel('clerk/orderpage')->load($page, $limit, $days);
             $this->getResponse()->setHeader('Total-Page-Count', $page->totalPages);

code/etc/config.xml

@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Clerk_Clerk>
-            <version>3.4.9</version>
+            <version>3.5.0</version>
         </Clerk_Clerk>
     </modules>
     <global>