update network moudle

app/Repositories/Module/Network/NetworkCachedRepository.php

@@ -8,27 +8,39 @@ class NetworkCachedRepository extends BaseCachedRepository implements NetworkRep
 {
     public function __construct(
         public NetworkRepository $networkRepository
-    ) 
-    {
+    ) {
         parent::__construct();
     }
     public function getModel()
     {
         return $this->networkRepository->getModel();
     }
-    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->networkRepository
+                ->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->networkRepository->filter($data, $relationships, $withCount, $select);
-        });
+
+        return Cache::remember(
+            $cacheKey,
+            $this->cacheTime,
+            fn() =>
+            $this->networkRepository
+                ->filter($data, $relationships, $withCount, $select, $returnQuery)
+        );
     }
     public function findBy(string $key = '', string|int|null $value = '')
     {
@@ -42,7 +54,7 @@ class NetworkCachedRepository extends BaseCachedRepository implements NetworkRep
             return $this->networkRepository->findBy($key, $value);
         });
     }
-    public function findWithRelationships(int $id = 0, array $relationships = [],array $withCount = [], array $withSum = [])
+    public function findWithRelationships(int $id = 0, array $relationships = [], array $withCount = [], array $withSum = [])
     {
         $cacheKey = $this->getCacheKey(md5(json_encode([
             'findWithRelationships' => [
@@ -50,8 +62,8 @@ class NetworkCachedRepository extends BaseCachedRepository implements NetworkRep
                 'relationships' => $relationships
             ]
         ])));
-        return Cache::remember($cacheKey, $this->cacheTime, function () use ($id, $relationships,$withCount,$withSum) {
-            return $this->networkRepository->findWithRelationships($id, $relationships,$withCount,$withSum);
+        return Cache::remember($cacheKey, $this->cacheTime, function () use ($id, $relationships, $withCount, $withSum) {
+            return $this->networkRepository->findWithRelationships($id, $relationships, $withCount, $withSum);
         });
     }
 }

app/Repositories/Module/Network/NetworkRepository.php

@@ -3,28 +3,36 @@ namespace App\Repositories\Module\Network;
 
 use App\Models\ModuleNetwork;
 use App\Repositories\BaseRepository;
-class NetworkRepository extends BaseRepository implements NetworkRepositoryInterface{
+class NetworkRepository extends BaseRepository implements NetworkRepositoryInterface
+{
     public function getModel()
     {
         return ModuleNetwork::class;
     }
-    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)
     {
-        $model = $this->model->with($relationships)->select($select);
-        
+        $query = $this->model->with($relationships)->select($select);
+
         if (isset($data['status'])) {
-            $model =  $model->where("status", $data['status']);
+            $query = $query->where("status", $data['status']);
         }
         if (isset($data['module_host_id']) && $data['module_host_id']) {
-            $model =  $model->where("module_host_id", $data['module_host_id']);
+            $query->where("module_host_id", $data['module_host_id']);
         }
         if (count($withCount) > 0) {
-            $model = $model->withCount($withCount);
+            $query->withCount($withCount);
         }
-        if(isset($data['page'])) {
-            return $model->paginate(15);
+        if ($returnQuery) {
+            return $query;
         }
-        return $model->get();
+
+        if (!empty($data['paginate'])) {
+            return $query->paginate(
+                $data['per_page'] ?? 15
+            );
+        }
+
+        return $query->get();
     }
     public function findBy(string $key = '', string|int|null $value = '')
     {

app/Repositories/Module/Network/NetworkRepositoryInterface.php

@@ -2,9 +2,16 @@
 namespace App\Repositories\Module\Network;
 
 use App\Repositories\BaseRepositoryInterface;
-interface NetworkRepositoryInterface extends BaseRepositoryInterface{
-    public function filter(array $data = [],array $relationships = [],array $withCount = [],array $select = ['*']);
-    public function findBy(string $key = '',string|int|null $value = '' );
-    public function findWithRelationships(int $id = 0, array $relationships = [],array $withCount = [], array $withSum = []);
+interface NetworkRepositoryInterface extends BaseRepositoryInterface
+{
+    public function filter(
+        array $data = [],
+        array $relationships = [],
+        array $withCount = [],
+        array $select = ['*'],
+        bool $returnQuery = false
+    );
+    public function findBy(string $key = '', string|int|null $value = '');
+    public function findWithRelationships(int $id = 0, array $relationships = [], array $withCount = [], array $withSum = []);
 
 }