From 8edab70a63f6f2bb021ba0f81f94c3c227f98869 Mon Sep 17 00:00:00 2001
From: Wilco Louwerse <wilco@conduction.nl>
Date: Tue, 30 Jul 2024 17:10:49 +0200
Subject: [PATCH 1/7] Use $this->client not $client

---
 lib/Service/SearchService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Service/SearchService.php b/lib/Service/SearchService.php
index bd03bcb7..4d0ca09f 100644
--- a/lib/Service/SearchService.php
+++ b/lib/Service/SearchService.php
@@ -109,7 +109,7 @@ public function search(array $parameters, array $elasticConfig, array $dbConfig,
 			$parameters['_catalogi'] = $catalogi;
 
 
-			$promises[] = $client->getAsync($searchEndpoint, ['query' => $parameters]);
+			$promises[] = $this->client->getAsync($searchEndpoint, ['query' => $parameters]);
 		}
 
 		$responses = Utils::settle($promises)->wait();

From 7b3e1761eecfe4d0f1c48e0a60309c5b387d938a Mon Sep 17 00:00:00 2001
From: Barry Brands <barrybrands02@hotmail.com>
Date: Fri, 2 Aug 2024 17:00:37 +0200
Subject: [PATCH 2/7] Validate elastic config

---
 lib/Controller/SearchController.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/lib/Controller/SearchController.php b/lib/Controller/SearchController.php
index 47bf9253..eb5572bc 100644
--- a/lib/Controller/SearchController.php
+++ b/lib/Controller/SearchController.php
@@ -72,6 +72,20 @@ public function index(SearchService $searchService): JSONResponse
 
 		$filters = array_combine(keys: $keys, values: $values);
 
+        $requiredElasticConfig = ['location', 'key', 'index'];
+        $missingFields = null;
+        foreach ($requiredElasticConfig as $key) {
+            if (isset($elasticConfig[$key]) === false || empty($elasticConfig[$key])) {
+                $missingFields .= "$key, ";
+            }
+        }
+
+        if ($missingFields !== null) {
+            $errorMessage = "Missing the following elastic configuration: {$missingFields}please update your elastic connection in application settings.";
+            $response = new JSONResponse(data: ['code' => 403, 'message' => $errorMessage], statusCode: 403);
+
+            return $response;
+        }
 
 		$data = $searchService->search(parameters: $filters, elasticConfig: $elasticConfig, dbConfig: $dbConfig);
 
@@ -94,6 +108,19 @@ public function show(string|int $id, SearchService $searchService): JSONResponse
 
 		$filters = ['_id' => (string) $id];
 
+        $requiredElasticConfig = ['location', 'key', 'index'];
+        $missingFields = null;
+        foreach ($requiredElasticConfig as $key) {
+            if (isset($elasticConfig[$key]) === false) {
+                $missingFields .= "$key ";
+            }
+        }
+
+        if ($missingFields !== null) {
+            $errorMessage = "Missing the following elastic configuration: {$missingFields}please update your elastic connection in application settings.";
+            return new JSONResponse(['message' => $errorMessage], 403);
+        }
+
 		$data = $searchService->search(parameters: $filters, elasticConfig: $elasticConfig, dbConfig: $dbConfig);
 
 		if(count($data['results']) > 0) {

From b4aff181b7d57ebc7c81c49239c4e8e2f9adf65a Mon Sep 17 00:00:00 2001
From: Barry Brands <barrybrands02@hotmail.com>
Date: Fri, 2 Aug 2024 17:11:30 +0200
Subject: [PATCH 3/7] Search federatief improvements

---
 src/sidebars/dashboard/DashboardSideBar.vue |  9 +++++---
 src/sidebars/search/SearchSideBar.vue       | 10 ++++++---
 src/store/modules/search.js                 | 12 +++++++++-
 src/views/dashboard/DashboardIndex.vue      | 25 +++++++++++++++++++++
 4 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/sidebars/dashboard/DashboardSideBar.vue b/src/sidebars/dashboard/DashboardSideBar.vue
index d8855344..481c7db9 100644
--- a/src/sidebars/dashboard/DashboardSideBar.vue
+++ b/src/sidebars/dashboard/DashboardSideBar.vue
@@ -9,11 +9,14 @@ import { navigationStore, searchStore, publicationStore } from '../../store/stor
 		<NcAppSidebarTab id="search-tab" name="Zoeken" :order="1">
 			<template #icon>
 				<Magnify :size="20" />
-			</template>
-			Zoek snel in het voor uw beschickbare federatieve netwerk
+			</template>test2
+			Zoek snel in het voor uw beschikbare federatieve netwerk<br>
 			<NcTextField class="searchField"
 				:value.sync="searchStore.search"
-				label="Search" />
+				label="Zoeken" />
+            <NcNoteCard v-if="searchStore.searchError" type="error">
+                <p>{{ searchStore.searchError }}</p>
+            </NcNoteCard>
 		</NcAppSidebarTab>
 		<NcAppSidebarTab id="settings-tab" name="Publicaties" :order="2">
 			<template #icon>
diff --git a/src/sidebars/search/SearchSideBar.vue b/src/sidebars/search/SearchSideBar.vue
index 3bbf4b21..95818589 100644
--- a/src/sidebars/search/SearchSideBar.vue
+++ b/src/sidebars/search/SearchSideBar.vue
@@ -10,10 +10,14 @@ import { searchStore } from '../../store/store.js'
 		<NcAppSidebarTab id="search-tab" name="Zoeken" :order="1">
 			<template #icon>
 				<Magnify :size="20" />
-			</template>
+			</template>test1
+			Zoek snel in het voor uw beschikbare federatieve netwerk<br>
 			<NcTextField class="searchField"
 				:value.sync="searchStore.search"
-				label="Search" />
+				label="Zoeken" />
+            <NcNoteCard v-if="searchStore.searchError" type="error">
+                <p>{{ searchStore.searchError }}</p>
+            </NcNoteCard>
 		</NcAppSidebarTab>
 		<NcAppSidebarTab id="settings-tab" name="Catalogi" :order="2">
 			<template #icon>
@@ -33,7 +37,7 @@ import { searchStore } from '../../store/store.js'
 </template>
 <script>
 
-import { NcAppSidebar, NcAppSidebarTab, NcTextField, NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import { NcAppSidebar, NcAppSidebarTab, NcTextField, NcNoteCard, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import Magnify from 'vue-material-design-icons/Magnify.vue'
 import DatabaseOutline from 'vue-material-design-icons/DatabaseOutline.vue'
 import FileTreeOutline from 'vue-material-design-icons/FileTreeOutline.vue'
diff --git a/src/store/modules/search.js b/src/store/modules/search.js
index 0065ac56..f0d0c116 100644
--- a/src/store/modules/search.js
+++ b/src/store/modules/search.js
@@ -5,6 +5,7 @@ export const useSearchStore = defineStore('search', {
 	state: () => ({
 		search: '',
 		searchResults: '',
+		searchError: '',
 	}),
 	actions: {
 		setSearch(search) {
@@ -24,15 +25,24 @@ export const useSearchStore = defineStore('search', {
 			)
 				.then((response) => {
 					response.json().then((data) => {
+                        console.log(data)
+                        if (data?.code == 403 && data?.message) {
+                            this.searchError = data.message
+                            console.log(this.searchError)
+                        } else {
+                            this.searchError = ''; // Clear any previous errors
+                          }
 						this.searchResults = data
 					})
 				})
 				.catch((err) => {
-					console.error(err)
+                    this.searchError = err.message || 'An error occurred';
+					console.error(err.message ?? err)
 				})
 		},
 		clearSearch() {
 			this.search = ''
+            this.searchError = ''
 		},
 	},
 })
diff --git a/src/views/dashboard/DashboardIndex.vue b/src/views/dashboard/DashboardIndex.vue
index e4adff06..1503f104 100644
--- a/src/views/dashboard/DashboardIndex.vue
+++ b/src/views/dashboard/DashboardIndex.vue
@@ -1,3 +1,7 @@
+<script setup>
+import { searchStore } from '../../store/store.js'
+</script>
+
 <template>
 	<NcAppContent>
 		<div class="dashboardContainer">
@@ -23,6 +27,12 @@ export default {
 		NcAppContent,
 		apexchart: VueApexCharts,
 	},
+	props: {
+		search: {
+			type: String,
+			required: true,
+		},
+	},
 	data() {
 		return {
 			options: {
@@ -39,6 +49,21 @@ export default {
 			}],
 		}
 	},
+	watch: {
+		search: {
+			handler(search) {
+				searchStore.getSearchResults()
+			},
+		},
+	},
+	mounted() {
+		searchStore.getSearchResults()
+	},
+	methods: {
+		goToLink(link) {
+			//
+		},
+	},
 }
 </script>
 

From c1d1d16eacf0f53f0cfc3a407c559281b8ac1f57 Mon Sep 17 00:00:00 2001
From: Barry Brands <barrybrands02@hotmail.com>
Date: Mon, 5 Aug 2024 19:26:20 +0200
Subject: [PATCH 4/7] Added local search to SearchController

---
 lib/Controller/SearchController.php | 19 ++++++-
 lib/Service/SearchService.php       | 85 +++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/SearchController.php b/lib/Controller/SearchController.php
index eb5572bc..7fc12b75 100644
--- a/lib/Controller/SearchController.php
+++ b/lib/Controller/SearchController.php
@@ -3,6 +3,7 @@
 namespace OCA\OpenCatalogi\Controller;
 
 use OCA\OpenCatalogi\Service\ElasticSearchService;
+use OCA\OpenCatalogi\Db\PublicationMapper;
 use OCA\OpenCatalogi\Service\SearchService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -25,7 +26,11 @@ class SearchController extends Controller
         ]
     ];
 
-    public function __construct($appName, IRequest $request, private readonly IAppConfig $config)
+    public function __construct(
+        $appName,
+        IRequest $request,
+		private readonly PublicationMapper $publicationMapper,
+        private readonly IAppConfig $config)
     {
         parent::__construct($appName, $request);
     }
@@ -64,6 +69,18 @@ public function index(SearchService $searchService): JSONResponse
 		$filters = $this->request->getParams();
 		unset($filters['_route']);
 
+        $fieldsToSearch = ['title', 'description', 'summary'];
+
+		if($this->config->hasKey($this->appName, 'mongoStorage') === false
+			|| $this->config->getValueString($this->appName, 'mongoStorage') !== '1'
+		) {
+			$searchParams = $searchService->createMySQLSearchParams($filters, $fieldsToSearch);
+			$searchConditions = $searchService->createMySQLSearchConditions($filters, $fieldsToSearch);
+			$filters = $searchService->unsetSpecialQueryParams($filters);
+
+			return new JSONResponse(['results' => $this->publicationMapper->findAll(filters: $filters, searchParams: $searchParams, searchConditions: $searchConditions)]);
+		}
+
 		//@TODO: find a better way to get query params. This fixes it for now.
 		$keys   = array_keys(array: $filters);
 		$values = array_values(array: $filters);
diff --git a/lib/Service/SearchService.php b/lib/Service/SearchService.php
index 4d0ca09f..08817ffa 100644
--- a/lib/Service/SearchService.php
+++ b/lib/Service/SearchService.php
@@ -174,6 +174,91 @@ private function recursiveRequestQueryKey(array &$vars, string $name, string $na
 
 	}//end recursiveRequestQueryKey()
 
+	/**
+	 * This function creates a mongodb filter array.
+	 *
+	 * Also unsets _search in filters !
+	 *
+	 * @param array $filters 	    Query parameters from request.
+	 * @param array $fieldsToSearch Database field names to filter/search on.
+	 *
+	 * @return array $filters
+	 */
+	public function createMongoDBSearchFilter(array $filters, array $fieldsToSearch): array
+	{
+        if (isset($filters['_search']) === true) {
+			$searchRegex = ['$regex' => $filters['_search'], '$options' => 'i'];
+			$filters['$or'] = [];
+
+			foreach ($fieldsToSearch as $field) {
+				$filters['$or'][] = [$field => $searchRegex];
+			}
+
+			unset($filters['_search']);
+		}
+
+		return $filters;
+
+	}//end createMongoDBSearchFilter()
+
+	/**
+	 * This function creates mysql search conditions based on given filters from request.
+	 *
+	 * @param array $filters 	    Query parameters from request.
+	 * @param array $fieldsToSearch Fields to search on in sql.
+	 *
+	 * @return array $searchConditions
+	 */
+	public function createMySQLSearchConditions(array $filters, array $fieldsToSearch): array
+	{
+		$searchConditions = [];
+		if (isset($filters['_search']) === true) {
+			foreach ($fieldsToSearch as $field) {
+				$searchConditions[] = "LOWER($field) LIKE :search";
+			}
+		}
+
+		return $searchConditions;
+
+	}//end createMongoDBSearchFilter()
+
+	/**
+	 * This function unsets all keys starting with _ from filters.
+	 *
+	 * @param array $filters Query parameters from request.
+	 *
+	 * @return array $filters
+	 */
+	public function unsetSpecialQueryParams(array $filters): array
+	{
+        foreach ($filters as $key => $value) {
+            if (str_starts_with($key, '_')) {
+                unset($filters[$key]);
+            }
+        }
+
+		return $filters;
+
+	}//end createMongoDBSearchFilter()
+
+	/**
+	 * This function creates mysql search parameters based on given filters from request.
+	 *
+	 * @param array $filters 	    Query parameters from request.
+	 *
+	 * @return array $searchParams
+	 */
+	public function createMySQLSearchParams(array $filters): array
+	{
+		$searchParams = [];
+		if (isset($filters['_search']) === true) {
+			$searchParams['search'] = '%' . strtolower($filters['_search']) . '%';
+		}
+
+		return $searchParams;
+
+	}//end createMongoDBSearchFilter()
+
 	/**
 	 * Parses the request query string and returns it as an array of queries.
 	 *

From a708afd91947cdfd2b7651bceb87183a35beaedd Mon Sep 17 00:00:00 2001
From: Barry Brands <barrybrands02@hotmail.com>
Date: Mon, 5 Aug 2024 19:26:35 +0200
Subject: [PATCH 5/7] Cleanup/refactor

---
 lib/Controller/CatalogiController.php       | 39 +++++----------------
 lib/Controller/DirectoryController.php      | 39 +++++----------------
 lib/Controller/MetaDataController.php       | 37 +++++--------------
 lib/Controller/PublicationsController.php   | 39 +++++----------------
 src/sidebars/dashboard/DashboardSideBar.vue |  2 +-
 src/sidebars/search/SearchSideBar.vue       |  2 +-
 6 files changed, 37 insertions(+), 121 deletions(-)

diff --git a/lib/Controller/CatalogiController.php b/lib/Controller/CatalogiController.php
index 299c23e7..5f5b1e5e 100644
--- a/lib/Controller/CatalogiController.php
+++ b/lib/Controller/CatalogiController.php
@@ -4,6 +4,7 @@
 
 use OCA\OpenCatalogi\Db\CatalogMapper;
 use OCA\OpenCatalogi\Service\ObjectService;
+use OCA\OpenCatalogi\Service\SearchService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
@@ -35,46 +36,24 @@ public function page(?string $getParameter): TemplateResponse
      * @NoAdminRequired
      * @NoCSRFRequired
      */
-    public function index(ObjectService $objectService): JSONResponse
+    public function index(ObjectService $objectService, SearchService $searchService): JSONResponse
     {
         $filters = $this->request->getParams();
-
-        $searchConditions = [];
-        $searchParams = [];
         $fieldsToSearch = ['title', 'description', 'summary'];
 
-        foreach ($filters as $key => $value) {
-            if ($key === '_search') {
-                // MongoDB
-                $searchRegex = ['$regex' => $value, '$options' => 'i'];
-                $filters['$or'] = [];
-
-                // MySQL
-                $searchParams['search'] = '%' . strtolower($value) . '%';
-
-                foreach ($fieldsToSearch as $field) {
-                    // MongoDB
-                    $filters['$or'][] = [$field => $searchRegex];
-
-                    // MySQL
-                    $searchConditions[] = "LOWER($field) LIKE :search";
-                }
-            }
-
-            if (str_starts_with($key, '_')) {
-                unset($filters[$key]);
-            }  
-        }
-
 		if($this->config->hasKey($this->appName, 'mongoStorage') === false
 			|| $this->config->getValueString($this->appName, 'mongoStorage') !== '1'
 		) {
-            // Unset mongodb filter
-            unset($filters['$or']);
+			$searchParams = $searchService->createMySQLSearchParams($filters, $fieldsToSearch);
+			$searchConditions = $searchService->createMySQLSearchConditions($filters, $fieldsToSearch);
+			$filters = $searchService->unsetSpecialQueryParams($filters);
 
 			return new JSONResponse(['results' => $this->catalogMapper->findAll(filters: $filters, searchParams: $searchParams, searchConditions: $searchConditions)]);
 		}
-        
+
+		$filters = $searchService->createMongoDBSearchFilter($filters, $fieldsToSearch);
+		$filters = $searchService->unsetSpecialQueryParams($filters, $fieldsToSearch);
+
         try {
             $dbConfig = [
                 'base_uri' => $this->config->getValueString($this->appName, 'mongodbLocation'),
diff --git a/lib/Controller/DirectoryController.php b/lib/Controller/DirectoryController.php
index 2e60a53a..556fe126 100644
--- a/lib/Controller/DirectoryController.php
+++ b/lib/Controller/DirectoryController.php
@@ -5,6 +5,7 @@
 use OCA\OpenCatalogi\Db\ListingMapper;
 use OCA\OpenCatalogi\Service\DirectoryService;
 use OCA\OpenCatalogi\Service\ObjectService;
+use OCA\OpenCatalogi\Service\SearchService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
@@ -82,46 +83,24 @@ public function add(?string $url, DirectoryService $directoryService): JSONRespo
 	 * @PublicPage
 	 * @NoCSRFRequired
 	 */
-	public function index(ObjectService $objectService): JSONResponse
+	public function index(ObjectService $objectService, SearchService $searchService): JSONResponse
 	{
 		$filters = $this->request->getParams();
-
-        $searchConditions = [];
-        $searchParams = [];
         $fieldsToSearch = ['summary'];
 
-        foreach ($filters as $key => $value) {
-            if ($key === '_search') {
-                // MongoDB
-                $searchRegex = ['$regex' => $value, '$options' => 'i'];
-                $filters['$or'] = [];
-
-                // MySQL
-                $searchParams['search'] = '%' . strtolower($value) . '%';
-
-                foreach ($fieldsToSearch as $field) {
-                    // MongoDB
-                    $filters['$or'][] = [$field => $searchRegex];
-
-                    // MySQL
-                    $searchConditions[] = "LOWER($field) LIKE :search";
-                }
-            }
-
-            if (str_starts_with($key, '_')) {
-                unset($filters[$key]);
-            } 
-        }
-
 		if($this->config->hasKey($this->appName, 'mongoStorage') === false
 			|| $this->config->getValueString($this->appName, 'mongoStorage') !== '1'
 		) {
-            // Unset mongodb filter
-            unset($filters['$or']);
+			$searchParams = $searchService->createMySQLSearchParams($filters, $fieldsToSearch);
+			$searchConditions = $searchService->createMySQLSearchConditions($filters, $fieldsToSearch);
+			$filters = $searchService->unsetSpecialQueryParams($filters, $fieldsToSearch);
 
 			return new JSONResponse(['results' => $this->listingMapper->findAll(filters: $filters, searchParams: $searchParams, searchConditions: $searchConditions)]);
 		}
-        
+
+		$filters = $searchService->createMongoDBSearchFilter($filters, $fieldsToSearch);
+		$filters = $searchService->unsetSpecialQueryParams($filters, $fieldsToSearch);
+
 		$dbConfig['base_uri'] = $this->config->getValueString(app: $this->appName, key: 'mongodbLocation');
 		$dbConfig['headers']['api-key'] = $this->config->getValueString(app: $this->appName, key: 'mongodbKey');
 		$dbConfig['mongodbCluster'] = $this->config->getValueString(app: $this->appName, key: 'mongodbCluster');
diff --git a/lib/Controller/MetaDataController.php b/lib/Controller/MetaDataController.php
index 0001149b..b2f9cdf8 100644
--- a/lib/Controller/MetaDataController.php
+++ b/lib/Controller/MetaDataController.php
@@ -4,6 +4,7 @@
 
 use OCA\OpenCatalogi\Db\MetaDataMapper;
 use OCA\OpenCatalogi\Service\ObjectService;
+use OCA\OpenCatalogi\Service\SearchService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
@@ -44,46 +45,24 @@ public function page(?string $getParameter)
      * @NoAdminRequired
      * @NoCSRFRequired
      */
-	public function index(ObjectService $objectService): JSONResponse
+	public function index(ObjectService $objectService, SearchService $searchService): JSONResponse
 	{
         $filters = $this->request->getParams();
-
-        $searchConditions = [];
-        $searchParams = [];
         $fieldsToSearch = ['title', 'description'];
 
-        foreach ($filters as $key => $value) {
-            if ($key === '_search') {
-                // MongoDB
-                $searchRegex = ['$regex' => $value, '$options' => 'i'];
-                $filters['$or'] = [];
-
-                // MySQL
-                $searchParams['search'] = '%' . strtolower($value) . '%';
-
-                foreach ($fieldsToSearch as $field) {
-                    // MongoDB
-                    $filters['$or'][] = [$field => $searchRegex];
-
-                    // MySQL
-                    $searchConditions[] = "LOWER($field) LIKE :search";
-                }
-            }
-
-            if (str_starts_with($key, '_')) {
-                unset($filters[$key]);
-            } 
-        }
-
 		if($this->config->hasKey($this->appName, 'mongoStorage') === false
 			|| $this->config->getValueString($this->appName, 'mongoStorage') !== '1'
 		) {
-            // Unset mongodb filter
-            unset($filters['$or']);
+			$searchParams = $searchService->createMySQLSearchParams($filters, $fieldsToSearch);
+			$searchConditions = $searchService->createMySQLSearchConditions($filters, $fieldsToSearch);
+			$filters = $searchService->unsetSpecialQueryParams($filters, $fieldsToSearch);
 
 			return new JSONResponse(['results' =>$this->metaDataMapper->findAll(filters: $filters, searchParams: $searchParams, searchConditions: $searchConditions)]);
 		}
 
+		$filters = $searchService->createMongoDBSearchFilter($filters, $fieldsToSearch);
+		$filters = $searchService->unsetSpecialQueryParams($filters, $fieldsToSearch);
+
 		$dbConfig['base_uri'] = $this->config->getValueString(app: $this->appName, key: 'mongodbLocation');
 		$dbConfig['headers']['api-key'] = $this->config->getValueString(app: $this->appName, key: 'mongodbKey');
 		$dbConfig['mongodbCluster'] = $this->config->getValueString(app: $this->appName, key: 'mongodbCluster');
diff --git a/lib/Controller/PublicationsController.php b/lib/Controller/PublicationsController.php
index 9095c371..05f9dd67 100644
--- a/lib/Controller/PublicationsController.php
+++ b/lib/Controller/PublicationsController.php
@@ -8,6 +8,7 @@
 use OCA\OpenCatalogi\Db\PublicationMapper;
 use OCA\OpenCatalogi\Service\ElasticSearchService;
 use OCA\OpenCatalogi\Service\ObjectService;
+use OCA\OpenCatalogi\Service\SearchService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
@@ -110,50 +111,28 @@ public function catalog(string|int $id): TemplateResponse
      * @NoAdminRequired
      * @NoCSRFRequired
      */
-    public function index(ObjectService $objectService): JSONResponse
+    public function index(ObjectService $objectService, SearchService $searchService): JSONResponse
     {
         $filters = $this->request->getParams();
-
-        $searchConditions = [];
-        $searchParams = [];
         $fieldsToSearch = ['title', 'description', 'summary'];
 
-        foreach ($filters as $key => $value) {
-            if ($key === '_search') {
-                // MongoDB
-                $searchRegex = ['$regex' => $value, '$options' => 'i'];
-                $filters['$or'] = [];
-
-                // MySQL
-                $searchParams['search'] = '%' . strtolower($value) . '%';
-
-                foreach ($fieldsToSearch as $field) {
-                    // MongoDB
-                    $filters['$or'][] = [$field => $searchRegex];
-
-                    // MySQL
-                    $searchConditions[] = "LOWER($field) LIKE :search";
-                }
-            }
-
-            if (str_starts_with($key, '_')) {
-                unset($filters[$key]);
-            } 
-        }
-
 		if($this->config->hasKey($this->appName, 'mongoStorage') === false
 			|| $this->config->getValueString($this->appName, 'mongoStorage') !== '1'
 		) {
-            // Unset mongodb filter
-            unset($filters['$or']);
+			$searchParams = $searchService->createMySQLSearchParams($filters, $fieldsToSearch);
+			$searchConditions = $searchService->createMySQLSearchConditions($filters, $fieldsToSearch);
+			$filters = $searchService->unsetSpecialQueryParams($filters, $fieldsToSearch);
 
 			return new JSONResponse(['results'  => $this->publicationMapper->findAll(filters: $filters, searchParams: $searchParams, searchConditions: $searchConditions)]);
 		}
 
+		$filters = $searchService->createMongoDBSearchFilter($filters, $fieldsToSearch);
+		$filters = $searchService->unsetSpecialQueryParams($filters, $fieldsToSearch);
+
 		$dbConfig['base_uri'] = $this->config->getValueString(app: $this->appName, key: 'mongodbLocation');
 		$dbConfig['headers']['api-key'] = $this->config->getValueString(app: $this->appName, key: 'mongodbKey');
 		$dbConfig['mongodbCluster'] = $this->config->getValueString(app: $this->appName, key: 'mongodbCluster');
-        
+
 		$filters['_schema'] = 'publication';
 
 		$result = $objectService->findObjects(filters: $filters, config: $dbConfig);
diff --git a/src/sidebars/dashboard/DashboardSideBar.vue b/src/sidebars/dashboard/DashboardSideBar.vue
index 481c7db9..95dbcf3c 100644
--- a/src/sidebars/dashboard/DashboardSideBar.vue
+++ b/src/sidebars/dashboard/DashboardSideBar.vue
@@ -9,7 +9,7 @@ import { navigationStore, searchStore, publicationStore } from '../../store/stor
 		<NcAppSidebarTab id="search-tab" name="Zoeken" :order="1">
 			<template #icon>
 				<Magnify :size="20" />
-			</template>test2
+			</template>
 			Zoek snel in het voor uw beschikbare federatieve netwerk<br>
 			<NcTextField class="searchField"
 				:value.sync="searchStore.search"
diff --git a/src/sidebars/search/SearchSideBar.vue b/src/sidebars/search/SearchSideBar.vue
index 95818589..7f1a5e8d 100644
--- a/src/sidebars/search/SearchSideBar.vue
+++ b/src/sidebars/search/SearchSideBar.vue
@@ -10,7 +10,7 @@ import { searchStore } from '../../store/store.js'
 		<NcAppSidebarTab id="search-tab" name="Zoeken" :order="1">
 			<template #icon>
 				<Magnify :size="20" />
-			</template>test1
+			</template>
 			Zoek snel in het voor uw beschikbare federatieve netwerk<br>
 			<NcTextField class="searchField"
 				:value.sync="searchStore.search"

From 7921238de266ea2a21647ff77571e28791958e28 Mon Sep 17 00:00:00 2001
From: Barry Brands <barrybrands02@hotmail.com>
Date: Tue, 6 Aug 2024 12:55:13 +0200
Subject: [PATCH 6/7] Small cleanup

---
 src/views/catalogi/CatalogiList.vue        | 11 +++++------
 src/views/directory/DirectoryList.vue      | 11 +++++------
 src/views/metaData/MetaDataList.vue        | 11 +++++------
 src/views/publications/PublicationList.vue | 15 +++++++--------
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/views/catalogi/CatalogiList.vue b/src/views/catalogi/CatalogiList.vue
index eb11bb68..980f1b80 100644
--- a/src/views/catalogi/CatalogiList.vue
+++ b/src/views/catalogi/CatalogiList.vue
@@ -108,6 +108,10 @@ export default {
 		Pencil,
 		Delete,
 	},
+    beforeRouteLeave(to, from, next) {
+        search = '';
+        next();
+    },
 	props: {
 		search: {
 			type: String,
@@ -118,7 +122,6 @@ export default {
 		return {
 			loading: false,
 			catalogi: [],
-            search: '',
 		}
 	},
 	watch: {
@@ -141,12 +144,8 @@ export default {
 		},
         debouncedFetchData: debounce(function(search) {
             this.fetchData(search);
-        }, 500), 
+        }, 500),
 	},
-    beforeRouteLeave(to, from, next) {
-        search = '';
-        next();
-    },
 }
 </script>
 <style>
diff --git a/src/views/directory/DirectoryList.vue b/src/views/directory/DirectoryList.vue
index adef11e8..f8ad3b03 100644
--- a/src/views/directory/DirectoryList.vue
+++ b/src/views/directory/DirectoryList.vue
@@ -99,6 +99,10 @@ export default {
 		Pencil,
 		Delete,
 	},
+    beforeRouteLeave(to, from, next) {
+        search = '';
+        next();
+    },
 	props: {
 		search: {
 			type: String,
@@ -108,7 +112,6 @@ export default {
 	data() {
 		return {
 			loading: false,
-            search: '',
 		}
 	},
 	watch: {
@@ -131,12 +134,8 @@ export default {
 		},
         debouncedFetchData: debounce(function(search) {
             this.fetchData(search);
-        }, 500), 
+        }, 500),
 	},
-    beforeRouteLeave(to, from, next) {
-        search = '';
-        next();
-    },
 }
 </script>
 <style>
diff --git a/src/views/metaData/MetaDataList.vue b/src/views/metaData/MetaDataList.vue
index 059f6906..eba25797 100644
--- a/src/views/metaData/MetaDataList.vue
+++ b/src/views/metaData/MetaDataList.vue
@@ -110,6 +110,10 @@ export default {
 		ContentCopy,
 		Delete,
 	},
+    beforeRouteLeave(to, from, next) {
+        search = '';
+        next();
+    },
 	props: {
 		search: {
 			type: String,
@@ -119,7 +123,6 @@ export default {
 	data() {
 		return {
 			loading: false,
-            search: '',
 		}
 	},
 	watch: {
@@ -142,12 +145,8 @@ export default {
 		},
         debouncedFetchData: debounce(function(search) {
             this.fetchData(search);
-        }, 500), 
+        }, 500),
 	},
-    beforeRouteLeave(to, from, next) {
-        search = '';
-        next();
-    },
 }
 </script>
 <style>
diff --git a/src/views/publications/PublicationList.vue b/src/views/publications/PublicationList.vue
index 8b11693e..60a356b7 100644
--- a/src/views/publications/PublicationList.vue
+++ b/src/views/publications/PublicationList.vue
@@ -150,6 +150,10 @@ export default {
 		Publish,
 		ArchivePlusOutline,
 	},
+    beforeRouteLeave(to, from, next) {
+        search = ''
+        next()
+    },
 	props: {
 		search: {
 			type: String,
@@ -159,7 +163,6 @@ export default {
 	data() {
 		return {
 			loading: false,
-            search: '',
 		}
 	},
 	computed: {
@@ -173,7 +176,7 @@ export default {
 	watch: {
 		search: {
 			handler(search) {
-                this.debouncedFetchData(search);
+                this.debouncedFetchData(search)
 			},
 		},
 	},
@@ -189,13 +192,9 @@ export default {
 				})
 		},
         debouncedFetchData: debounce(function(search) {
-            this.fetchData(search);
-        }, 500), 
+            this.fetchData(search)
+        }, 500),
 	},
-    beforeRouteLeave(to, from, next) {
-        search = '';
-        next();
-    },
 }
 </script>
 <style>

From 9ee2eb9c4f586a5e4ba511ea0f1032e4417231a4 Mon Sep 17 00:00:00 2001
From: Barry Brands <barrybrands02@hotmail.com>
Date: Tue, 6 Aug 2024 13:03:25 +0200
Subject: [PATCH 7/7] removed unnecessary stuff

---
 src/store/modules/search.js            | 1 -
 src/views/dashboard/DashboardIndex.vue | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/src/store/modules/search.js b/src/store/modules/search.js
index f0d0c116..3433f27a 100644
--- a/src/store/modules/search.js
+++ b/src/store/modules/search.js
@@ -25,7 +25,6 @@ export const useSearchStore = defineStore('search', {
 			)
 				.then((response) => {
 					response.json().then((data) => {
-                        console.log(data)
                         if (data?.code == 403 && data?.message) {
                             this.searchError = data.message
                             console.log(this.searchError)
diff --git a/src/views/dashboard/DashboardIndex.vue b/src/views/dashboard/DashboardIndex.vue
index 1503f104..0c537d18 100644
--- a/src/views/dashboard/DashboardIndex.vue
+++ b/src/views/dashboard/DashboardIndex.vue
@@ -59,11 +59,6 @@ export default {
 	mounted() {
 		searchStore.getSearchResults()
 	},
-	methods: {
-		goToLink(link) {
-			//
-		},
-	},
 }
 </script>