refactor: Consolidate dbproxy and user models

With this refactor we migrate User model to the root micropowermanager
database. Following, we consolidate database proxy model by resolving
company id from user table directly from database proxy services.

Consideration for this refactor is that, admin users can see every user
on the users table from the user management admin page.

This might have the effect or leaking admin accounts to other admin
user.

Author: beesaferoot

src/backend/app/Http/Controllers/AgentWebController.php

@@ -50,13 +50,14 @@ public function store(CreateAgentRequest $request): ApiResource {
             'connection' => ' ', // TODO:  solve this.  //auth('api')->user()->company->database->database_name
         ];
         $companyId = auth('api')->payload()->get('companyId');
-        $companyDatabase = CompanyDatabase::query()->where('company_id', $companyId)->firstOrFail();
-        $databaseProxyData = [
-            'email' => $request['email'],
-            'fk_company_id' => $companyId,
-            'fk_company_database_id' => $companyDatabase->getId(),
-        ];
-        $this->databaseProxyService->create($databaseProxyData);
+        // $companyDatabase = CompanyDatabase::query()->where('company_id', $companyId)->firstOrFail();
+        // $userData = [
+        //     'email' => $request['email'],
+        //     'company_id' => $companyId,
+        //     'password' => $request['password'],
+        //     'fk_company_database_id' => $companyDatabase->getId(),
+        // ];
+        // $this->databaseProxyService->create($databaseProxyData);
 
         return ApiResource::make($this->agentService->create(
             $agentData,

src/backend/app/Http/Controllers/Reports.php

@@ -6,7 +6,6 @@
 use App\Models\City;
 use App\Models\ConnectionGroup;
 use App\Models\ConnectionType;
-use App\Models\DatabaseProxy;
 use App\Models\Meter\MeterParameter;
 use App\Models\PaymentHistory;
 use App\Models\Report;
@@ -580,8 +579,7 @@ static function ($q) {
         $writer = new Xlsx($this->spreadsheet);
         $dirPath = storage_path('./'.$reportType);
         $user = User::query()->first();
-        $databaseProxy = app()->make(DatabaseProxy::class);
-        $companyId = $databaseProxy->findByEmail($user->email)->getCompanyId();
+        $companyId = $user->getCompanyId();
 
         if (!file_exists($dirPath) && !mkdir($dirPath, 0774, true) && !is_dir($dirPath)) {
             throw new \RuntimeException(sprintf('Directory "%s" was not created', $dirPath));

src/backend/app/Http/Controllers/UserController.php

@@ -6,14 +6,12 @@
 use App\Http\Resources\ApiResource;
 use App\Models\User;
 use App\Services\CompanyDatabaseService;
-use App\Services\DatabaseProxyService;
 use App\Services\UserService;
 use Illuminate\Http\Request;
 
 class UserController extends Controller {
     public function __construct(
         private UserService $userService,
-        private DatabaseProxyService $databaseProxyService,
         private CompanyDatabaseService $companyDatabaseService,
     ) {}
 
@@ -25,13 +23,6 @@ public function index(Request $request): ApiResource {
 
     public function store(CreateAdminRequest $request) {
         $user = $this->userService->create($request->only(['name', 'password', 'email']));
-        $companyDatabase = $this->companyDatabaseService->findByCompanyId($user->getCompanyId());
-        $databaseProxyData = [
-            'email' => $user->getEmail(),
-            'fk_company_id' => $user->getCompanyId(),
-            'fk_company_database_id' => $companyDatabase->getId(),
-        ];
-        $this->databaseProxyService->create($databaseProxyData);
 
         return ApiResource::make($user->toArray());
     }

src/backend/app/Http/Middleware/UserDefaultDatabaseConnectionMiddleware.php

@@ -70,11 +70,11 @@ private function handleApiRequest(Request $request, \Closure $next) {
 
         // webclient login
         if ($request->path() === 'api/auth/login' || $request->path() === 'api/app/login') {
-            $databaseProxy = $this->databaseProxyManager->findByEmail($request->input('email'));
-            $companyId = $databaseProxy->getCompanyId();
+            $user = $this->databaseProxyManager->findByEmail($request->input('email'));
+            $companyId = $user->getCompanyId();
         } elseif ($this->isAgentApp($request->path()) && Str::contains($request->path(), 'login')) { // agent app login
-            $databaseProxy = $this->databaseProxyManager->findByEmail($request->input('email'));
-            $companyId = $databaseProxy->getCompanyId();
+            $user = $this->databaseProxyManager->findByEmail($request->input('email'));
+            $companyId = $user->getCompanyId();
         } elseif ($this->isAgentApp($request->path())) { // agent app authenticated user requests
             $companyId = auth('agent_api')->payload()->get('companyId');
             if (!is_numeric($companyId)) {

src/backend/app/Models/User.php

@@ -31,7 +31,7 @@ class User extends Authenticatable implements JWTSubject {
     public const COL_COMPANY_ID = 'company_id';
 
     public function __construct(array $attributes = []) {
-        $this->setConnection('shard');
+        // $this->setConnection('shard');
 
         parent::__construct($attributes);
     }
@@ -118,4 +118,8 @@ public function getEmail(): string {
     public function relationTicketUser(): HasOne {
         return $this->hasOne(TicketUser::class, TicketUser::COL_USER_ID, User::COL_ID);
     }
+
+    public function findByEmail(string $email): ?User {
+        return self::where('email', $email)->first();
+    }
 }

src/backend/app/Services/AbstractDashboardCacheDataService.php

@@ -2,7 +2,6 @@
 
 namespace App\Services;
 
-use App\Models\DatabaseProxy;
 use App\Models\User;
 use Illuminate\Support\Facades\Cache;
 
@@ -31,8 +30,8 @@ public function getDataById($id) {
 
     protected function cacheKeyGenerator(): string {
         $user = User::query()->first();
-        $databaseProxy = app()->make(DatabaseProxy::class);
-        $companyId = $databaseProxy->findByEmail($user->email)->getCompanyId();
+
+        $companyId = $user->getCompanyId();
 
         return $this->cacheDataKey.'-'.$companyId;
     }

src/backend/app/Services/DatabaseProxyService.php

@@ -2,27 +2,28 @@
 
 namespace App\Services;
 
-use App\Models\DatabaseProxy;
+use App\Models\User;
 use App\Services\Interfaces\IBaseService;
 use Illuminate\Database\Eloquent\Collection;
 
 /**
  * @implements IBaseService<DatabaseProxy>
  */
 class DatabaseProxyService implements IBaseService {
-    public function __construct(private DatabaseProxy $databaseProxy) {}
+    public function __construct(private User $user) {}
 
-    public function getById($id): DatabaseProxy {
+    public function getById($id): User {
         throw new \Exception('Method getById() not yet implemented.');
 
-        return new DatabaseProxy();
+        return new User();
     }
 
-    public function create(array $databaseProxyData): DatabaseProxy {
-        return $this->databaseProxy->newQuery()->create($databaseProxyData);
+    public function create(array $userData): User {
+        // return $this->user->newQuery()->create($userData);
+        throw new \Exception('Method create() should  not be used directly ');
     }
 
-    public function update($model, array $data): DatabaseProxy {
+    public function update($model, array $data): User {
         throw new \Exception('Method update() not yet implemented.');
     }
 

src/backend/app/modules/DatabaseProxy/DatabaseProxyManagerService.php

@@ -5,20 +5,20 @@
 namespace MPM\DatabaseProxy;
 
 use App\Models\CompanyDatabase;
-use App\Models\DatabaseProxy;
+use App\Models\User;
 use App\Utils\DemoCompany;
 use Illuminate\Database\DatabaseManager;
 use Illuminate\Database\Eloquent\Builder;
 
 class DatabaseProxyManagerService {
     public function __construct(
-        private DatabaseProxy $databaseProxy,
+        private User $user,
         private DatabaseManager $databaseManager,
         private CompanyDatabase $companyDatabase,
     ) {}
 
-    public function findByEmail(string $email): DatabaseProxy {
-        return $this->databaseProxy->findByEmail($email);
+    public function findByEmail(string $email): User {
+        return $this->user->findByEmail($email);
     }
 
     public function runForCompany(int $companyId, callable $callable) {

src/backend/app/modules/User/UserListener.php

@@ -7,13 +7,13 @@
 use App\Helpers\MailHelperInterface;
 use App\Services\CompanyDatabaseService;
 use App\Services\CompanyService;
-use App\Services\DatabaseProxyService;
+// use App\Services\DatabaseProxyService;
 use Inensus\Ticket\Services\TicketUserService;
 use MPM\User\Events\UserCreatedEvent;
 
 class UserListener {
     public function __construct(
-        private DatabaseProxyService $databaseProxyService,
+        // private DatabaseProxyService $databaseProxyService,
         private CompanyDatabaseService $companyDatabaseService,
         private TicketUserService $ticketUserService,
         private CompanyService $companyService,
@@ -27,17 +27,17 @@ public function handle($event): void {
     }
 
     public function handleUserCreatedEvent(UserCreatedEvent $event): void {
-        if ($event->shouldSyncUser) {
-            $companyDatabase = $this->companyDatabaseService->findByCompanyId($event->user->getCompanyId());
+        // if ($event->shouldSyncUser) {
+        //     $companyDatabase = $this->companyDatabaseService->findByCompanyId($event->user->getCompanyId());
 
-            $databaseProxyData = [
-                'email' => $event->user->getEmail(),
-                'fk_company_id' => $event->user->getCompanyId(),
-                'fk_company_database_id' => $companyDatabase->getId(),
-            ];
+        //     $databaseProxyData = [
+        //         'email' => $event->user->getEmail(),
+        //         'fk_company_id' => $event->user->getCompanyId(),
+        //         'fk_company_database_id' => $companyDatabase->getId(),
+        //     ];
 
-            $this->databaseProxyService->create($databaseProxyData);
-        }
+        //     $this->databaseProxyService->create($databaseProxyData);
+        // }
 
         $company = $this->companyService->getById($event->user->getCompanyId());
         $this->ticketUserService->findOrCreateByUser($event->user);

src/backend/database/migrations/2025_01_18_100625_create_user_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up() {
+        Schema::create('users', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->integer('company_id')->unsigned();
+            $table->string('email')->unique();
+            $table->string('password');
+            $table->rememberToken();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down() {
+        Schema::dropIfExists('users');
+    }
+};

src/backend/database/migrations/micropowermanager/2025_01_18_100835_drop_user_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up() {
+        Schema::connection('shard')->dropIfExists('users');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down() {
+        Schema::connection('shard')->create('users', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->integer('company_id')->unsigned();
+            $table->string('email')->unique();
+            $table->string('password');
+            $table->rememberToken();
+            $table->timestamps();
+        });
+    }
+};

src/backend/packages/inensus/swifta-payment-provider/src/Console/Commands/InstallPackage.php

@@ -5,7 +5,6 @@
 use App\Models\User;
 use App\Services\CompanyDatabaseService;
 use App\Services\CompanyService;
-use App\Services\DatabaseProxyService;
 use App\Services\UserService;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
@@ -21,7 +20,6 @@ public function __construct(
         private SwiftaAuthentication $authentication,
         private CompanyService $companyService,
         private CompanyDatabaseService $companyDatabaseService,
-        private DatabaseProxyService $databaseProxyService,
     ) {
         parent::__construct();
     }
@@ -72,13 +70,6 @@ private function generateAuthenticationToken() {
             'email' => $company->getName().'-swifta-user-'.Carbon::now()->timestamp,
             'company_id' => $companyId,
         ]);
-        $companyDatabase = $this->companyDatabaseService->getById($companyId);
-        $databaseProxyData = [
-            'email' => $user->getEmail(),
-            'fk_company_id' => $user->getCompanyId(),
-            'fk_company_database_id' => $companyDatabase->getId(),
-        ];
-        $this->databaseProxyService->create($databaseProxyData);
         $customClaims = ['usr' => 'swifta-token', 'exp' => Carbon::now()->addYears(3)->timestamp];
         $token = JWTAuth::customClaims($customClaims)->fromUser($user);
         $payload = JWTAuth::setToken($token)->getPayload();