From 320079c2a13f3eaa34ac03c9e9a756ac22839cbe Mon Sep 17 00:00:00 2001
From: salam <hermann.telser@gmail.com>
Date: Tue, 27 Jan 2026 20:40:01 +0100
Subject: [PATCH] bug

---
 app/Actions/AlarmStatistic.php                | 43 +++++++------------
 .../Services/Tasks/GenerateAlarms.php         |  9 ++--
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/app/Actions/AlarmStatistic.php b/app/Actions/AlarmStatistic.php
index 973d7859..bdd293fb 100644
--- a/app/Actions/AlarmStatistic.php
+++ b/app/Actions/AlarmStatistic.php
@@ -2,7 +2,6 @@
 
 namespace App\Actions;
 
-use App\Models\Client;
 use App\Models\EventBookmaker;
 use App\Models\OddsTable;
 
@@ -16,36 +15,26 @@ class AlarmStatistic
             $fields[$value->name] = explode(',', $value->fieldnames);
         }
 
-        $clients = Client::get();
+        $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', auth()->user()->bookmaker_id)
+            ->where('sport_id', auth()->user()->sport_id)
+            ->get()
+            ->toArray();
 
-        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('sport_id', $sport_id)
-                        ->get()
-                        ->toArray();
-
-                    $arr = [];
-                    foreach ($res as $value) {
-                        foreach ($fields as $table => $names) {
-                            foreach ($names as $name) {
-                                $val = (int) $value[$name];
-                                if ($val) {
-                                    if (isset($arr[$table][$val])) {
-                                        $arr[$table][$val]++;
-                                    } else {
-                                        $arr[$table][$val] = 1;
-                                    }
-                                }
-                            }
+        $arr = [];
+        foreach ($res as $value) {
+            foreach ($fields as $table => $names) {
+                foreach ($names as $name) {
+                    $val = (int) $value[$name];
+                    if ($val) {
+                        if (isset($arr[$table][$val])) {
+                            $arr[$table][$val]++;
+                        } else {
+                            $arr[$table][$val] = 1;
                         }
                     }
                 }
+
             }
         }
 
diff --git a/app/Console/Commands/Services/Tasks/GenerateAlarms.php b/app/Console/Commands/Services/Tasks/GenerateAlarms.php
index 2754eabf..94c25905 100644
--- a/app/Console/Commands/Services/Tasks/GenerateAlarms.php
+++ b/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,13 +30,11 @@ 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) {
+                $multilines = AlarmMultilineSetting::get($sport_id);
 
                 foreach ($client->bookmaker as $client_bookmaker_id) {