notification messages wip

app/Actions/AlarmStatistic.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions;
 
+use App\Models\Event;
 use App\Models\EventBookmaker;
 use App\Models\OddsTable;
 
@@ -15,10 +16,11 @@ class AlarmStatistic
             $fields[$value->name] = explode(',', $value->fieldnames);
         }
 
+        $event_ids = Event::where('sport_id', auth()->user()->sport_id)->where('starttime', '>=', now())->pluck('id')->toArray();
+
         $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('starttime', '>=', now())
+            ->whereIn('event_id', $event_ids)
             ->where('bookmaker_id', auth()->user()->bookmaker_id)
-            ->where('sport_id', auth()->user()->sport_id)
             ->get()
             ->toArray();