From 02b555d7cecc878cbe69264ee0505108d4681e29 Mon Sep 17 00:00:00 2001
From: Nurmuhammet Allanov <nurmuhammet@mail.com>
Date: Tue, 28 Oct 2025 23:27:38 +0500
Subject: [PATCH] code improvements

---
 app/Modules/CardBalance/CardBalanceModule.php |  9 ++++++++-
 app/Modules/Core/ModulePackage.php            |  2 +-
 app/Modules/ModuleRepository.php              |  2 --
 app/Modules/ModuleServiceProvider.php         | 20 +++++++++----------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/Modules/CardBalance/CardBalanceModule.php b/app/Modules/CardBalance/CardBalanceModule.php
index 4250441..20cf8b5 100644
--- a/app/Modules/CardBalance/CardBalanceModule.php
+++ b/app/Modules/CardBalance/CardBalanceModule.php
@@ -2,6 +2,8 @@
 
 namespace App\Modules\CardBalance;
 
+use App\Modules\Core\ModulePackage;
+use App\Modules\Core\ModulePackageType;
 use App\Modules\Makeable;
 use App\Modules\ModuleContract;
 
@@ -51,7 +53,12 @@ class CardBalanceModule implements ModuleContract
      */
     public function getComposerRequirements(): array
     {
-        return [];
+        return [
+            new ModulePackage(
+                type: ModulePackageType::MODULE,
+                name: 'Card',
+            )
+        ];
     }
 
     /**
diff --git a/app/Modules/Core/ModulePackage.php b/app/Modules/Core/ModulePackage.php
index ae2091a..e4ab9ed 100644
--- a/app/Modules/Core/ModulePackage.php
+++ b/app/Modules/Core/ModulePackage.php
@@ -7,7 +7,7 @@ class ModulePackage
     public function __construct(
         public ModulePackageType $type,
         public string $name,
-        public string $message,
+        public string $message = '',
         public string $version = '',
     ) {}
 }
diff --git a/app/Modules/ModuleRepository.php b/app/Modules/ModuleRepository.php
index f2172bb..4fd00fc 100644
--- a/app/Modules/ModuleRepository.php
+++ b/app/Modules/ModuleRepository.php
@@ -129,8 +129,6 @@ class ModuleRepository
 
     /**
      * Check if module exists
-     *
-     * @param  string $moduleName
      */
     public function moduleExists(string $moduleName): bool
     {
diff --git a/app/Modules/ModuleServiceProvider.php b/app/Modules/ModuleServiceProvider.php
index 18dd0d0..f7387dd 100644
--- a/app/Modules/ModuleServiceProvider.php
+++ b/app/Modules/ModuleServiceProvider.php
@@ -2,7 +2,6 @@
 
 namespace App\Modules;
 
-use App\Modules\Core\ModulePackage;
 use App\Modules\Core\ModulePackageType;
 use Composer\Composer;
 use Composer\InstalledVersions;
@@ -62,19 +61,18 @@ class ModuleServiceProvider extends ServiceProvider
     public function verifyModuleComposerRequirements(BaseModule $module): void
     {
         foreach ($module->app->getComposerRequirements() as $package) {
-           $missingPackage = match ($package->type) {
+            $packageInstalled = match ($package->type) {
                 ModulePackageType::PACKAGE => InstalledVersions::isInstalled($package->name),
-                ModulePackageType::MODULE  => module_exists($package->name),
+                ModulePackageType::MODULE => module_exists($package->name),
                 default => true,
             };
 
-            if ($missingPackage) {
-                abort(
-                    500,
-                    "{$package->name} {$package->version} {$package->type->value} must be installed (module: {$module->name}) \n
+            abort_if(
+                boolean: ! $packageInstalled,
+                code: 500,
+                message: "{$package->name} {$package->version} {$package->type->value} must be installed (module: {$module->name}) \n
                     {$package->message}"
-                );
-            }
+            );
         }
     }
 
@@ -84,9 +82,9 @@ class ModuleServiceProvider extends ServiceProvider
     public function suggestModuleComposerSuggestions(BaseModule $module): void
     {
         foreach ($module->app->getComposerRequirements() as $package) {
-           $missingPackage = match ($package->type) {
+            $missingPackage = match ($package->type) {
                 ModulePackageType::PACKAGE => InstalledVersions::isInstalled($package->name),
-                ModulePackageType::MODULE  => module_exists($package->name),
+                ModulePackageType::MODULE => module_exists($package->name),
                 default => true,
             };