tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-24 22:35:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Centralizes calls to expensive functions (-2.5 s).

Browse Source
This commit is contained in:
Maxi Redigonda 2020-07-29 15:50:05 -03:00
parent 384f7c93d7
commit 2bf6b2c23f
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
server/controllers/ticket/search.php
View File

@ -50,6 +50,9 @@ class SearchController extends Controller {
const PATH = '/search'; const PATH = '/search';
const METHOD = 'POST'; const METHOD = 'POST';
private $ignoreDeparmentFilter; private $ignoreDeparmentFilter;
private $ticketTableExists;
private $tagsTableExists;
private $ticketEventTableExists;
public function validations() { public function validations() {
return [ return [
@ -104,7 +107,11 @@ class SearchController extends Controller {
} }
public function handler() { public function handler() {
///$t1 = microtime(true);
$this->ignoreDeparmentFilter = (bool)Controller::request('supervisor'); $this->ignoreDeparmentFilter = (bool)Controller::request('supervisor');
$this->ticketTableExists = RedBean::exec("select table_name from information_schema.tables where table_name = 'ticket';"); /// ~0.602 seconds
$this->tagsTableExists = RedBean::exec("select table_name from information_schema.tables where table_name = 'tag_ticket';");
$this->ticketEventTableExists = RedBean::exec("select table_name from information_schema.tables where table_name = 'ticketevent';");
$allowedDepartmentsId = []; $allowedDepartmentsId = [];
foreach (Controller::getLoggedUser()->sharedDepartmentList->toArray() as $department) { foreach (Controller::getLoggedUser()->sharedDepartmentList->toArray() as $department) {
@ -126,18 +133,17 @@ class SearchController extends Controller {
'allowedDepartments' => $allowedDepartmentsId, 'allowedDepartments' => $allowedDepartmentsId,
'staffId' => Controller::getLoggedUser()->id 'staffId' => Controller::getLoggedUser()->id
]; ];
/// All code until this comment takes ~0.001 seconds $query = $this->getSQLQuery($inputs);
$query = $this->getSQLQuery($inputs); /// ~2.402 seconds $queryWithOrder = $this->getSQLQueryWithOrder($inputs, $query);
$queryWithOrder = $this->getSQLQueryWithOrder($inputs, $query); /// ~3.103 seconds $totalCount = RedBean::getAll("SELECT COUNT(*) FROM (SELECT COUNT(*) " . $query . " ) AS T2", [':query' => "%" . $inputs['query'] . "%", ':queryAtBeginning' => $inputs['query'] . "%" ])[0]['COUNT(*)'];
$totalCount = RedBean::getAll("SELECT COUNT(*) FROM (SELECT COUNT(*) " . $query . " ) AS T2", [':query' => "%" . $inputs['query'] . "%", ':queryAtBeginning' => $inputs['query'] . "%" ])[0]['COUNT(*)']; /// ~0.001 seconds $ticketIdList = RedBean::getAll($queryWithOrder, [':query' => "%" . $inputs['query'] . "%", ':queryAtBeginning' => $inputs['query'] . "%"]);
$ticketIdList = RedBean::getAll($queryWithOrder, [':query' => "%" . $inputs['query'] . "%", ':queryAtBeginning' => $inputs['query'] . "%"]); /// ~0.000 seconds
$ticketList = []; $ticketList = [];
foreach ($ticketIdList as $item) { foreach ($ticketIdList as $item) {
$ticket = Ticket::getDataStore($item['id']); $ticket = Ticket::getDataStore($item['id']);
array_push($ticketList, $ticket->toArray()); array_push($ticketList, $ticket->toArray());
} /// Until here ~0.015 seconds }
$ticketTableExists = RedBean::exec("select table_name from information_schema.tables where table_name = 'ticket';"); /// ~0.602 seconds if($this->ticketTableExists){
if($ticketTableExists){ ///echo '(handler: ' . (microtime(true) - $t1) . ")";
Response::respondSuccess([ Response::respondSuccess([
'tickets' => $ticketList, 'tickets' => $ticketList,
'pages' => ceil($totalCount / 10), 'pages' => ceil($totalCount / 10),
@ -146,15 +152,12 @@ class SearchController extends Controller {
}else{ }else{
Response::respondSuccess([]); Response::respondSuccess([]);
} }
} /// The whole function ~5.793 seconds } /// The whole function ~1.93762321472166
public function getSQLQuery($inputs) { public function getSQLQuery($inputs) {
///$sqlQueryTime = microtime(true); ///$sqlQueryTime = microtime(true);
$tagsTableExists = RedBean::exec("select table_name from information_schema.tables where table_name = 'tag_ticket';"); $taglistQuery = ( $this->tagsTableExists ? " LEFT JOIN tag_ticket ON tag_ticket.ticket_id = ticket.id" : '');
$ticketEventTableExists = RedBean::exec("select table_name from information_schema.tables where table_name = 'ticketevent';"); $ticketeventlistQuery = ( $this->ticketEventTableExists ? " LEFT JOIN ticketevent ON ticketevent.ticket_id = ticket.id" : '');
$taglistQuery = ( $tagsTableExists ? " LEFT JOIN tag_ticket ON tag_ticket.ticket_id = ticket.id" : '');
$ticketeventlistQuery = ( $ticketEventTableExists ? " LEFT JOIN ticketevent ON ticketevent.ticket_id = ticket.id" : '');
$query = "FROM (ticket" . $taglistQuery . $ticketeventlistQuery .")"; $query = "FROM (ticket" . $taglistQuery . $ticketeventlistQuery .")";
$filters = ""; $filters = "";
@ -191,9 +194,7 @@ class SearchController extends Controller {
} }
private function setTagFilter($tagList, &$filters){ private function setTagFilter($tagList, &$filters){
$tagsTableExists = RedBean::exec("select table_name from information_schema.tables where table_name = 'tag_ticket';"); if($tagList && $this->tagsTableExists){
if($tagList && $tagsTableExists){
$filters != "" ? $filters .= " and " : null; $filters != "" ? $filters .= " and " : null;
foreach($tagList as $key => $tag) { foreach($tagList as $key => $tag) {
@ -334,11 +335,9 @@ class SearchController extends Controller {
} }
private function setStringFilter($search, &$filters){ private function setStringFilter($search, &$filters){
$ticketEventTableExists = RedBean::exec("select table_name from information_schema.tables where table_name = 'ticketevent';");
if($search !== null){ if($search !== null){
if ($filters != "") $filters .= " and "; if ($filters != "") $filters .= " and ";
$ticketevent = ( $ticketEventTableExists ? " or (ticketevent.type = 'COMMENT' and ticketevent.content LIKE :query)" : ""); $ticketevent = ( $this->ticketEventTableExists ? " or (ticketevent.type = 'COMMENT' and ticketevent.content LIKE :query)" : "");
$filters .= " (ticket.title LIKE :query or ticket.content LIKE :query or ticket.ticket_number LIKE :query". $ticketevent ." )"; $filters .= " (ticket.title LIKE :query or ticket.content LIKE :query or ticket.ticket_number LIKE :query". $ticketevent ." )";
}; };
} }
@ -373,10 +372,8 @@ class SearchController extends Controller {
}; };
} }
private function setStringOrder($querysearch, &$order){ private function setStringOrder($querysearch, &$order){
$ticketEventTableExists = RedBean::exec("select table_name from information_schema.tables where table_name = 'ticketevent';");
if($querysearch !== null){ if($querysearch !== null){
$ticketeventOrder = ( $ticketEventTableExists ? " WHEN (ticketevent.content LIKE :query) THEN 5 " : ""); $ticketeventOrder = ( $this->ticketEventTableExists ? " WHEN (ticketevent.content LIKE :query) THEN 5 " : "");
$order .= "CASE WHEN (ticket.ticket_number LIKE :query) THEN 1 WHEN (ticket.title LIKE :queryAtBeginning) THEN 2 WHEN (ticket.title LIKE :query) THEN 3 WHEN ( ticket.content LIKE :query) THEN 4 " . $ticketeventOrder ."END asc, "; $order .= "CASE WHEN (ticket.ticket_number LIKE :query) THEN 1 WHEN (ticket.title LIKE :queryAtBeginning) THEN 2 WHEN (ticket.title LIKE :query) THEN 3 WHEN ( ticket.content LIKE :query) THEN 4 " . $ticketeventOrder ."END asc, ";
} }
} }