diff --git a/src/app/search/controllers/SearchController.php b/src/app/search/controllers/SearchController.php index 3583383767df47e0edbadb869b68974687e2cb8e..5105a763463a1db2f2c43101164432c80c1f3a10 100644 --- a/src/app/search/controllers/SearchController.php +++ b/src/app/search/controllers/SearchController.php @@ -127,6 +127,13 @@ class SearchController } } + $nonSearchableStatuses = StatusModel::get(['select' => ['id'], 'where' => ['can_be_searched = ?'], 'data' => ['N']]); + if (!empty($nonSearchableStatuses)) { + $nonSearchableStatuses = array_column($nonSearchableStatuses, 'id'); + $searchWhere[] = 'status not in (?)'; + $searchData[] = $nonSearchableStatuses; + } + $limit = 25; if (!empty($queryParams['limit']) && is_numeric($queryParams['limit'])) { $limit = (int)$queryParams['limit']; diff --git a/src/app/status/models/StatusModelAbstract.php b/src/app/status/models/StatusModelAbstract.php index 51600bd30d0765de262add1e43c959a7fdc11f1a..1b91e475d86b45d5b9744c586e1c24edcacaf6e4 100755 --- a/src/app/status/models/StatusModelAbstract.php +++ b/src/app/status/models/StatusModelAbstract.php @@ -19,17 +19,19 @@ use SrcCore\models\DatabaseModel; abstract class StatusModelAbstract { - public static function get(array $aArgs = []) + public static function get(array $args = []) { - ValidatorModel::arrayType($aArgs, ['select']); + ValidatorModel::arrayType($args, ['select', 'where', 'data']); - $aReturn = DatabaseModel::select([ - 'select' => empty($aArgs['select']) ? ['*'] : $aArgs['select'], + $statuses = DatabaseModel::select([ + 'select' => empty($args['select']) ? ['*'] : $args['select'], 'table' => ['status'], + 'where' => $args['where'] ?? [], + 'data' => $args['data'] ?? [], 'order_by' => ['label_status'] ]); - return $aReturn; + return $statuses; } public static function getById(array $aArgs)