Merge pull request #126 from ConductionNL/feature/DIMOC-234/pagination

Enable pagination parameters
OpenCatalogi · Aug 8, 2024 · 1a2fdd5 · 1a2fdd5
2 parents bdcb133 + 0da6864
commit 1a2fdd5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/lib/Controller/SearchController.php b/lib/Controller/SearchController.php
@@ -95,14 +95,28 @@ public function index(SearchService $searchService): JSONResponse
 
         $fieldsToSearch = ['title', 'description', 'summary'];
 
-		if($this->config->hasKey($this->appName, 'mongoStorage') === false
-			|| $this->config->getValueString($this->appName, 'mongoStorage') !== '1'
+		if($this->config->hasKey($this->appName, 'elasticLocation') === false
+			|| $this->config->getValueString($this->appName, 'elasticLocation') === ''
 		) {
 			$searchParams = $searchService->createMySQLSearchParams(filters: $filters);
 			$searchConditions = $searchService->createMySQLSearchConditions(filters: $filters, fieldsToSearch:  $fieldsToSearch);
+
+			$limit = null;
+			$offset = null;
+
+			if(isset($filters['_limit']) === true) {
+				$limit = $filters['_limit'];
+			}
+
+			if(isset($filters['_page']) === true) {
+				$offset = ($limit * ($filters['_page'] - 1));
+			}
+
 			$filters = $searchService->unsetSpecialQueryParams(filters: $filters);
 
-			return new JSONResponse(['results' => $this->publicationMapper->findAll(limit: null, offset: null, filters: $filters, searchConditions: $searchConditions, searchParams: $searchParams)]);
+
+
+			return new JSONResponse(['results' => $this->publicationMapper->findAll(limit: $limit, offset: $offset, filters: $filters, searchConditions: $searchConditions, searchParams: $searchParams)]);
 		}
 
 		//@TODO: find a better way to get query params. This fixes it for now.

diff --git a/lib/Service/ElasticSearchService.php b/lib/Service/ElasticSearchService.php
@@ -124,6 +124,18 @@ public function parseFilters (array $filters): array
 			];
 		}
 
+		if(isset($filters['.limit']) === true) {
+			$body['size'] = $filters['.limit'];
+			unset($filters['.limit']);
+		}
+
+		if(isset($filters['.page']) === true) {
+			if(isset($body['size']) === true) {
+				$body['from'] = $body['size'] * ($filters['.page'] - 1);
+			}
+			unset($filters['.page']);
+		}
+
 		unset($filters['.search'], $filters['.queries'], $filters['.catalogi']);
 
 		foreach ($filters as $name => $filter) {