From 9d2a8ce6281eac40cc1aed1405aa8f9cc1300380 Mon Sep 17 00:00:00 2001 From: salam Date: Sun, 4 Jan 2026 05:41:37 +0100 Subject: [PATCH] db wip --- app/Console/Commands/Grapper/TxOdds/Countries.php | 2 +- app/Filament/Resources/Bookmakers/Schemas/BookmakerForm.php | 3 --- app/Filament/Resources/Bookmakers/Tables/BookmakersTable.php | 4 ---- app/Filament/Resources/Countries/CountryResource.php | 2 -- app/Filament/Resources/Events/Tables/EventsTable.php | 2 +- app/Filament/Resources/Providers/Tables/ProvidersTable.php | 2 +- app/Livewire/MapperLeft.php | 2 +- app/Livewire/MultilineBookmaker.php | 3 +-- app/Models/Bookmaker.php | 1 - app/Models/CompetitionGroup.php | 2 +- app/Models/Country.php | 1 - app/Models/MultilineClient.php | 2 +- app/Models/Odds2way.php | 2 +- app/Models/Odds2wayS1.php | 2 +- app/Models/Odds3way.php | 2 +- app/Models/OddsDc.php | 2 +- app/Models/OddsDnb.php | 2 +- app/Models/OddsGgng.php | 2 +- app/Models/OddsHandicap.php | 2 +- app/Models/OddsHandicapQ1.php | 2 +- app/Models/OddsQualify.php | 2 +- app/Models/OddsTotal.php | 2 +- app/Models/OddsTotalQ1.php | 2 +- app/Models/User.php | 2 +- database/seeders/ClientsSeeder.php | 4 ++-- 25 files changed, 21 insertions(+), 33 deletions(-) diff --git a/app/Console/Commands/Grapper/TxOdds/Countries.php b/app/Console/Commands/Grapper/TxOdds/Countries.php index f94479a7..ebbfed43 100644 --- a/app/Console/Commands/Grapper/TxOdds/Countries.php +++ b/app/Console/Commands/Grapper/TxOdds/Countries.php @@ -25,7 +25,7 @@ class Countries $count = 0; foreach ($data as $row) { Country::updateOrCreate( - ['txid' => (int) $row->id], + ['id' => (int) $row->id], ['name' => (string) $row->name, 'cc' => (string) $row->cc] ); $count++; diff --git a/app/Filament/Resources/Bookmakers/Schemas/BookmakerForm.php b/app/Filament/Resources/Bookmakers/Schemas/BookmakerForm.php index 50f0e66a..bec86f76 100644 --- a/app/Filament/Resources/Bookmakers/Schemas/BookmakerForm.php +++ b/app/Filament/Resources/Bookmakers/Schemas/BookmakerForm.php @@ -18,9 +18,6 @@ class BookmakerForm TextInput::make('baid') ->numeric() ->default(0), - TextInput::make('txid') - ->numeric() - ->default(0), ]); } } diff --git a/app/Filament/Resources/Bookmakers/Tables/BookmakersTable.php b/app/Filament/Resources/Bookmakers/Tables/BookmakersTable.php index 9fe1d791..e8c4b5f1 100644 --- a/app/Filament/Resources/Bookmakers/Tables/BookmakersTable.php +++ b/app/Filament/Resources/Bookmakers/Tables/BookmakersTable.php @@ -23,10 +23,6 @@ class BookmakersTable ->label('BAID') ->numeric() ->sortable(), - TextColumn::make('txid') - ->label('TXID') - ->numeric() - ->sortable(), ToggleColumn::make('txso')->offColor('gray'), ToggleColumn::make('txot')->offColor('gray'), ToggleColumn::make('betsapi')->offColor('gray'), diff --git a/app/Filament/Resources/Countries/CountryResource.php b/app/Filament/Resources/Countries/CountryResource.php index 69bd8e79..9418d17d 100644 --- a/app/Filament/Resources/Countries/CountryResource.php +++ b/app/Filament/Resources/Countries/CountryResource.php @@ -40,7 +40,6 @@ class CountryResource extends Resource TextInput::make('iso3')->maxLength(3), TextInput::make('cc'), TextInput::make('numeric'), - TextInput::make('txid'), Toggle::make('is_country'), Toggle::make('disabled')->label('Disable')->aboveLabel(['Hide in this table']), ]); @@ -67,7 +66,6 @@ class CountryResource extends Resource TextColumn::make('iso3'), TextColumn::make('cc'), TextColumn::make('numeric'), - TextColumn::make('txid')->searchable(), IconColumn::make('is_country')->alignCenter()->boolean(), ]) diff --git a/app/Filament/Resources/Events/Tables/EventsTable.php b/app/Filament/Resources/Events/Tables/EventsTable.php index 0e9a5adf..61bde294 100644 --- a/app/Filament/Resources/Events/Tables/EventsTable.php +++ b/app/Filament/Resources/Events/Tables/EventsTable.php @@ -212,7 +212,7 @@ class EventsTable ->options(function () { $res = Event::query()->where('starttime', '>', Carbon::now())->groupBy('country_id')->pluck('country_id')->toArray(); - return Country::query()->whereIn('tx_id', $res)->pluck('name', 'tx_id'); + return Country::query()->whereIn('id', $res)->pluck('name', 'id'); }) ->live() ->reactive() diff --git a/app/Filament/Resources/Providers/Tables/ProvidersTable.php b/app/Filament/Resources/Providers/Tables/ProvidersTable.php index ec0e9505..bd054f18 100644 --- a/app/Filament/Resources/Providers/Tables/ProvidersTable.php +++ b/app/Filament/Resources/Providers/Tables/ProvidersTable.php @@ -13,7 +13,7 @@ class ProvidersTable return $table ->striped() ->columns([ - TextColumn::make('id'), + TextColumn::make('id')->alignCenter()->badge(), TextColumn::make('name'), ]) ->recordActions([ diff --git a/app/Livewire/MapperLeft.php b/app/Livewire/MapperLeft.php index ee02bd54..1f3b51e6 100644 --- a/app/Livewire/MapperLeft.php +++ b/app/Livewire/MapperLeft.php @@ -61,7 +61,7 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable ->options(function () { $res = Event::query()->where('betradar_id', 0)->where('starttime', '>', Carbon::now())->groupBy('country_id')->pluck('country_id')->toArray(); - return Country::query()->whereIn('tx_id', $res)->pluck('name', 'tx_id'); + return Country::query()->whereIn('id', $res)->pluck('name', 'id'); }) ->live() ->reactive() diff --git a/app/Livewire/MultilineBookmaker.php b/app/Livewire/MultilineBookmaker.php index ff7035ad..0314cb42 100644 --- a/app/Livewire/MultilineBookmaker.php +++ b/app/Livewire/MultilineBookmaker.php @@ -58,14 +58,13 @@ class MultilineBookmaker extends Component implements HasActions, HasSchemas, Ha ->label('Bookmaker') ->width('2rem') ->options(function () { - $books = Bookmaker::where('is_active', 1)->orderBy('txid')->pluck('name', 'txid'); + $books = Bookmaker::where('is_active', 1)->orderBy('name')->pluck('name', 'id'); foreach ($books as $key => $value) { $books[$key] = $key.' - '.$value; } return $books; }), - // ->options(Bookmaker::where('is_active', 1)->pluck('name', 'txid')), ]) ->defaultSort('sort') ->deferFilters(false) diff --git a/app/Models/Bookmaker.php b/app/Models/Bookmaker.php index 16919e19..bef17678 100644 --- a/app/Models/Bookmaker.php +++ b/app/Models/Bookmaker.php @@ -11,7 +11,6 @@ class Bookmaker extends Model 'icon', 'image', 'baid', - 'txid', 'txso', 'txot', 'betsapi', diff --git a/app/Models/CompetitionGroup.php b/app/Models/CompetitionGroup.php index cf285d78..a86414e4 100644 --- a/app/Models/CompetitionGroup.php +++ b/app/Models/CompetitionGroup.php @@ -20,6 +20,6 @@ class CompetitionGroup extends Model public function country() { - return $this->belongsTo(Country::class, 'country_id', 'tx_id')->where('disabled', 0)->where('is_country', 1); + return $this->belongsTo(Country::class)->where('disabled', 0)->where('is_country', 1); } } diff --git a/app/Models/Country.php b/app/Models/Country.php index 4845fa2f..430102e0 100644 --- a/app/Models/Country.php +++ b/app/Models/Country.php @@ -12,7 +12,6 @@ class Country extends Model 'iso2', 'iso3', 'cc', - 'txid', 'is_country', 'disabled', ]; diff --git a/app/Models/MultilineClient.php b/app/Models/MultilineClient.php index aa527555..ff9613ec 100644 --- a/app/Models/MultilineClient.php +++ b/app/Models/MultilineClient.php @@ -29,7 +29,7 @@ class MultilineClient extends Model public function bookmaker() { - return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid'); + return $this->belongsTo(Bookmaker::class); } protected static function booted(): void diff --git a/app/Models/Odds2way.php b/app/Models/Odds2way.php index e2a8e52a..c6159a38 100644 --- a/app/Models/Odds2way.php +++ b/app/Models/Odds2way.php @@ -32,7 +32,7 @@ class Odds2way extends Model public function bookmaker() { - return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid'); + return $this->belongsTo(Bookmaker::class); } public function event() diff --git a/app/Models/Odds2wayS1.php b/app/Models/Odds2wayS1.php index b921217a..130d6bb3 100644 --- a/app/Models/Odds2wayS1.php +++ b/app/Models/Odds2wayS1.php @@ -32,7 +32,7 @@ class Odds2wayS1 extends Model public function bookmaker() { - return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid'); + return $this->belongsTo(Bookmaker::class); } public function event() diff --git a/app/Models/Odds3way.php b/app/Models/Odds3way.php index d6ffedff..72d7055d 100644 --- a/app/Models/Odds3way.php +++ b/app/Models/Odds3way.php @@ -38,7 +38,7 @@ class Odds3way extends Model public function bookmaker() { - return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid'); + return $this->belongsTo(Bookmaker::class); } public function provider() diff --git a/app/Models/OddsDc.php b/app/Models/OddsDc.php index 6bd88662..ff714a1d 100644 --- a/app/Models/OddsDc.php +++ b/app/Models/OddsDc.php @@ -33,7 +33,7 @@ class OddsDc extends Model public function bookmaker() { - return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid'); + return $this->belongsTo(Bookmaker::class); } public function event() diff --git a/app/Models/OddsDnb.php b/app/Models/OddsDnb.php index e5d9c017..93ce6603 100644 --- a/app/Models/OddsDnb.php +++ b/app/Models/OddsDnb.php @@ -32,7 +32,7 @@ class OddsDnb extends Model public function bookmaker() { - return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid'); + return $this->belongsTo(Bookmaker::class); } public function event() diff --git a/app/Models/OddsGgng.php b/app/Models/OddsGgng.php index 064caf54..c6da013e 100644 --- a/app/Models/OddsGgng.php +++ b/app/Models/OddsGgng.php @@ -32,7 +32,7 @@ class OddsGgng extends Model public function bookmaker() { - return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid'); + return $this->belongsTo(Bookmaker::class); } public function event() diff --git a/app/Models/OddsHandicap.php b/app/Models/OddsHandicap.php index cadd81cd..2a6353fe 100644 --- a/app/Models/OddsHandicap.php +++ b/app/Models/OddsHandicap.php @@ -33,7 +33,7 @@ class OddsHandicap extends Model public function bookmaker() { - return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid'); + return $this->belongsTo(Bookmaker::class); } public function event() diff --git a/app/Models/OddsHandicapQ1.php b/app/Models/OddsHandicapQ1.php index 2c9fd02b..2ecc627f 100644 --- a/app/Models/OddsHandicapQ1.php +++ b/app/Models/OddsHandicapQ1.php @@ -33,7 +33,7 @@ class OddsHandicapQ1 extends Model public function bookmaker() { - return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid'); + return $this->belongsTo(Bookmaker::class); } public function event() diff --git a/app/Models/OddsQualify.php b/app/Models/OddsQualify.php index ea8005f6..68fe9339 100644 --- a/app/Models/OddsQualify.php +++ b/app/Models/OddsQualify.php @@ -32,7 +32,7 @@ class OddsQualify extends Model public function bookmaker() { - return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid'); + return $this->belongsTo(Bookmaker::class); } public function event() diff --git a/app/Models/OddsTotal.php b/app/Models/OddsTotal.php index 772a9b0e..3b3fdb92 100644 --- a/app/Models/OddsTotal.php +++ b/app/Models/OddsTotal.php @@ -33,7 +33,7 @@ class OddsTotal extends Model public function bookmaker() { - return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid'); + return $this->belongsTo(Bookmaker::class); } public function event() diff --git a/app/Models/OddsTotalQ1.php b/app/Models/OddsTotalQ1.php index dbbf0e42..fce589ef 100644 --- a/app/Models/OddsTotalQ1.php +++ b/app/Models/OddsTotalQ1.php @@ -33,7 +33,7 @@ class OddsTotalQ1 extends Model public function bookmaker() { - return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid'); + return $this->belongsTo(Bookmaker::class); } public function event() diff --git a/app/Models/User.php b/app/Models/User.php index 1c5c3197..8d38b870 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -169,6 +169,6 @@ class User extends Authenticatable implements FilamentUser, HasAppAuthentication public function userBookmaker() { - return Bookmaker::where('id', auth()->user()->bookmaker_id)->select('id', 'name', 'icon', 'svg', 'txid')->first(); + return Bookmaker::where('id', auth()->user()->bookmaker_id)->select('id', 'name', 'icon', 'svg')->first(); } } diff --git a/database/seeders/ClientsSeeder.php b/database/seeders/ClientsSeeder.php index 114312e6..a4eb6c25 100644 --- a/database/seeders/ClientsSeeder.php +++ b/database/seeders/ClientsSeeder.php @@ -14,8 +14,8 @@ class ClientsSeeder extends Seeder */ $sql = "INSERT INTO `clients` (`id`, `name`, `homepage`, `bookmaker`, `provider`, `sport`, `created_at`, `updated_at`) VALUES - (1, 'Magloo', NULL, '[20,24]', '[3,4]', '[1,3]', '2025-08-24 05:56:41', '2025-12-30 07:42:58'), - (2, 'Logifuture', NULL, '[26,27]', '[5,6]', '[1,2,3,5]', '2025-08-24 05:57:01', '2025-12-30 07:43:26'); + (1, 'Magloo', NULL, '[10,16]', '[3,4]', '[1,3]', '2025-08-24 05:56:41', '2025-12-30 07:42:58'), + (2, 'Logifuture', NULL, '[35,36]', '[5,6]', '[1,2,3,5]', '2025-08-24 05:57:01', '2025-12-30 07:43:26'); "; DB::unprepared($sql);