Changing to php 8.3

Author: mchev

app/Http/Controllers/Public/HomeController.php

@@ -46,18 +46,19 @@ public function index(Request $request)
             $query->where('name', 'like', '%'.$request->search.'%');
         }
 
-        // if ($request->filled('category') && $request->category !== 'all') {
-        //     $category = Category::find($request->category);
-        //     if ($category) {
-        //         $query->where(function ($query) use ($category) {
-        //             $query->where('category_id', $category->id)
-        //                 ->orWhereHas('category', function ($query) use ($category) {
-        //                     $query->where('parent_id', $category->id)
-        //                         ->orWhere('id', $category->parent_id);
-        //                 });
-        //         });
-        //     }
-        // }
+        if ($request->filled('category') && $request->category !== 'all') {
+            $category = Category::find($request->category);
+            if ($category) {
+                $categoryIds = collect([$category->id])
+                    ->merge($category->descendants()->pluck('id'))
+                    ->merge($category->ancestors()->pluck('id'))
+                    ->unique()
+                    ->values()
+                    ->toArray();
+
+                $query->whereIn('category_id', $categoryIds);
+            }
+        }
 
         // Apply location filter if preferences exist
         if ($locationPreferences && isset($locationPreferences['coordinates'], $locationPreferences['radius'])) {
@@ -95,7 +96,7 @@ public function index(Request $request)
                 'postcode' => $locationPreferences['postcode'] ?? null,
             ],
             'stats' => [
-                'categories' => null //Category::whereNull('parent_id')->orderBy('name')->with('children')->get(),
+                'categories' => Category::tree()->get(),
             ],
         ]);
     }