diff --git a/web-services/repositories/ticketRepository.php b/web-services/repositories/ticketRepository.php index 51368b7b..d77ea61c 100644 --- a/web-services/repositories/ticketRepository.php +++ b/web-services/repositories/ticketRepository.php @@ -1,6 +1,6 @@ connect_error) { return ('An error occurred when establishing a connection to the database.'); @@ -26,35 +26,6 @@ class TicketRepository { return self::generateTicketModel($result); } - public static function getTicketForTrackingId($id, $settings) - { - $connection = new mysqli($settings['db_host'], $settings['db_user'], $settings['db_pass'], $settings['db_name']); - if ($connection->connect_error) - { - return ('An error occurred when establishing a connection to the database.'); - } - - $sql = self::getDefaultSql($settings). - 'WHERE T.trackid = '.$id; - $results = $connection->query($sql); - - //-- There should only be one result as Tracking IDs should be unique. If there are two, return a 422 response. - if ($results->num_rows > 1) - { - header(http_response_code(422)); - return; - } elseif ($results->num_rows == 0) - { - //-- No ticket found. Return a 404. - header(http_response_code(404)); - return; - } else { - $result = $results->fetch_assoc(); - $connection->close(); - return self::generateTicketModel($result); - } - } - private static function generateTicketModel($result) { $ticket = new Ticket(); diff --git a/web-services/ticket/getTicket.php b/web-services/ticket/index.php similarity index 54% rename from web-services/ticket/getTicket.php rename to web-services/ticket/index.php index abe7f05d..2db108b1 100644 --- a/web-services/ticket/getTicket.php +++ b/web-services/ticket/index.php @@ -3,21 +3,16 @@ //-- This service will return ticket information for a specific ticket ID (NOT TRACKING ID) header('Content-Type: application/json'); define('IN_SCRIPT',1); -define('HESK_PATH','/../../'); +define('HESK_PATH','../../'); -require(HESK_PATH . 'hesk_settings.inc.php'); -include('/../repositories/ticketRepository.php'); +include(HESK_PATH . 'hesk_settings.inc.php'); +include(__DIR__ . '/../repositories/ticketRepository.php'); if(isset($_GET['id'])) { $ticket = TicketRepository::getTicketForId($_GET['id'], $hesk_settings); echo json_encode($ticket); } -elseif (isset($_GET['trackingid'])) -{ - $ticket = TicketRepository::getTicketForTrackingId($_GET['trackingid'], $hesk_settings); - echo json_encode($ticket); -} else { header(http_response_code(400));