bug

app/Actions/AlarmStatistic.php

@@ -2,7 +2,6 @@
 
 namespace App\Actions;
 
-use App\Models\Client;
 use App\Models\EventBookmaker;
 use App\Models\OddsTable;
 
@@ -16,17 +15,9 @@ class AlarmStatistic
             $fields[$value->name] = explode(',', $value->fieldnames);
         }
 
-        $clients = Client::get();
-
-        foreach ($clients as $client) {
-
-            foreach ($client->bookmaker as $bookmaker_id) {
-
-                foreach ($client->sport as $sport_id) {
-
         $res = EventBookmaker::select('alarm_2w_h2w', 'alarm_2w_a2w', 'alarm_2ws1_h2w', 'alarm_2ws1_a2w', 'alarm_3w_h3w', 'alarm_3w_d3w', 'alarm_3w_a3w', 'alarm_3wht_h3w', 'alarm_3wht_d3w', 'alarm_3wht_a3w', 'alarm_dc_dc1x', 'alarm_dc_dc12', 'alarm_dc_dcx2', 'alarm_dbn_dnb1', 'alarm_dbn_dnb2', 'alarm_ggng_gg', 'alarm_ggng_ng', 'alarm_po_home', 'alarm_po_away', 'alarm_poht_home', 'alarm_poht_away', 'alarm_poq1_home', 'alarm_poq1_away', 'alarm_to_over', 'alarm_to_under', 'alarm_toht_over', 'alarm_toht_under', 'alarm_toq1_over', 'alarm_toq1_under', 'alarm_tq_htq', 'alarm_tq_atq')
-                        ->where('bookmaker_id', $bookmaker_id)
+            ->where('bookmaker_id', auth()->user()->bookmaker_id)
-                        ->where('sport_id', $sport_id)
+            ->where('sport_id', auth()->user()->sport_id)
             ->get()
             ->toArray();
 
@@ -43,9 +34,7 @@ class AlarmStatistic
                         }
                     }
                 }
-                        }
+
-                    }
-                }
             }
         }
 

app/Console/Commands/Services/Tasks/GenerateAlarms.php

@@ -13,7 +13,6 @@ use App\Console\Commands\Services\Tasks\Alarm\AlarmStore;
 use App\Models\Client;
 use App\Models\EventBookmaker;
 use App\Models\OddsTable;
-use App\Models\Sport;
 use App\Utilities\Notice;
 
 class GenerateAlarms
@@ -31,14 +30,12 @@ class GenerateAlarms
 
         $clients = Client::get();
 
-        $sports = Sport::where('is_active', 1)->pluck('id');
+        foreach ($clients as $client) {
 
-        foreach ($sports as $sport_id) {
+            foreach ($client->sport as $sport_id) {
 
                 $multilines = AlarmMultilineSetting::get($sport_id);
 
-            foreach ($clients as $client) {
-
                 foreach ($client->bookmaker as $client_bookmaker_id) {
 
                     $alarm_threshold = AlarmSettings::get($client_bookmaker_id, $sport_id);