Merge pull request #22 from WailanTirajoh/feat-add-filter-type-to-rooms

feat: add status & type filter to room

Author: WailanTirajoh

app/Http/Controllers/RoomController.php

@@ -9,15 +9,18 @@
 use App\Models\Type;
 use App\Repositories\Interface\ImageRepositoryInterface;
 use App\Repositories\Interface\RoomRepositoryInterface;
+use App\Repositories\Interface\RoomStatusRepositoryInterface;
+use App\Repositories\Interface\TypeRepositoryInterface;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 
 class RoomController extends Controller
 {
-    private $roomRepository;
-
-    public function __construct(RoomRepositoryInterface $roomRepository)
-    {
+    public function __construct(
+        private RoomRepositoryInterface $roomRepository,
+        private TypeRepositoryInterface $typeRepository,
+        private RoomStatusRepositoryInterface $roomStatusRepositoryInterface
+    ) {
         $this->roomRepository = $roomRepository;
     }
 
@@ -26,7 +29,10 @@ public function index(Request $request)
         if ($request->ajax()) {
             return $this->roomRepository->getRoomsDatatable($request);
         }
-        return view('room.index');
+
+        $types = $this->typeRepository->getTypeList($request);
+        $roomStatuses = $this->roomStatusRepositoryInterface->getRoomStatusList($request);
+        return view('room.index', compact('types', 'roomStatuses'));
     }
 
     public function create()

app/Repositories/Implementation/RoomRepository.php

@@ -9,7 +9,14 @@ class RoomRepository implements RoomRepositoryInterface
 {
     public function getRooms($request)
     {
-        $rooms = Room::with('type', 'roomStatus')->orderBy('number');
+        $rooms = Room::with('type', 'roomStatus')
+            ->orderBy('number')
+            ->when($request->status, function ($query) use ($request) {
+                $query->where('room_status_id', $request->status);
+            })
+            ->when($request->type, function ($query) use ($request) {
+                $query->where('type_id', $request->type);
+            });
         if (!empty($request->search)) {
             $rooms = $rooms->where('number', 'LIKE', '%' . $request->search . '%');
         }
@@ -43,6 +50,12 @@ public function getRoomsDatatable($request)
             'rooms.price',
             'room_statuses.name as status',
         )
+            ->when($request->status !== 'All', function ($query) use ($request) {
+                $query->where('room_status_id', $request->status);
+            })
+            ->when($request->type !== 'All', function ($query) use ($request) {
+                $query->where('type_id', $request->type);
+            })
             ->leftJoin("types", "rooms.type_id", "=", "types.id")
             ->leftJoin("room_statuses", "rooms.room_status_id", "=", "room_statuses.id");
 

app/Repositories/Implementation/RoomStatusRepository.php

@@ -95,4 +95,9 @@ public function getDatatable($request)
 
         return json_encode($response);
     }
+
+    public function getRoomStatusList($request)
+    {
+        return RoomStatus::get();
+    }
 }

app/Repositories/Implementation/TypeRepository.php

@@ -98,4 +98,9 @@ public function store($typeData)
 
         return $type;
     }
+
+    public function getTypeList($request)
+    {
+        return Type::get();
+    }
 }

app/Repositories/Interface/RoomStatusRepositoryInterface.php

@@ -10,4 +10,5 @@ interface RoomStatusRepositoryInterface
     public function getRoomStatuses($request);
 
     public function getDatatable($request);
+    public function getRoomStatusList($request);
 }

app/Repositories/Interface/TypeRepositoryInterface.php

@@ -7,4 +7,5 @@ interface TypeRepositoryInterface
     public function showAll($request);
     public function getTypesDatatable($request);
     public function store($typeData);
+    public function getTypeList($request);
 }