Correcting some introduced issues.

Author: Samuel Janda

controller/extract.php

@@ -35,6 +35,7 @@
   $response->send();
   exit();
 }
+$data = str_replace(" ", "+", $_GET['data']);
 
 if ($_SERVER['CONTENT_TYPE'] !== 'application/json') {
   $response = new Response();
@@ -73,7 +74,7 @@
     $extract = new Extract();
     $extract->location->setID(intval($_GET['id']));
     $extract->location->setAuthContact($json_data->authName);
-    if (!$extract->detectMode($_GET['data'])) {
+    if (!$extract->detectMode($data)) {
       $response = new Response();
       $response->setHttpStatusCode(400);
       $response->setSuccess(false);
@@ -112,7 +113,7 @@
 
     if ($extract->getMode() === Extract::MODE_PHONE) {
       $visitor = new Visitor();
-      $visitor->setPhoneNumber($_GET['data']);
+      $visitor->setPhoneNumber($data);
 
       $query_phone = $visitor->getPhoneNumber();
       $query = $writeDB->prepare("SELECT a.id as id, a.business_name as `location`, COUNT(c.phone) as `count` FROM accounts a, contacts c WHERE c.phone = :ph AND a.id = c.account_id GROUP BY `location`");
@@ -142,7 +143,7 @@
         $response->send();
         exit();
       }
-    } else {
+    } elseif ($extract->getMode() === Extract::MODE_DATE) {
       $query_date = $extract->getDate();
       $query = $writeDB->prepare("SELECT `name`, `phone`, `arr`, `dep` FROM contacts WHERE account_id =:id AND DATE(arr)=DATE(:d)");
       $query->bindParam(":id", $query_id, PDO::PARAM_STR);
@@ -171,6 +172,14 @@
       $response->setHttpStatusCode(200);
       $response->setSuccess(true);
       $response->addMessage("Request received successfully.");
+      $response->addMessage("Data: {$data}");
+      $response->send();
+      exit();
+    } else {
+      $response = new Response();
+      $response->setHttpStatusCode(401);
+      $response->setSuccess(false);
+      $response->addMessage("Error: extraction request type not identified.");
       $response->send();
       exit();
     }
@@ -195,6 +204,8 @@
   $response->setHttpStatusCode(400);
   $response->setSuccess(false);
   $response->addMessage("API Exception: " . $e->getMessage());
+  $response->addMessage("Data: {$data} - length: " . strlen($data));
+  $response->addMessage("Mode: " . $extract->getMode());
   $response->send();
   exit();
 } catch (Exception $e) {

model/Config.php

@@ -16,6 +16,7 @@ public static function ValidatePhoneNumber(string $pn): bool
     if (strlen($pn) !== 12) return false; //Phone number length confirmed
     if (substr($pn, 0, 3) !== "+61") return false; //Australian telephone number confirmed
     $vb = intval(substr($pn, 4, 2)); //substring to be evaluated against valid number ranges
+    if (in_array(substr($pn, 3, 1), ["0", "1", "5", "6", "9"])) return false; //Invalid area codes eliminated
     if (substr($pn, 3, 1) === "2" && ($vb < 37 && $vb !== 33)) return false; //NSW/ACT Number confirmed
     if (substr($pn, 3, 1) === "3" && ($vb < 32 || $vb > 34) && ($vb < 40 || $vb > 67 && ($vb !== 46 || $vb !== 60 || $vb !== 66)) && $vb < 70) return false; //VIC/TAS Number confirmed
     if (substr($pn, 3, 1) === "7" && ($vb < 20 && $vb > 58 && ($vb !== 50 || $vb !== 51)) && $vb !== 70 && ($vb < 75 || $vb > 77) && $vb !== 79) return false; //QLD Number confirmed

model/Extract.php

@@ -38,7 +38,7 @@ public function getMode() {
   }
 
   public function detectMode(string $data):bool {
-    if (substr($data, 0, 1) === "+") {
+    if (strlen($data) === 12) {
       $this->mode = self::MODE_PHONE;
       return true;
     }
@@ -59,9 +59,7 @@ public function getDate() {
 
   public function addRow(string $name, string $phone, string $arr, string $dep):bool {
     $visitor = new Visitor();
-    $visitor->setName($name);
-    $visitor->setPhoneNumber($phone);
-    array_push($this->data_table, new Visit($visitor->getName(), $visitor->getPhoneNumber(), $arr, $dep));
+    array_push($this->data_table, new Visit($name, $phone, $arr, $dep));
     return true;
   }
 

model/Visitor.php

@@ -51,7 +51,7 @@ public function setName(string $name):bool {
   }
 
   public function setPhoneNumber(string $pn):bool {
-    if (is_null($pn) || !Config::ValidatePhoneNumber($pn)) throw new APIException("Phone number must not be null and must be a string in the format +61xxxxxxxxx.");
+    if (is_null($pn) || !Config::ValidatePhoneNumber($pn)) throw new APIException("Phone number must not be null and must be a string in the format +61xxxxxxxxx. For example, if your telephone number is 0412-123-987 you would enter +61412123987.");
     $this->_phone_number = $pn;
     return true;
   }