Skip to content
Snippets Groups Projects
Verified Commit d53f7a69 authored by Damien's avatar Damien
Browse files

FEAT #13271 TIME 3:00 Improve search

parent 458e4112
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/app/search/controllers/SearchController.php
+ 330
− 144
View file @ d53f7a69
......@@ -21,84 +21,34 @@ use Contact\controllers\ContactController;
use Contact\models\ContactModel;
use Doctype\models\DoctypeModel;
use Entity\models\EntityModel;
use Folder\models\ResourceFolderModel;
use Priority\models\PriorityModel;
use RegisteredMail\models\RegisteredMailModel;
use Resource\models\ResModel;
use Resource\models\ResourceContactModel;
use Respect\Validation\Validator;
use Slim\Http\Request;
use Slim\Http\Response;
use SrcCore\controllers\AutoCompleteController;
use SrcCore\controllers\PreparedClauseController;
use SrcCore\models\DatabaseModel;
use SrcCore\models\ValidatorModel;
use Status\models\StatusModel;
use Tag\models\ResourceTagModel;
use User\controllers\UserController;
use User\models\UserModel;
class SearchController
{
public static function get(Request $request, Response $response)
public function get(Request $request, Response $response)
{
$body = $request->getParsedBody();
if (UserController::isRoot(['id' => $GLOBALS['id']])) {
$whereClause = '1=1';
$dataClause = [];
} else {
$entities = UserModel::getEntitiesById(['id' => $GLOBALS['id'], 'select' => ['entities.id']]);
$entities = array_column($entities, 'id');
$entities = empty($entities) ? [0] : $entities;
$foldersClause = 'res_id in (select res_id from folders LEFT JOIN entities_folders ON folders.id = entities_folders.folder_id LEFT JOIN resources_folders ON folders.id = resources_folders.folder_id ';
$foldersClause .= 'WHERE entities_folders.entity_id in (?) OR folders.user_id = ?)';
$whereClause = "(res_id in (select res_id from users_followed_resources where user_id = ?)) OR ({$foldersClause})";
$dataClause = [$GLOBALS['id'], $entities, $GLOBALS['id']];
$groups = UserModel::getGroupsByLogin(['login' => $GLOBALS['login'], 'select' => ['where_clause']]);
$groupsClause = '';
foreach ($groups as $key => $group) {
if (!empty($group['where_clause'])) {
$groupClause = PreparedClauseController::getPreparedClause(['clause' => $group['where_clause'], 'login' => $GLOBALS['login']]);
if ($key > 0) {
$groupsClause .= ' or ';
}
$groupsClause .= "({$groupClause})";
}
}
if (!empty($groupsClause)) {
$whereClause .= " OR ({$groupsClause})";
}
$baskets = BasketModel::getBasketsByLogin(['login' => $GLOBALS['login']]);
$basketsClause = '';
foreach ($baskets as $basket) {
if (!empty($basket['basket_clause'])) {
$basketClause = PreparedClauseController::getPreparedClause(['clause' => $basket['basket_clause'], 'login' => $GLOBALS['login']]);
if (!empty($basketsClause)) {
$basketsClause .= ' or ';
}
$basketsClause .= "({$basketClause})";
}
}
$assignedBaskets = RedirectBasketModel::getAssignedBasketsByUserId(['userId' => $GLOBALS['id']]);
foreach ($assignedBaskets as $basket) {
if (!empty($basket['basket_clause'])) {
$basketOwner = UserModel::getById(['id' => $basket['owner_user_id'], 'select' => ['user_id']]);
$basketClause = PreparedClauseController::getPreparedClause(['clause' => $basket['basket_clause'], 'login' => $basketOwner['user_id']]);
if (!empty($basketsClause)) {
$basketsClause .= ' or ';
}
$basketsClause .= "({$basketClause})";
}
}
if (!empty($basketsClause)) {
$whereClause .= " OR ({$basketsClause})";
}
}
$userdataClause = SearchController::getUserDataClause(['userId' => $GLOBALS['id'], 'login' => $GLOBALS['login']]);
$searchWhere = $userdataClause['searchWhere'];
$searchData = $userdataClause['searchData'];
$searchWhere = ["({$whereClause})"];
$searchData = $dataClause;
//TODO meta champs
if (!empty($queryParams['resourceField'])) {
$fields = ['subject', 'alt_identifier'];
$fields = AutoCompleteController::getUnsensitiveFieldsForRequest(['fields' => $fields]);
......@@ -112,6 +62,7 @@ class SearchController
$searchWhere = array_merge($searchWhere, $requestData['where']);
$searchData = array_merge($searchData, $requestData['data']);
}
//TODO à garder ?
// if (!empty($queryParams['contactField'])) {
// $fields = ['company', 'firstname', 'lastname'];
// $fields = AutoCompleteController::getUnsensitiveFieldsForRequest(['fields' => $fields]);
......@@ -137,92 +88,19 @@ class SearchController
// $searchWhere[] = 'res_id in (?)';
// $searchData[] = $contactsMatch;
// }
if (!empty($body['senders']) && is_array($body['senders']['values']) && !empty($body['senders']['values'])) {
$where = '';
$data = [];
foreach ($body['senders']['values'] as $value) {
if (!empty($where)) {
$where .= ' OR ';
}
$where .= '(item_id = ? AND type = ?)';
$data[] = $value['id'];
$data[] = $value['type'];
}
$data[] = 'sender';
$contactsMatch = ResourceContactModel::get([
'select' => ['res_id'],
'where' => ["({$where})", 'mode = ?'],
'data' => $data
]);
if (empty($contactsMatch)) {
return $response->withJson(['resources' => [], 'count' => 0, 'allResources' => []]);
}
$contactsMatch = array_column($contactsMatch, 'res_id');
$searchWhere[] = 'res_id in (?)';
$searchData[] = $contactsMatch;
}
if (!empty($body['recipients']) && is_array($body['recipients']['values']) && !empty($body['recipients']['values'])) {
$where = '';
$data = [];
foreach ($body['recipients']['values'] as $value) {
if (!empty($where)) {
$where .= ' OR ';
}
$where .= '(item_id = ? AND type = ?)';
$data[] = $value['id'];
$data[] = $value['type'];
}
$data[] = 'recipient';
$contactsMatch = ResourceContactModel::get([
'select' => ['res_id'],
'where' => ["({$where})", 'mode = ?'],
'data' => $data
]);
if (empty($contactsMatch)) {
return $response->withJson(['resources' => [], 'count' => 0, 'allResources' => []]);
}
$contactsMatch = array_column($contactsMatch, 'res_id');
$searchWhere[] = 'res_id in (?)';
$searchData[] = $contactsMatch;
}
//TODO tags, folders
if (!empty($body['doctype']) && is_array($body['doctype']['values']) && !empty($body['doctype']['values'])) {
$searchWhere[] = 'type_id in (?)';
$searchData[] = $body['doctype']['values'];
}
if (!empty($body['priority']) && is_array($body['priority']['values']) && !empty($body['priority']['values'])) {
$searchWhere[] = 'priority in (?)';
$searchData[] = $body['priority']['values'];
}
if (!empty($body['confidentiality']) && is_bool($body['confidentiality']['values'])) {
$searchWhere[] = 'confidentiality = ?';
$searchData[] = empty($body['confidentiality']['values']) ? 'N' : 'Y';
}
if (!empty($body['initiator']) && is_array($body['initiator']['values']) && !empty($body['initiator']['values'])) {
$searchWhere[] = 'initiator in (?)';
$searchData[] = $body['initiator']['values'];
}
if (!empty($body['destination']) && is_array($body['destination']['values']) && !empty($body['destination']['values'])) {
$searchWhere[] = 'destination in (?)';
$searchData[] = $body['destination']['values'];
}
//TODO dates
if (!empty($body['departureDate']) && is_array($body['initiator']['values']) && !empty($body['initiator']['values'])) {
$searchWhere[] = 'initiator in (?)';
$searchData[] = $body['initiator']['values'];
}
if (!empty($body['processLimitDate']) && is_array($body['initiator']['values']) && !empty($body['initiator']['values'])) {
$searchWhere[] = 'initiator in (?)';
$searchData[] = $body['initiator']['values'];
}
if (!empty($body['documentDate']) && is_array($body['initiator']['values']) && !empty($body['initiator']['values'])) {
$searchWhere[] = 'initiator in (?)';
$searchData[] = $body['initiator']['values'];
$searchClause = SearchController::getMainFieldsClause(['body' => $body, 'searchWhere' => $searchWhere, 'searchData' => $searchData]);
if (empty($searchClause)) {
return $response->withJson(['resources' => [], 'count' => 0, 'allResources' => []]);
}
if (!empty($body['arrivalDate']) && is_array($body['initiator']['values']) && !empty($body['initiator']['values'])) {
$searchWhere[] = 'initiator in (?)';
$searchData[] = $body['initiator']['values'];
$searchWhere = $searchClause['searchWhere'];
$searchData = $searchClause['searchData'];
$searchClause = SearchController::getRegisteredMailsClause(['body' => $body, 'searchWhere' => $searchWhere, 'searchData' => $searchData]);
if (empty($searchClause)) {
return $response->withJson(['resources' => [], 'count' => 0, 'allResources' => []]);
}
$searchWhere = $searchClause['searchWhere'];
$searchData = $searchClause['searchData'];
$nonSearchableStatuses = StatusModel::get(['select' => ['id'], 'where' => ['can_be_searched = ?'], 'data' => ['N']]);
if (!empty($nonSearchableStatuses)) {
......@@ -358,4 +236,312 @@ class SearchController
return $response->withJson(['resources' => $resources, 'count' => count($allResources), 'allResources' => $allResources]);
}
private static function getUserDataClause(array $args)
{
ValidatorModel::notEmpty($args, ['userId', 'login']);
ValidatorModel::intVal($args, ['userId']);
ValidatorModel::stringType($args, ['login']);
if (UserController::isRoot(['id' => $args['userId']])) {
$whereClause = '1=?';
$dataClause = [1];
} else {
$entities = UserModel::getEntitiesById(['id' => $args['userId'], 'select' => ['entities.id']]);
$entities = array_column($entities, 'id');
$entities = empty($entities) ? [0] : $entities;
$foldersClause = 'res_id in (select res_id from folders LEFT JOIN entities_folders ON folders.id = entities_folders.folder_id LEFT JOIN resources_folders ON folders.id = resources_folders.folder_id ';
$foldersClause .= 'WHERE entities_folders.entity_id in (?) OR folders.user_id = ?)';
$whereClause = "(res_id in (select res_id from users_followed_resources where user_id = ?)) OR ({$foldersClause})";
$dataClause = [$args['userId'], $entities, $args['userId']];
$groups = UserModel::getGroupsByLogin(['login' => $args['login'], 'select' => ['where_clause']]);
$groupsClause = '';
foreach ($groups as $key => $group) {
if (!empty($group['where_clause'])) {
$groupClause = PreparedClauseController::getPreparedClause(['clause' => $group['where_clause'], 'login' => $args['login']]);
if ($key > 0) {
$groupsClause .= ' or ';
}
$groupsClause .= "({$groupClause})";
}
}
if (!empty($groupsClause)) {
$whereClause .= " OR ({$groupsClause})";
}
$baskets = BasketModel::getBasketsByLogin(['login' => $args['login']]);
$basketsClause = '';
foreach ($baskets as $basket) {
if (!empty($basket['basket_clause'])) {
$basketClause = PreparedClauseController::getPreparedClause(['clause' => $basket['basket_clause'], 'login' => $args['login']]);
if (!empty($basketsClause)) {
$basketsClause .= ' or ';
}
$basketsClause .= "({$basketClause})";
}
}
$assignedBaskets = RedirectBasketModel::getAssignedBasketsByUserId(['userId' => $args['userId']]);
foreach ($assignedBaskets as $basket) {
if (!empty($basket['basket_clause'])) {
$basketOwner = UserModel::getById(['id' => $basket['owner_user_id'], 'select' => ['user_id']]);
$basketClause = PreparedClauseController::getPreparedClause(['clause' => $basket['basket_clause'], 'login' => $basketOwner['user_id']]);
if (!empty($basketsClause)) {
$basketsClause .= ' or ';
}
$basketsClause .= "({$basketClause})";
}
}
if (!empty($basketsClause)) {
$whereClause .= " OR ({$basketsClause})";
}
}
return ['searchWhere' => ["({$whereClause})"], 'searchData' => $dataClause];
}
private static function getMainFieldsClause(array $args)
{
ValidatorModel::notEmpty($args, ['body', 'searchWhere', 'searchData']);
ValidatorModel::arrayType($args, ['body', 'searchWhere', 'searchData']);
$body = $args['body'];
if (!empty($body['subject']) && !empty($body['subject']['values']) && is_string($body['subject']['values'])) {
$fields = ['subject'];
$fields = AutoCompleteController::getUnsensitiveFieldsForRequest(['fields' => $fields]);
$requestData = AutoCompleteController::getDataForRequest([
'search' => $body['subject']['values'],
'fields' => $fields,
'where' => [],
'data' => [],
'fieldsNumber' => 1
]);
$subjectGlue = implode(' AND ',$requestData['where']);
$subjectGlue = "(($subjectGlue) OR res_id in (select res_id_master from res_attachments where title ilike ?))";
$args['searchWhere'][] = $subjectGlue;
$args['searchData'] = array_merge($args['searchData'], $requestData['data']);
$args['searchData'][] = "%{$body['subject']['values']}%";
}
if (!empty($body['chrono']) && !empty($body['chrono']['values']) && is_string($body['chrono']['values'])) {
$args['searchWhere'][] = '(alt_identifier ilike ? OR res_id in (select res_id_master from res_attachments where identifier ilike ?))';
$args['searchData'][] = "%{$body['chrono']['values']}%";
$args['searchData'][] = "%{$body['chrono']['values']}%";
}
if (!empty($body['doctype']) && !empty($body['doctype']['values']) && is_array($body['doctype']['values'])) {
$args['searchWhere'][] = 'type_id in (?)';
$args['searchData'][] = $body['doctype']['values'];
}
if (!empty($body['priority']) && !empty($body['priority']['values']) && is_array($body['priority']['values'])) {
$args['searchWhere'][] = 'priority in (?)';
$args['searchData'][] = $body['priority']['values'];
}
if (!empty($body['confidentiality']) && is_bool($body['confidentiality']['values'])) {
$args['searchWhere'][] = 'confidentiality = ?';
$args['searchData'][] = empty($body['confidentiality']['values']) ? 'N' : 'Y';
}
if (!empty($body['initiator']) && !empty($body['initiator']['values']) && is_array($body['initiator']['values'])) {
$args['searchWhere'][] = 'initiator in (?)';
$args['searchData'][] = $body['initiator']['values'];
}
if (!empty($body['destination']) && !empty($body['destination']['values']) && is_array($body['destination']['values'])) {
$args['searchWhere'][] = 'destination in (?)';
$args['searchData'][] = $body['destination']['values'];
}
if (!empty($body['documentDate']) && !empty($body['documentDate']['values']) && is_array($body['documentDate']['values'])) {
if (Validator::date()->notEmpty()->validate($body['documentDate']['values']['start'])) {
$args['searchWhere'][] = 'doc_date > ?';
$args['searchData'][] = $body['documentDate']['values']['start'];
}
if (Validator::date()->notEmpty()->validate($body['documentDate']['values']['end'])) {
$args['searchWhere'][] = 'doc_date < ?';
$args['searchData'][] = $body['documentDate']['values']['end'];
}
}
if (!empty($body['arrivalDate']) && !empty($body['arrivalDate']['values']) && is_array($body['arrivalDate']['values'])) {
if (Validator::date()->notEmpty()->validate($body['arrivalDate']['values']['start'])) {
$args['searchWhere'][] = 'admission_date > ?';
$args['searchData'][] = $body['arrivalDate']['values']['start'];
}
if (Validator::date()->notEmpty()->validate($body['arrivalDate']['values']['end'])) {
$args['searchWhere'][] = 'admission_date < ?';
$args['searchData'][] = $body['arrivalDate']['values']['end'];
}
}
if (!empty($body['departureDate']) && !empty($body['departureDate']['values']) && is_array($body['departureDate']['values'])) {
if (Validator::date()->notEmpty()->validate($body['departureDate']['values']['start'])) {
$args['searchWhere'][] = 'departure_date > ?';
$args['searchData'][] = $body['departureDate']['values']['start'];
}
if (Validator::date()->notEmpty()->validate($body['departureDate']['values']['end'])) {
$args['searchWhere'][] = 'departure_date < ?';
$args['searchData'][] = $body['departureDate']['values']['end'];
}
}
if (!empty($body['processLimitDate']) && !empty($body['processLimitDate']['values']) && is_array($body['processLimitDate']['values'])) {
if (Validator::date()->notEmpty()->validate($body['processLimitDate']['values']['start'])) {
$args['searchWhere'][] = 'process_limit_date > ?';
$args['searchData'][] = $body['processLimitDate']['values']['start'];
}
if (Validator::date()->notEmpty()->validate($body['processLimitDate']['values']['end'])) {
$args['searchWhere'][] = 'process_limit_date < ?';
$args['searchData'][] = $body['processLimitDate']['values']['end'];
}
}
if (!empty($body['senders']) && is_array($body['senders']['values']) && !empty($body['senders']['values'])) {
$where = '';
$data = [];
foreach ($body['senders']['values'] as $value) {
if (!empty($where)) {
$where .= ' OR ';
}
$where .= '(item_id = ? AND type = ?)';
$data[] = $value['id'];
$data[] = $value['type'];
}
$data[] = 'sender';
$sendersMatch = ResourceContactModel::get([
'select' => ['res_id'],
'where' => ["({$where})", 'mode = ?'],
'data' => $data
]);
if (empty($sendersMatch)) {
return null;
}
$sendersMatch = array_column($sendersMatch, 'res_id');
$args['searchWhere'][] = 'res_id in (?)';
$args['searchData'][] = $sendersMatch;
}
if (!empty($body['recipients']) && is_array($body['recipients']['values']) && !empty($body['recipients']['values'])) {
$where = '';
$data = [];
foreach ($body['recipients']['values'] as $value) {
if (!empty($where)) {
$where .= ' OR ';
}
$where .= '(item_id = ? AND type = ?)';
$data[] = $value['id'];
$data[] = $value['type'];
}
$data[] = 'recipient';
$recipientsMatch = ResourceContactModel::get([
'select' => ['res_id'],
'where' => ["({$where})", 'mode = ?'],
'data' => $data
]);
if (empty($recipientsMatch)) {
return null;
}
$recipientsMatch = array_column($recipientsMatch, 'res_id');
$args['searchWhere'][] = 'res_id in (?)';
$args['searchData'][] = $recipientsMatch;
}
if (!empty($body['tags']) && is_array($body['tags']['values']) && !empty($body['tags']['values'])) {
$tagsMatch = ResourceTagModel::get([
'select' => ['res_id'],
'where' => ['tag_id in (?)'],
'data' => [$body['tags']['values']]
]);
if (empty($tagsMatch)) {
return null;
}
$tagsMatch = array_column($tagsMatch, 'res_id');
$args['searchWhere'][] = 'res_id in (?)';
$args['searchData'][] = $tagsMatch;
}
if (!empty($body['folders']) && is_array($body['folders']['values']) && !empty($body['folders']['values'])) {
$foldersMatch = ResourceFolderModel::get([
'select' => ['res_id'],
'where' => ['folder_id in (?)'],
'data' => [$body['folders']['values']]
]);
if (empty($foldersMatch)) {
return null;
}
$foldersMatch = array_column($foldersMatch, 'res_id');
$args['searchWhere'][] = 'res_id in (?)';
$args['searchData'][] = $foldersMatch;
}
return ['searchWhere' => $args['searchWhere'], 'searchData' => $args['searchData']];
}
private static function getRegisteredMailsClause(array $args)
{
ValidatorModel::notEmpty($args, ['body', 'searchWhere', 'searchData']);
ValidatorModel::arrayType($args, ['body', 'searchWhere', 'searchData']);
$body = $args['body'];
if (!empty($body['registeredMail_type']) && is_array($body['registeredMail_type']['values']) && !empty($body['registeredMail_type']['values'])) {
$registeredMailsMatch = RegisteredMailModel::get([
'select' => ['res_id'],
'where' => ['type in (?)'],
'data' => [$body['registeredMail_type']['values']]
]);
if (empty($registeredMailsMatch)) {
return null;
}
$registeredMailsMatch = array_column($registeredMailsMatch, 'res_id');
$args['searchWhere'][] = 'res_id in (?)';
$args['searchData'][] = $registeredMailsMatch;
}
if (!empty($body['registeredMail_issuingSite']) && is_array($body['registeredMail_issuingSite']['values']) && !empty($body['registeredMail_issuingSite']['values'])) {
$registeredMailsMatch = RegisteredMailModel::get([
'select' => ['res_id'],
'where' => ['issuing_site in (?)'],
'data' => [$body['registeredMail_issuingSite']['values']]
]);
if (empty($registeredMailsMatch)) {
return null;
}
$registeredMailsMatch = array_column($registeredMailsMatch, 'res_id');
$args['searchWhere'][] = 'res_id in (?)';
$args['searchData'][] = $registeredMailsMatch;
}
if (!empty($body['registeredMail_issuingSite']) && is_array($body['registeredMail_issuingSite']['values']) && !empty($body['registeredMail_issuingSite']['values'])) {
$registeredMailsMatch = RegisteredMailModel::get([
'select' => ['res_id'],
'where' => ['issuing_site in (?)'],
'data' => [$body['registeredMail_issuingSite']['values']]
]);
if (empty($registeredMailsMatch)) {
return null;
}
$registeredMailsMatch = array_column($registeredMailsMatch, 'res_id');
$args['searchWhere'][] = 'res_id in (?)';
$args['searchData'][] = $registeredMailsMatch;
}
if (!empty($body['registeredMail_warranty']) && is_array($body['registeredMail_warranty']['values']) && !empty($body['registeredMail_warranty']['values'])) {
$registeredMailsMatch = RegisteredMailModel::get([
'select' => ['res_id'],
'where' => ['warranty in (?)'],
'data' => [$body['registeredMail_warranty']['values']]
]);
if (empty($registeredMailsMatch)) {
return null;
}
$registeredMailsMatch = array_column($registeredMailsMatch, 'res_id');
$args['searchWhere'][] = 'res_id in (?)';
$args['searchData'][] = $registeredMailsMatch;
}
if (!empty($body['registeredMail_letter']) && is_bool($body['registeredMail_letter']['values'])) {
$registeredMailsMatch = RegisteredMailModel::get([
'select' => ['res_id'],
'where' => ['letter = ?'],
'data' => [empty($body['registeredMail_letter']['values']) ? 'false' : 'true']
]);
if (empty($registeredMailsMatch)) {
return null;
}
$registeredMailsMatch = array_column($registeredMailsMatch, 'res_id');
$args['searchWhere'][] = 'res_id in (?)';
$args['searchData'][] = $registeredMailsMatch;
}
return ['searchWhere' => $args['searchWhere'], 'searchData' => $args['searchData']];
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment