major update

lib/Service/User/UserServicesFactory.php

@@ -2,10 +2,9 @@
 
 namespace MintyPHP\Service\User;
 
-use MintyPHP\Service\Access\AccessServicesFactory;
-use MintyPHP\Service\Access\PermissionGateway;
 use MintyPHP\Repository\Access\UserRoleRepository;
 use MintyPHP\Repository\Org\UserDepartmentRepository;
+use MintyPHP\Repository\Support\DatabaseSessionRepository;
 use MintyPHP\Repository\Tenant\UserTenantRepository;
 use MintyPHP\Repository\User\UserListQueryRepository;
 use MintyPHP\Repository\User\UserReadRepository;
@@ -13,33 +12,13 @@ use MintyPHP\Repository\User\UserSavedFilterRepository;
 use MintyPHP\Repository\User\UserWriteRepository;
 use MintyPHP\Service\Audit\AuditServicesFactory;
 use MintyPHP\Service\Audit\UserLifecycleAuditService;
-use MintyPHP\Service\Settings\SettingGateway;
-use MintyPHP\Service\Settings\SettingServicesFactory;
-use MintyPHP\Service\Tenant\TenantServicesFactory;
 
 class UserServicesFactory
 {
-    private ?AccessServicesFactory $accessServicesFactory = null;
-    private ?TenantServicesFactory $tenantServicesFactory = null;
-    private ?UserReadRepository $userReadRepository = null;
-    private ?AuditServicesFactory $auditServicesFactory = null;
-    private ?SettingServicesFactory $settingServicesFactory = null;
-    private ?UserWriteRepository $userWriteRepository = null;
-    private ?UserListQueryRepository $userListQueryRepository = null;
-    private ?UserSavedFilterRepository $userSavedFilterRepository = null;
-    private ?UserTenantRepository $userTenantRepository = null;
-    private ?UserRoleRepository $userRoleRepository = null;
-    private ?UserDepartmentRepository $userDepartmentRepository = null;
     private ?UserPasswordPolicyService $userPasswordPolicyService = null;
     private ?UserPasswordService $userPasswordService = null;
     private ?UserAvatarService $userAvatarService = null;
     private ?UserSavedFilterService $userSavedFilterService = null;
-    private ?UserSettingsGateway $userSettingsGateway = null;
-    private ?SettingGateway $settingGateway = null;
-    private ?UserScopeGateway $userScopeGateway = null;
-    private ?UserDirectoryGateway $userDirectoryGateway = null;
-    private ?UserPermissionGateway $userPermissionGateway = null;
-    private ?PermissionGateway $permissionGateway = null;
     private ?UserAssignmentService $userAssignmentService = null;
     private ?UserTenantContextService $userTenantContextService = null;
     private ?UserAccountService $userAccountService = null;
@@ -47,6 +26,13 @@ class UserServicesFactory
     private ?UserLifecycleRestoreService $userLifecycleRestoreService = null;
     private ?UserLifecycleAuditService $userLifecycleAuditService = null;
 
+    public function __construct(
+        private readonly AuditServicesFactory $auditServicesFactory,
+        private readonly UserRepositoryFactory $userRepositoryFactory,
+        private readonly UserGatewayFactory $userGatewayFactory,
+        private readonly DatabaseSessionRepository $databaseSessionRepository
+    ) {}
+
     public function createUserAccountService(): UserAccountService
     {
         return $this->userAccountService ??= new UserAccountService(
@@ -56,7 +42,9 @@ class UserServicesFactory
             $this->createUserAssignmentService(),
             $this->createUserPasswordService(),
             $this->createUserSettingsGateway(),
-            $this->createUserScopeGateway()
+            $this->createUserScopeGateway(),
+            $this->createUserDirectoryGateway(),
+            $this->auditServicesFactory->createSystemAuditService()
         );
     }
 
@@ -68,7 +56,8 @@ class UserServicesFactory
             $this->createUserRoleRepository(),
             $this->createUserDepartmentRepository(),
             $this->createUserDirectoryGateway(),
-            $this->createUserPermissionGateway()
+            $this->createUserPermissionGateway(),
+            $this->databaseSessionRepository
         );
     }
 
@@ -105,37 +94,37 @@ class UserServicesFactory
 
     public function createUserReadRepository(): UserReadRepository
     {
-        return $this->userReadRepository ??= new UserReadRepository();
+        return $this->userRepositoryFactory->createUserReadRepository();
     }
 
     public function createUserWriteRepository(): UserWriteRepository
     {
-        return $this->userWriteRepository ??= new UserWriteRepository();
+        return $this->userRepositoryFactory->createUserWriteRepository();
     }
 
     public function createUserListQueryRepository(): UserListQueryRepository
     {
-        return $this->userListQueryRepository ??= new UserListQueryRepository();
+        return $this->userRepositoryFactory->createUserListQueryRepository();
     }
 
     public function createUserSavedFilterRepository(): UserSavedFilterRepository
     {
-        return $this->userSavedFilterRepository ??= new UserSavedFilterRepository();
+        return $this->userRepositoryFactory->createUserSavedFilterRepository();
     }
 
     public function createUserTenantRepository(): UserTenantRepository
     {
-        return $this->userTenantRepository ??= new UserTenantRepository();
+        return $this->userRepositoryFactory->createUserTenantRepository();
     }
 
     public function createUserRoleRepository(): UserRoleRepository
     {
-        return $this->userRoleRepository ??= new UserRoleRepository();
+        return $this->userRepositoryFactory->createUserRoleRepository();
     }
 
     public function createUserDepartmentRepository(): UserDepartmentRepository
     {
-        return $this->userDepartmentRepository ??= new UserDepartmentRepository();
+        return $this->userRepositoryFactory->createUserDepartmentRepository();
     }
 
     public function createUserPasswordPolicyService(): UserPasswordPolicyService
@@ -145,47 +134,22 @@ class UserServicesFactory
 
     public function createUserSettingsGateway(): UserSettingsGateway
     {
-        return $this->userSettingsGateway ??= new UserSettingsGateway($this->createSettingGateway());
+        return $this->userGatewayFactory->createUserSettingsGateway();
     }
 
     public function createUserScopeGateway(): UserScopeGateway
     {
-        return $this->userScopeGateway ??= new UserScopeGateway($this->tenantServicesFactory()->createTenantScopeService());
+        return $this->userGatewayFactory->createUserScopeGateway();
     }
 
     public function createUserDirectoryGateway(): UserDirectoryGateway
     {
-        return $this->userDirectoryGateway ??= new UserDirectoryGateway();
+        return $this->userGatewayFactory->createUserDirectoryGateway();
     }
 
     public function createUserPermissionGateway(): UserPermissionGateway
     {
-        return $this->userPermissionGateway ??= new UserPermissionGateway($this->createPermissionGateway());
-    }
-
-    private function createPermissionGateway(): PermissionGateway
-    {
-        return $this->permissionGateway ??= $this->accessServicesFactory()->createPermissionGateway();
-    }
-
-    private function accessServicesFactory(): AccessServicesFactory
-    {
-        return $this->accessServicesFactory ??= new AccessServicesFactory();
-    }
-
-    private function createSettingGateway(): SettingGateway
-    {
-        return $this->settingGateway ??= $this->settingServicesFactory()->createSettingGateway();
-    }
-
-    private function settingServicesFactory(): SettingServicesFactory
-    {
-        return $this->settingServicesFactory ??= new SettingServicesFactory();
-    }
-
-    private function tenantServicesFactory(): TenantServicesFactory
-    {
-        return $this->tenantServicesFactory ??= new TenantServicesFactory();
+        return $this->userGatewayFactory->createUserPermissionGateway();
     }
 
     public function createUserLifecycleService(): UserLifecycleService
@@ -194,7 +158,8 @@ class UserServicesFactory
             $this->createUserReadRepository(),
             $this->createUserWriteRepository(),
             $this->createUserSettingsGateway(),
-            $this->createUserLifecycleAuditService()
+            $this->createUserLifecycleAuditService(),
+            $this->databaseSessionRepository
         );
     }
 
@@ -203,17 +168,13 @@ class UserServicesFactory
         return $this->userLifecycleRestoreService ??= new UserLifecycleRestoreService(
             $this->createUserReadRepository(),
             $this->createUserWriteRepository(),
-            $this->createUserLifecycleAuditService()
+            $this->createUserLifecycleAuditService(),
+            $this->databaseSessionRepository
         );
     }
 
     private function createUserLifecycleAuditService(): UserLifecycleAuditService
     {
-        return $this->userLifecycleAuditService ??= $this->auditServicesFactory()->createUserLifecycleAuditService();
-    }
-
-    private function auditServicesFactory(): AuditServicesFactory
-    {
-        return $this->auditServicesFactory ??= new AuditServicesFactory();
+        return $this->userLifecycleAuditService ??= $this->auditServicesFactory->createUserLifecycleAuditService();
     }
 }