Refactor some code

Author: andrewbroberg

src/API.php

@@ -29,8 +29,7 @@ public function __construct()
             'timeout' => 60,
             'cookies' => true,
             'headers' => [
-                'User-Agent' => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36"
-            ]
+                'User-Agent' => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2227.1 Safari/537.36"            ]
         ));
 
         $this->client->setClient($this->guzzleClient);
@@ -75,12 +74,15 @@ public function login($username, $password)
 
             $bal = $balance->count() ? $balance->text() : 0;
             $avl = $available->count() ? $available->text() : 0;
+            $bsb = $this->processNumbersOnly($bsb->count() ? $bsb->text() : '');
+            $accountNumber = $this->processNumbersOnly($accountNumber->count() ? $accountNumber->text() : '');
+            $fullAccountNumber = $bsb . $accountNumber;
 
-            $accountList[] = [
+            $accountList[$fullAccountNumber] = [
                 'nickname' => $name->text(),
                 'url' => $name->attr('href'),
-                'bsb' => $bsb->count() ? $bsb->text() : '',
-                'accountNum' => $accountNumber->count() ? $accountNumber->text() : '',
+                'bsb' => $bsb,
+                'accountNum' => $accountNumber,
                 'balance' => $this->processCurrency($bal),
                 'available' => $this->processCurrency($avl)
             ];
@@ -95,8 +97,7 @@ public function login($username, $password)
 
     public function getTransactions($account, $from, $to)
     {
-        $link = sprintf("%s%s", self::BASE_URL, $account['url']);
-        $crawler = $this->client->request('GET', $link);
+        $crawler = $this->getAccountPage($account);
 
         $form = $crawler->filter('#aspnetForm');
 
@@ -110,6 +111,9 @@ public function getTransactions($account, $from, $to)
         $field = $this->createField('input', '__EVENTTARGET', 'ctl00$BodyPlaceHolder$lbSearch');
         $form->set($field);
 
+        $field = $this->createField('input', '__EVENTARGUMENT', '');
+        $form->set($field);
+
         $field = $this->createField('input', 'ctl00$ctl00', 'ctl00$BodyPlaceHolder$updatePanelSearch|ctl00$BodyPlaceHolder$lbSearch');
         $form->set($field);
 
@@ -132,8 +136,44 @@ public function getTransactions($account, $from, $to)
         $form->set($field);
 
         $crawler = $this->client->submit($form);
-        $html = $crawler->html();
 
+        return $this->filterTransactions($crawler);
+    }
+
+    public function setTimezone($timezone)
+    {
+        $this->timezone = $timezone;
+    }
+
+    private function processNumbersOnly($value)
+    {
+        return preg_replace('$[^0-9]$', '', $value);
+    }
+
+    private function processCurrency($amount)
+    {
+        $value = preg_replace('$[^0-9.]$', '', $amount);
+
+        if (strstr($amount, 'DR')) {
+            $value = -$value;
+        }
+
+        return $value;
+    }
+
+    private function createField($type, $name, $value)
+    {
+        $domdocument = new \DOMDocument;
+        $ff = $domdocument->createElement($type);
+        $ff->setAttribute('name', $name);
+        $ff->setAttribute('value', $value);
+        $formfield = new InputFormField($ff);
+
+        return $formfield;
+    }
+
+    public function filterTransactions($crawler)
+    {
         $pattern = '
         /
         \{              # { character
@@ -145,10 +185,10 @@ public function getTransactions($account, $from, $to)
         \}              # } character
         /x
         ';
+        $html = $crawler->html();
 
-        $extracted = preg_match_all($pattern, $html, $matches);
+        preg_match_all($pattern, $html, $matches);
 
-        $transactions = [];
         foreach ($matches[0] as $_temp) {
             if (strstr($_temp, '{"Transactions"')) {
                 $transactions = json_decode($_temp);
@@ -171,35 +211,15 @@ public function getTransactions($account, $from, $to)
                     'receiptnumber' => $transaction->ReceiptNumber->Text,
                 ];
             }
-        }
-
-        return $transactionList;
-    }
-
-    public function setTimezone($timezone)
-    {
-        $this->timezone = $timezone;
-    }
-
-    private function processCurrency($amount)
-    {
-        $value = preg_replace('$[^0-9.]$', '', $amount);
 
-        if (strstr($amount, 'DR')) {
-            $value = -$value;
         }
 
-        return $value;
+        return $transactionList;
     }
 
-    private function createField($type, $name, $value)
+    private function getAccountPage($account)
     {
-        $domdocument = new \DOMDocument;
-        $ff = $domdocument->createElement($type);
-        $ff->setAttribute('name', $name);
-        $ff->setAttribute('value', $value);
-        $formfield = new InputFormField($ff);
-
-        return $formfield;
+        $link = sprintf("%s%s", self::BASE_URL, $account['url']);
+        return $this->client->request('GET', $link);
     }
 }