wip

app/Livewire/Mapper/LoadEvents.php

@@ -9,14 +9,11 @@ use Illuminate\Support\Facades\Auth;
 
 class LoadEvents
 {
-    public static function load($search_left, $sport_id)
+    public static function load($search_values)
     {
-        if ($search_left) {
-
-            $searchValues = preg_split('/\s+/', $search_left, -1, PREG_SPLIT_NO_EMPTY);
-
-            $element_ids = Element::where(function ($query) use ($searchValues) {
-                foreach ($searchValues as $value) {
+        if ($search_values) {
+            $element_ids = Element::where(function ($query) use ($search_values) {
+                foreach ($search_values as $value) {
                     $query->orWhere('name', 'LIKE', '%'.$value.'%');
                 }
             })->pluck('id')->toArray();
@@ -24,17 +21,16 @@ class LoadEvents
             $query = Event::query()
                 ->with('home')
                 ->with('away')
-                ->where('sport_id', $sport_id)
+                ->where('sport_id', auth()->user()->sport_id)
                 ->where('starttime', '>', Carbon::now())
                 ->where(function ($query) use ($element_ids) {
                     $query->orWhereIn('home_id', $element_ids)->orWhereIn('away_id', $element_ids);
                 });
-
         } else {
             $query = Event::query()
                 ->with('home')
                 ->with('away')
-                ->where('sport_id', $sport_id)
+                ->where('sport_id', auth()->user()->sport_id)
                 ->where('starttime', '>', Carbon::now());
         }
 

app/Livewire/Mapper/LoadProvider.php

@@ -18,14 +18,12 @@ class LoadProvider
 
         if ($search_right) {
 
-            $searchValues = preg_split('/\s+/', $search_right, -1, PREG_SPLIT_NO_EMPTY);
-
             return Mapper::query()
                 ->where('starttime', '>', Carbon::now())
                 ->where('sport_id', $user->sport_id)
                 ->where('provider_id', $user->provider_id)
-                ->where(function ($query) use ($searchValues) {
-                    foreach ($searchValues as $value) {
+                ->where(function ($query) use ($search_right) {
+                    foreach ($search_right as $value) {
                         $query->orWhere('home', 'LIKE', '%'.$value.'%')
                             ->orWhere('away', 'LIKE', '%'.$value.'%');
                     }

app/Livewire/Mapper/SearchString.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Livewire\Mapper;
+
+class SearchString
+{
+    public static function explode($string)
+    {
+        $string = str_replace([',', '/', '&'], '', $string);
+
+        return preg_split('/\s+/', $string, -1, PREG_SPLIT_NO_EMPTY);
+    }
+}