renewd grapper wip

app/Console/Commands/Grapper/TxOdds/Odds.php

@@ -50,13 +50,20 @@ class Odds
             Notice::note("Deleted: $info");
         }
 
-        $txodds_markets_columns = [
-            1 => 'soccer',
-            2 => 'ice_hockey',
-            3 => 'basketball',
-            5 => 'tennis',
-        ];
-        $res = TxoddsMarket::where($txodds_markets_columns[Nuh::$options['sport_id']], 1)->pluck('market_id', 'id')->toArray();
+        switch (Nuh::$options['sport_id']) {
+            case 1:
+                $res = TxoddsMarket::where('soccer', 1)->pluck('market_id', 'id')->toArray();
+                break;
+            case 2:
+                $res = TxoddsMarket::where('ice_hockey', 1)->pluck('market_id', 'id')->toArray();
+                break;
+            case 3:
+                $res = TxoddsMarket::where('basketball', 1)->pluck('market_id', 'id')->toArray();
+                break;
+            case 5:
+                $res = TxoddsMarket::where('tennis', 1)->pluck('market_id', 'id')->toArray();
+                break;
+        }
 
         /*************************************************
          *  use_lastcall
@@ -65,6 +72,7 @@ class Odds
 
         /*************************************************
          *  URL
+         * https://xml2.txodds.com/feed/odds/xml.php?36152-aeTRNnZxSPUwGe&all_odds=2&peid=14190947
          *************************************************/
         if (Nuh::$options['sport_id'] == 1) {
             $url = 'https://xml2.txodds.com/feed/odds/xml.php?'.config('env.txodds_betaid1').'&all_odds=2';
@@ -256,6 +264,8 @@ class Odds
 
                 foreach ($row->bookmaker as $book) {
 
+                    ActiveSpread::start();
+
                     $bookmaker_id = (int) $book['bid'];
 
                     $odds = [];
@@ -372,8 +382,8 @@ class Odds
                                 break;
                         }
                     }
+                    ActiveSpread::set($event_id, $bookmaker_id);
                 }
-                ActiveSpread::set();
             }
         }
 

app/Console/Commands/Grapper/TxOdds/Odds/Tools/ActiveSpread.php

@@ -8,54 +8,49 @@ class ActiveSpread
 {
     public static $collector = [];
 
-    public static $event_id = 0;
-
-    public static $provider_id = 0;
-
-    public static function collect($odds, $bettype)
+    public static function start()
     {
-        if ($odds['event_id'] != self::$event_id) {
-            self::$event_id = $odds['event_id'];
-            self::$provider_id = $odds['provider_id'];
-            self::$collector = [];
-        }
-        if (! isset(self::$collector[$bettype][$odds['bookmaker_id']]['difference'])) {
-            self::$collector[$bettype][$odds['bookmaker_id']]['difference'] = $odds['difference'];
+        self::$collector = [];
+    }
+
+    public static function collect($odds, $table)
+    {
+
+        if (! isset(self::$collector[$table]['difference'])) {
+            self::$collector[$table]['difference'] = $odds['difference'];
             if (isset($odds['handicap'])) {
-                self::$collector[$bettype][$odds['bookmaker_id']]['active_spread'] = $odds['handicap'];
+                self::$collector[$table]['active_spread'] = $odds['handicap'];
             } else {
-                self::$collector[$bettype][$odds['bookmaker_id']]['active_spread'] = $odds['total'];
+                self::$collector[$table]['active_spread'] = $odds['total'];
             }
-        } elseif ($odds['difference'] < self::$collector[$bettype][$odds['bookmaker_id']]['difference']) {
-            self::$collector[$bettype][$odds['bookmaker_id']]['difference'] = $odds['difference'];
+        } elseif ($odds['difference'] < self::$collector[$table]['difference']) {
+            self::$collector[$table]['difference'] = $odds['difference'];
             if (isset($odds['handicap'])) {
-                self::$collector[$bettype][$odds['bookmaker_id']]['active_spread'] = $odds['handicap'];
+                self::$collector[$table]['active_spread'] = $odds['handicap'];
             } else {
-                self::$collector[$bettype][$odds['bookmaker_id']]['active_spread'] = $odds['total'];
+                self::$collector[$table]['active_spread'] = $odds['total'];
             }
         }
     }
 
-    public static function set()
+    public static function set($event_id, $bookmaker_id)
     {
         foreach (self::$collector as $table => $value) {
-            DB::table($table)->where('event_id', self::$event_id)->where('provider_id', self::$provider_id)->update(['active_spread' => 0]);
-        }
-        foreach (self::$collector as $table => $bookmaker) {
-            foreach ($bookmaker as $bookmaker_id => $values) {
-                if (in_array($table, ['odds_points', 'odds_points_ht', 'odds_points_q1'])) {
-                    DB::table($table)
-                        ->where('event_id', self::$event_id)
-                        ->where('bookmaker_id', $bookmaker_id)
-                        ->where('handicap', $values['active_spread'])
-                        ->update(['active_spread' => 1]);
-                } else {
-                    DB::table($table)
-                        ->where('event_id', self::$event_id)
-                        ->where('bookmaker_id', $bookmaker_id)
-                        ->where('total', $values['active_spread'])
-                        ->update(['active_spread' => 1]);
-                }
+
+            DB::table($table)->where('event_id', $event_id)->where('bookmaker_id', $bookmaker_id)->update(['active_spread' => 0]);
+
+            if (in_array($table, ['odds_points', 'odds_points_ht', 'odds_points_q1'])) {
+                DB::table($table)
+                    ->where('event_id', $event_id)
+                    ->where('bookmaker_id', $bookmaker_id)
+                    ->where('handicap', (float) $value['active_spread'])
+                    ->update(['active_spread' => 1]);
+            } else {
+                DB::table($table)
+                    ->where('event_id', $event_id)
+                    ->where('bookmaker_id', $bookmaker_id)
+                    ->where('total', (float) $value['active_spread'])
+                    ->update(['active_spread' => 1]);
             }
         }
     }

app/Console/Commands/Grapper/TxOdds/Odds/_PointsQ1.php

@@ -42,6 +42,6 @@ class _PointsQ1
             $res->save();
         }
 
-        ActiveSpread::collect($odds, 'odds_points_q1');
+        ActiveSpread::collect($odds, 'odds_totals_q1');
     }
 }