update hosting

app/Repositories/Module/HostingServer/HostingServerCachedRepository.php

@@ -37,18 +37,31 @@ class HostingServerCachedRepository extends BaseCachedRepository implements Host
             return $this->hostingServerRepository->findByName($name);
         });
     }
-    public function filter(array $data = [], array $relationships = [], array $withCount = [], array $select = ['*'])
-    {
+    public function filter(
+        array $data = [],
+        array $relationships = [],
+        array $withCount = [],
+        array $select = ['*'],
+        bool $returnQuery = false
+    ) {
+        if (
+            $returnQuery ||
+            !empty($data['paginate'])
+        ) {
+            return $this->hostingServerRepository
+                ->filter($data, $relationships, $withCount, $select, $returnQuery);
+        }
+
         $cacheKey = $this->getCacheKey(md5(json_encode([
-            'filterItem' => [
-                'data' => $data,
-                'relationships' => $relationships,
-                'select' => $select,
-                'withCount' => $withCount
-            ]
+            'filter' => compact('data', 'relationships', 'withCount', 'select')
         ])));
-        return Cache::remember($cacheKey, $this->cacheTime, function () use ($data, $relationships, $select, $withCount) {
-            return $this->hostingServerRepository->filter($data, $relationships, $withCount, $select);
-        });
+
+        return Cache::remember(
+            $cacheKey,
+            $this->cacheTime,
+            fn() =>
+            $this->hostingServerRepository
+                ->filter($data, $relationships, $withCount, $select, $returnQuery)
+        );
     }
 }

app/Repositories/Module/HostingServer/HostingServerRepository.php

@@ -20,61 +20,37 @@ class HostingServerRepository extends BaseRepository implements HostingServerRep
         if (empty($name)) {
             return false;
         }
-        return $this->model->where('name','LIKE',"%$name%")->first();
+        return $this->model->where('name', 'LIKE', "%$name%")->first();
     }
-    public function filter(array $data = [], array $relationships = [], array $withCount = [], array $select = ['*'])
-    {
-        $model = $this->model->with($relationships)->select($select);
-        if (isset($data['relations'])) {
-            foreach ($data['relations'] as $key => $value) {
-                $model = $model->whereHas($key, function ($query) use ($value) {
-                    if (isset($value['condition'])) {
-                        switch (strtoupper($value['condition'])) {
-                            case "IN":
-                                $query->whereIn($value['key'], $value['value']);
-                                break;
-                            case "NotIn":
-                                $query->whereNotIn($value['key'], $value['value']);
-                                break;
-                            default:
-                                $query->where($value['key'], $value['condition'], $value['value']);
-                                break;
-                        }
-                    } else {
-                        $query->where($value['key'], $value['value']);
-                    }
-                });
-            }
+    public function filter(
+        array $data = [],
+        array $relationships = [],
+        array $withCount = [],
+        array $select = ['*'],
+        bool $returnQuery = false
+    ) {
+        $query = $this->model
+            ->select($select)
+            ->with($relationships);
+
+        // if (!empty($data['vcenter_id'])) {
+        //     $query->where('vcenter_id', $data['vcenter_id']);
+        // }
+
+        if (!empty($withCount)) {
+            $query->withCount($withCount);
         }
-        if (isset($data['status'])) {
-            if (is_array($data['status'])) {
-                $model = $model->where(function ($query) use ($data) {
-                    if (isset($data['status']['condition'])) {
-                        switch (strtoupper($data['status']['condition'])) {
-                            case "IN":
-                                $query->whereIn($data['status']['key'], $data['status']['value']);
-                                break;
-                            case "NOTIN":
-                                $query->whereNotIn($data['status']['key'], $data['status']['value']);
-                                break;
-                            default:
-                                $query->where($data['status']['key'], $data['status']['condition'], $data['status']['value']);
-                                break;
-                        }
-                    } else {
-                        $query->where($data['status']['key'], $data['status']['value']);
-                    }
-                });
-            } else {
-                $model =  $model->where("status", $data['status']);
-            }
+
+        if ($returnQuery) {
+            return $query;
         }
-        if (count($withCount) > 0) {
-            $model = $model->withCount($withCount);
+
+        if (!empty($data['paginate'])) {
+            return $query->paginate(
+                $data['per_page'] ?? 15
+            );
         }
-        if (isset($data['page'])) {
-            return $model->paginate(15);
-        }
-        return $model->get();
+
+        return $query->get();
     }
 }

app/Repositories/Module/HostingServer/HostingServerRepositoryInterface.php

@@ -3,9 +3,16 @@ namespace App\Repositories\Module\HostingServer;
 
 use App\Repositories\BaseRepositoryInterface;
 
-interface HostingServerRepositoryInterface extends BaseRepositoryInterface{
+interface HostingServerRepositoryInterface extends BaseRepositoryInterface
+{
     public function get_active();
     public function findByName(string $name = '');
-    public function filter(array $data = [],array $relationships = [],array $withCount = [],array $select = ['*']);
+    public function filter(
+        array $data = [],
+        array $relationships = [],
+        array $withCount = [],
+        array $select = ['*'],
+        bool $returnQuery = false
+    );
 
 }