Magento Exception Handling,

Refactor addFieldToFilter method

Author: maxmi

src/app/code/community/Zendesk/Zendesk/Model/Api/Abstract.php

@@ -97,21 +97,27 @@ protected function _call($endpoint, $params = null, $method = 'GET', $data = nul
         if($response->isError()) {
             if(is_array($body) && isset($body['error'])) {
                 if(is_array($body['error']) && isset($body['error']['title'])) {
-                    if (!$silent)
-                        throw new Exception($body['error']['title'], $response->getStatus());
-                    else
+                    if (!$silent) {
+                        Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__($body['error']['title'],$response->getStatus()));
+                        return;
+                    } else {
                         return $body;
+                    }
                 } else {
-                    if (!$silent)
-                        throw new Exception($body['error'], $response->getStatus());
-                    else
+                    if (!$silent) {
+                        Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__($body['error'],$response->getStatus()));
+                        return;
+                    } else {
                         return $body;
+                    }
                 }
             } else {
-                if (!$silent)
-                    throw new Exception($body, $response->getStatus());
-                else
+                if (!$silent) {
+                    Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__($body, $response->getStatus()));
+                    return;
+                } else {
                     return $body;
+                }
             }
         }
 

src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets/Collection.php

@@ -30,47 +30,75 @@ public function __construct() {
     public function addFieldToFilter($fieldName, $condition = null) {
         if(is_string($condition) OR is_array($condition)) {
 
+            $searchFields = array();
+            
             switch($fieldName) {
                 case 'subject':
-                    $this->_search->addField( new Zendesk_Zendesk_Model_Search_Field("subject", '"'.$condition.'"') );
+                    $searchFields[] = array(
+                        'field' =>  'subject',
+                        'value' =>  '"'.$condition.'"'
+                    );
                     break;
                 case 'requester':
                 case 'requester_id':
                     $value = is_numeric($condition) ? $condition : '*' . $condition . '*';
-                    $this->_search->addField( new Zendesk_Zendesk_Model_Search_Field("requester", $value) );
+                    $searchFields[] = array(
+                        'field' =>  'requester',
+                        'value' =>  $value
+                    );
                     break;
                 case 'tags':
                 case 'status':
                 case 'priority':
                 case 'status':
                 case 'group':
                 case 'assignee':
-                    $this->_search->addField( new Zendesk_Zendesk_Model_Search_Field($fieldName, $condition) );
+                    $searchFields[] = array(
+                        'field' =>  $fieldName,
+                        'value' =>  $condition
+                    );
                     break;
                 case 'type':
-                    $this->_search->addField( new Zendesk_Zendesk_Model_Search_Field('ticket_type', $condition) );
+                    $searchFields[] = array(
+                        'field' =>  'ticket_type',
+                        'value' =>  $condition
+                    );
                     break;
                 case 'id':
-                    $this->_search->addField( new Zendesk_Zendesk_Model_Search_Field('', $condition, '') );
+                    $searchFields[] = array(
+                        'field'     =>  '',
+                        'value'     =>  $condition,
+                        'operator'  =>  ''
+                    );
                     break;
                 case 'created_at':
                 case 'updated_at':
-                    $fields     = array();
                     $fieldName  = substr($fieldName, 0, -3);
 
                     if( isset($condition['from']) AND Mage::helper('zendesk')->isValidDate($condition['from']) ) {
                         $value = Mage::helper('zendesk')->getFormatedDataForAPI( $condition['from'] );
-                        $fields[] = new Zendesk_Zendesk_Model_Search_Field($fieldName, $value, '>');
+                        $searchFields[] = array(
+                            'field'     =>  $fieldName,
+                            'value'     =>  $value,
+                            'operator'  =>  '>'
+                        );
                     }
 
                     if( isset($condition['to']) AND Mage::helper('zendesk')->isValidDate($condition['to']) ) {
                         $value = Mage::helper('zendesk')->getFormatedDataForAPI( $condition['to'] );
-                        $fields[] = new Zendesk_Zendesk_Model_Search_Field($fieldName, $value, '<');
+                        $searchFields[] = array(
+                            'field'     =>  $fieldName,
+                            'value'     =>  $value,
+                            'operator'  =>  '<'
+                        );
                     }
-                    
-                    $this->_search->addFields($fields);
                     break;
             }
+            foreach ($searchFields as $field) {
+                $operator = isset($field['operator']) ? $field['operator'] : ":";
+                $value = isset($field['value']) ? $field['value'] : "none";
+                $this->_search->addField( new Zendesk_Zendesk_Model_Search_Field($field['field'], $value, $operator));
+            }
         }
 
         return $this;

src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php

@@ -113,9 +113,13 @@ public function authenticateAction()
 
                 if( $check ) {
                     $email = $settings->getUsername();
+                } else {
+                    throw new Exception;
                 }
             } catch( Exception $exc ) {
-                //just do nothing
+                Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Could not connect to Zendesk'));
+                $this->_redirect('adminhtml/dashboard');
+                return;
             }
         }