diff --git a/app/Modules/ActivityLog/ActivityLogModule.php b/app/Modules/ActivityLog/ActivityLogModule.php index d3f6c68..f0a5d45 100644 --- a/app/Modules/ActivityLog/ActivityLogModule.php +++ b/app/Modules/ActivityLog/ActivityLogModule.php @@ -27,7 +27,7 @@ class ActivityLogModule implements ModuleContract */ public function disable(): void { - $this->enabled = false; + $this->enabled = false; } /** @@ -35,7 +35,7 @@ class ActivityLogModule implements ModuleContract */ public function enable(): void { - $this->enabled = true; + $this->enabled = true; } /** diff --git a/app/Modules/ActivityLog/Repositories/ActivityLogRepository.php b/app/Modules/ActivityLog/Repositories/ActivityLogRepository.php index d39b6f5..ceb75dc 100644 --- a/app/Modules/ActivityLog/Repositories/ActivityLogRepository.php +++ b/app/Modules/ActivityLog/Repositories/ActivityLogRepository.php @@ -2,9 +2,4 @@ namespace App\Modules\ActivityLog\Repositories; -use App\Modules\ActivityLog\Models\ActivityLog; - -class ActivityLogRepository -{ - -} +class ActivityLogRepository {} diff --git a/database/migrations/2025_12_21_184759_create_action_events_table.php b/database/migrations/2025_12_21_184759_create_action_events_table.php index e1a7974..13481af 100644 --- a/database/migrations/2025_12_21_184759_create_action_events_table.php +++ b/database/migrations/2025_12_21_184759_create_action_events_table.php @@ -15,7 +15,7 @@ return new class extends Migration $table->id(); $table->string('batch_id')->nullable(); $table->unsignedBigInteger('user_id')->nullable()->index(); - + $table->string('name')->index(); $table->string('actionable_type')->nullable()->index(); diff --git a/database/seeders/FillJsonData.php b/database/seeders/FillJsonData.php index 531c11f..7fa204a 100644 --- a/database/seeders/FillJsonData.php +++ b/database/seeders/FillJsonData.php @@ -9,10 +9,7 @@ class FillJsonData extends Seeder /** * Run the database seeds. */ - public function run(): void - { - - } + public function run(): void {} protected function seedUsers(): void { @@ -73,4 +70,14 @@ class FillJsonData extends Seeder { (new Migrators\ActionEventsMigrator)->migrate(); } + + protected function seedBranchUser(): void + { + (new Migrators\BranchUserMigrator)->migrate(); + } + + protected function seedCurrencyRates(): void + { + (new Migrators\CurrencyRatesMigrator)->migrate(); + } } diff --git a/database/seeders/Migrators/ActionEventsMigrator.php b/database/seeders/Migrators/ActionEventsMigrator.php index 632607e..d6c6161 100644 --- a/database/seeders/Migrators/ActionEventsMigrator.php +++ b/database/seeders/Migrators/ActionEventsMigrator.php @@ -22,5 +22,8 @@ class ActionEventsMigrator DB::table('action_events')->insert((array) $item); } + + DB::statement("SELECT setval('action_events_id_seq', (SELECT MAX(id) from action_events));"); + DB::statement("SELECT nextval('action_events_id_seq');"); } -} \ No newline at end of file +} diff --git a/database/seeders/Migrators/BranchUserMigrator.php b/database/seeders/Migrators/BranchUserMigrator.php new file mode 100644 index 0000000..91dfbfe --- /dev/null +++ b/database/seeders/Migrators/BranchUserMigrator.php @@ -0,0 +1,29 @@ +truncate(); + + $path = database_path('data/tested/branch_user.json'); + + $items = Items::fromFile($path); + + foreach ($items as $id => $item) { + if (! $item) { + continue; + } + + DB::table('branch_user')->insert((array) $item); + + DB::statement("SELECT setval('branch_user_id_seq', (SELECT MAX(id) from branch_user));"); + DB::statement("SELECT nextval('branch_user_id_seq');"); + } + } +} diff --git a/database/seeders/Migrators/BranchesMigrator.php b/database/seeders/Migrators/BranchesMigrator.php index 7fd22ae..072425a 100644 --- a/database/seeders/Migrators/BranchesMigrator.php +++ b/database/seeders/Migrators/BranchesMigrator.php @@ -11,7 +11,7 @@ class BranchesMigrator { DB::table('branches')->truncate(); - $path = database_path('data/nurmuhammetsdb/branches.json'); + $path = database_path('data/tested/branches.json'); $rawData = File::json($path); @@ -19,5 +19,8 @@ class BranchesMigrator DB::table('branches') ->insert($data); } + + DB::statement("SELECT setval('branches_id_seq', (SELECT MAX(id) from branches));"); + DB::statement("SELECT nextval('branches_id_seq');"); } } diff --git a/database/seeders/Migrators/CardOrdersMigrator.php b/database/seeders/Migrators/CardOrdersMigrator.php index 2849d7f..89ca707 100644 --- a/database/seeders/Migrators/CardOrdersMigrator.php +++ b/database/seeders/Migrators/CardOrdersMigrator.php @@ -11,7 +11,7 @@ class CardOrdersMigrator { DB::table('card_orders')->truncate(); - $path = database_path('data/nurmuhammetsdb/card_orders.json'); + $path = database_path('data/tested/card_orders.json'); $rawData = File::json($path); @@ -19,5 +19,8 @@ class CardOrdersMigrator DB::table('card_orders') ->insert($data); } + + DB::statement("SELECT setval('card_orders_id_seq', (SELECT MAX(id) from card_orders));"); + DB::statement("SELECT nextval('card_orders_id_seq');"); } } diff --git a/database/seeders/Migrators/CardPinOrdersMigrator.php b/database/seeders/Migrators/CardPinOrdersMigrator.php index c65dd1f..1f62648 100644 --- a/database/seeders/Migrators/CardPinOrdersMigrator.php +++ b/database/seeders/Migrators/CardPinOrdersMigrator.php @@ -11,7 +11,7 @@ class CardPinOrdersMigrator { DB::table('card_pin_orders')->truncate(); - $path = database_path('data/nurmuhammetsdb/card_pins.json'); + $path = database_path('data/tested/card_pins.json'); $rawData = File::json($path); @@ -25,5 +25,8 @@ class CardPinOrdersMigrator DB::table('card_pin_orders') ->insert($data); } + + DB::statement("SELECT setval('card_pin_orders_id_seq', (SELECT MAX(id) from card_pin_orders));"); + DB::statement("SELECT nextval('card_pin_orders_id_seq');"); } } diff --git a/database/seeders/Migrators/CardStatesMigrator.php b/database/seeders/Migrators/CardStatesMigrator.php index f44310e..8cc4ee9 100644 --- a/database/seeders/Migrators/CardStatesMigrator.php +++ b/database/seeders/Migrators/CardStatesMigrator.php @@ -11,7 +11,7 @@ class CardStatesMigrator { DB::table('card_states')->truncate(); - $path = database_path('data/nurmuhammetsdb/card_states.json'); + $path = database_path('data/tested/card_states.json'); $rawData = File::json($path); @@ -19,5 +19,8 @@ class CardStatesMigrator DB::table('card_states') ->insert($data); } + + DB::statement("SELECT setval('card_states_id_seq', (SELECT MAX(id) from card_states));"); + DB::statement("SELECT nextval('card_states_id_seq');"); } } diff --git a/database/seeders/Migrators/CardTypesMigrator.php b/database/seeders/Migrators/CardTypesMigrator.php index eb579a8..8b5e7b7 100644 --- a/database/seeders/Migrators/CardTypesMigrator.php +++ b/database/seeders/Migrators/CardTypesMigrator.php @@ -11,7 +11,7 @@ class CardTypesMigrator { DB::table('card_types')->truncate(); - $path = database_path('data/nurmuhammetsdb/card_types.json'); + $path = database_path('data/tested/card_types.json'); $rawData = File::json($path); @@ -19,5 +19,8 @@ class CardTypesMigrator DB::table('card_types') ->insert($data); } + + DB::statement("SELECT setval('card_types_id_seq', (SELECT MAX(id) from card_types));"); + DB::statement("SELECT nextval('card_types_id_seq');"); } } diff --git a/database/seeders/Migrators/CurrencyRatesMigrator.php b/database/seeders/Migrators/CurrencyRatesMigrator.php new file mode 100644 index 0000000..0a6c0ab --- /dev/null +++ b/database/seeders/Migrators/CurrencyRatesMigrator.php @@ -0,0 +1,29 @@ +truncate(); + + $path = database_path('data/tested/currency_rates.json'); + + $items = Items::fromFile($path); + + foreach ($items as $id => $item) { + if (! $item) { + continue; + } + + DB::table('currency_rates')->insert((array) $item); + } + + DB::statement("SELECT setval('currency_rates_id_seq', (SELECT MAX(id) from currency_rates));"); + DB::statement("SELECT nextval('currency_rates_id_seq');"); + } +} diff --git a/database/seeders/Migrators/LoanOrderRequiredDocsMigrator.php b/database/seeders/Migrators/LoanOrderRequiredDocsMigrator.php index 566a016..8452aa9 100644 --- a/database/seeders/Migrators/LoanOrderRequiredDocsMigrator.php +++ b/database/seeders/Migrators/LoanOrderRequiredDocsMigrator.php @@ -11,7 +11,7 @@ class LoanOrderRequiredDocsMigrator { DB::table('loan_order_required_docs')->truncate(); - $path = database_path('data/nurmuhammetsdb/loan_order_required_docs.json'); + $path = database_path('data/tested/loan_order_required_docs.json'); $rawData = File::json($path); @@ -19,5 +19,8 @@ class LoanOrderRequiredDocsMigrator DB::table('loan_order_required_docs') ->insert($data); } + + DB::statement("SELECT setval('loan_order_required_docs_id_seq', (SELECT MAX(id) from loan_order_required_docs));"); + DB::statement("SELECT nextval('loan_order_required_docs_id_seq');"); } } diff --git a/database/seeders/Migrators/LoanOrdersMigrator.php b/database/seeders/Migrators/LoanOrdersMigrator.php index 711ff6a..e62b8cf 100644 --- a/database/seeders/Migrators/LoanOrdersMigrator.php +++ b/database/seeders/Migrators/LoanOrdersMigrator.php @@ -3,7 +3,6 @@ namespace Database\Seeders\Migrators; use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\File; use JsonMachine\Items; class LoanOrdersMigrator @@ -12,7 +11,7 @@ class LoanOrdersMigrator { DB::table('loan_orders')->truncate(); - $path = database_path('data/nurmuhammetsdb/loan_orders.json'); + $path = database_path('data/tested/loan_orders.json'); $items = Items::fromFile($path); @@ -23,5 +22,8 @@ class LoanOrdersMigrator DB::table('loan_orders')->insert((array) $item); } + + DB::statement("SELECT setval('loan_orders_id_seq', (SELECT MAX(id) from loan_orders));"); + DB::statement("SELECT nextval('loan_orders_id_seq');"); } } diff --git a/database/seeders/Migrators/LoanTypesMigrator.php b/database/seeders/Migrators/LoanTypesMigrator.php index ca32bfb..d401c4c 100644 --- a/database/seeders/Migrators/LoanTypesMigrator.php +++ b/database/seeders/Migrators/LoanTypesMigrator.php @@ -11,7 +11,7 @@ class LoanTypesMigrator { DB::table('loan_types')->truncate(); - $path = database_path('data/nurmuhammetsdb/loan_types.json'); + $path = database_path('data/tested/loan_types.json'); $rawData = File::json($path); @@ -19,5 +19,8 @@ class LoanTypesMigrator DB::table('loan_types') ->insert($data); } + + DB::statement("SELECT setval('loan_types_id_seq', (SELECT MAX(id) from loan_types));"); + DB::statement("SELECT nextval('loan_types_id_seq');"); } } diff --git a/database/seeders/Migrators/MediaMigrator.php b/database/seeders/Migrators/MediaMigrator.php new file mode 100644 index 0000000..91bae0c --- /dev/null +++ b/database/seeders/Migrators/MediaMigrator.php @@ -0,0 +1,29 @@ +truncate(); + + $path = database_path('data/tested/media.json'); + + $items = Items::fromFile($path); + + foreach ($items as $id => $item) { + if (! $item) { + continue; + } + + DB::table('media')->insert((array) $item); + } + + DB::statement("SELECT setval('media_id_seq', (SELECT MAX(id) from media));"); + DB::statement("SELECT nextval('media_id_seq');"); + } +} diff --git a/database/seeders/Migrators/ProvincesMigrator.php b/database/seeders/Migrators/ProvincesMigrator.php index b38ed39..05f77fa 100644 --- a/database/seeders/Migrators/ProvincesMigrator.php +++ b/database/seeders/Migrators/ProvincesMigrator.php @@ -19,5 +19,8 @@ class ProvincesMigrator DB::table('provinces') ->insert($data); } + + DB::statement("SELECT setval('provinces_id_seq', (SELECT MAX(id) from provinces));"); + DB::statement("SELECT nextval('provinces_id_seq');"); } } diff --git a/database/seeders/Migrators/UsersMigrator.php b/database/seeders/Migrators/UsersMigrator.php index 82a2cac..f4b9431 100644 --- a/database/seeders/Migrators/UsersMigrator.php +++ b/database/seeders/Migrators/UsersMigrator.php @@ -39,6 +39,9 @@ class UsersMigrator 'active' => $user['active'], ]); } + + DB::statement("SELECT setval('users_id_seq', (SELECT MAX(id) from users));"); + DB::statement("SELECT nextval('users_id_seq');"); } protected function extractFirstName(string $name): string diff --git a/database/seeders/Migrators/VisaMasterPaymentOrdersMigrator.php b/database/seeders/Migrators/VisaMasterPaymentOrdersMigrator.php index 5d4092f..4e276d2 100644 --- a/database/seeders/Migrators/VisaMasterPaymentOrdersMigrator.php +++ b/database/seeders/Migrators/VisaMasterPaymentOrdersMigrator.php @@ -60,5 +60,8 @@ class VisaMasterPaymentOrdersMigrator 'deleted_at' => $item->deleted_at, ]); } + + DB::statement("SELECT setval('visa_master_payment_orders_id_seq', (SELECT MAX(id) from visa_master_payment_orders));"); + DB::statement("SELECT nextval('visa_master_payment_orders_id_seq');"); } } diff --git a/routes/web.php b/routes/web.php index e12ff7d..5f4eca0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,13 +1,14 @@ migrate(); - + + (new MediaMigrator)->migrate(); + return 'done'; }); // Route::middleware(['auth'])->group(function () {