refactor(arch): enforce gateway compliance and remove service-wrapping gateways
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
namespace MintyPHP\Service\User;
|
||||
|
||||
use MintyPHP\Service\Access\AccessServicesFactory;
|
||||
use MintyPHP\Service\Access\PermissionGateway;
|
||||
use MintyPHP\Service\Access\PermissionService;
|
||||
use MintyPHP\Service\Directory\DirectoryRepositoryFactory;
|
||||
use MintyPHP\Service\Settings\SettingsAppGateway;
|
||||
use MintyPHP\Service\Settings\SettingsDefaultsGateway;
|
||||
@@ -16,12 +16,9 @@ class UserGatewayFactory
|
||||
private ?SettingsDefaultsGateway $settingsDefaultsGateway = null;
|
||||
private ?SettingsAppGateway $settingsAppGateway = null;
|
||||
private ?SettingsUserLifecycleGateway $settingsUserLifecycleGateway = null;
|
||||
private ?PermissionGateway $permissionGateway = null;
|
||||
private ?PermissionService $permissionService = null;
|
||||
private ?UserSettingsGateway $userSettingsGateway = null;
|
||||
private ?UserScopeGateway $userScopeGateway = null;
|
||||
private ?UserDirectoryGateway $userDirectoryGateway = null;
|
||||
private ?UserPermissionGateway $userPermissionGateway = null;
|
||||
|
||||
public function __construct(
|
||||
private readonly AccessServicesFactory $accessServicesFactory,
|
||||
private readonly SettingServicesFactory $settingServicesFactory,
|
||||
@@ -39,9 +36,9 @@ class UserGatewayFactory
|
||||
);
|
||||
}
|
||||
|
||||
public function createUserScopeGateway(): UserScopeGateway
|
||||
public function getTenantScopeService(): TenantScopeService
|
||||
{
|
||||
return $this->userScopeGateway ??= new UserScopeGateway($this->tenantScopeService);
|
||||
return $this->tenantScopeService;
|
||||
}
|
||||
|
||||
public function createUserDirectoryGateway(): UserDirectoryGateway
|
||||
@@ -53,14 +50,9 @@ class UserGatewayFactory
|
||||
);
|
||||
}
|
||||
|
||||
public function createUserPermissionGateway(): UserPermissionGateway
|
||||
public function createPermissionService(): PermissionService
|
||||
{
|
||||
return $this->userPermissionGateway ??= new UserPermissionGateway($this->createPermissionGateway());
|
||||
}
|
||||
|
||||
private function createPermissionGateway(): PermissionGateway
|
||||
{
|
||||
return $this->permissionGateway ??= $this->accessServicesFactory->createPermissionGateway();
|
||||
return $this->permissionService ??= $this->accessServicesFactory->createPermissionService();
|
||||
}
|
||||
|
||||
private function createSettingsDefaultsGateway(): SettingsDefaultsGateway
|
||||
|
||||
Reference in New Issue
Block a user