refactor(arch): enforce gateway compliance and remove service-wrapping gateways
This commit is contained in:
@@ -4,14 +4,13 @@ namespace MintyPHP\Service\Search;
|
||||
|
||||
use MintyPHP\Repository\Search\SearchQueryRepository;
|
||||
use MintyPHP\Repository\Tenant\UserTenantRepository;
|
||||
use MintyPHP\Service\Access\PermissionGateway;
|
||||
use MintyPHP\Service\Access\PermissionService;
|
||||
use MintyPHP\Support\SearchConfig;
|
||||
|
||||
class SearchDataService
|
||||
{
|
||||
public function __construct(
|
||||
private readonly PermissionGateway $permissionGateway,
|
||||
private readonly PermissionService $permissionService,
|
||||
private readonly UserTenantRepository $userTenantRepository,
|
||||
private readonly SearchQueryRepository $searchQueryRepository
|
||||
) {
|
||||
@@ -37,7 +36,7 @@ class SearchDataService
|
||||
}
|
||||
|
||||
$perm = (string) ($resource['permission'] ?? '');
|
||||
if ($perm !== '' && !$this->permissionGateway->userHas($userId, $perm)) {
|
||||
if ($perm !== '' && !$this->permissionService->userHas($userId, $perm)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -68,7 +67,7 @@ class SearchDataService
|
||||
}
|
||||
|
||||
$items = array_merge($items, SearchConfig::hotkeyResultItems($query));
|
||||
if ($this->permissionGateway->userHas($userId, PermissionService::DOCS_VIEW)) {
|
||||
if ($this->permissionService->userHas($userId, PermissionService::DOCS_VIEW)) {
|
||||
$items = array_merge($items, SearchConfig::docsResultItems($query));
|
||||
}
|
||||
|
||||
@@ -145,7 +144,7 @@ class SearchDataService
|
||||
}
|
||||
|
||||
$perm = (string) ($resource['permission'] ?? '');
|
||||
if ($perm !== '' && !$this->permissionGateway->userHas($userId, $perm)) {
|
||||
if ($perm !== '' && !$this->permissionService->userHas($userId, $perm)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -193,7 +192,7 @@ class SearchDataService
|
||||
$results[] = $hotkeyResource;
|
||||
}
|
||||
|
||||
if ($this->permissionGateway->userHas($userId, PermissionService::DOCS_VIEW)) {
|
||||
if ($this->permissionService->userHas($userId, PermissionService::DOCS_VIEW)) {
|
||||
$docsResource = SearchConfig::docsPreviewResource($query);
|
||||
if ($docsResource !== null) {
|
||||
$results[] = $docsResource;
|
||||
@@ -210,7 +209,7 @@ class SearchDataService
|
||||
{
|
||||
if ($userId > 0) {
|
||||
// Prime cached permissions for the current request.
|
||||
$this->permissionGateway->getUserPermissions($userId);
|
||||
$this->permissionService->getUserPermissions($userId);
|
||||
}
|
||||
|
||||
$tenantIds = $userId > 0
|
||||
|
||||
Reference in New Issue
Block a user