feat(custom-pages): corrected indexing (#3015)

Author: thorsten

phpmyfaq/src/phpMyFAQ/Instance/Search/Elasticsearch.php

@@ -224,6 +224,7 @@ public function index(array $faq): ?object
                 'answer' => strip_tags($faq['answer']),
                 'keywords' => $faq['keywords'],
                 'category_id' => $faq['category_id'],
+                'content_type' => 'faq',
             ],
         ];
 
@@ -265,6 +266,7 @@ public function bulkIndex(array $faqs): array
                 'answer' => strip_tags((string) $faq['content']),
                 'keywords' => $faq['keywords'],
                 'category_id' => $faq['category_id'],
+                'content_type' => 'faq',
             ];
 
             if (($i % 1000) === 0) {
@@ -314,6 +316,7 @@ public function update(array $faq): array
                     'answer' => strip_tags($faq['answer']),
                     'keywords' => $faq['keywords'],
                     'category_id' => $faq['category_id'],
+                    'content_type' => 'faq',
                 ],
             ],
         ];
@@ -364,6 +367,13 @@ public function isAvailable(): bool
      */
     public function indexCustomPage(array $page): ?object
     {
+        // Only index active pages
+        if (isset($page['active']) && $page['active'] === 'n') {
+            // Delete from index if it exists (in case it was previously active)
+            $this->deleteCustomPage((int) $page['id'], $page['lang']);
+            return null;
+        }
+
         $params = [
             'index' => $this->elasticsearchConfiguration->getIndex(),
             'id' => 'page_' . $page['id'] . '_' . $page['lang'],
@@ -395,6 +405,11 @@ public function indexCustomPage(array $page): ?object
      */
     public function updateCustomPage(array $page): array
     {
+        // Only index active pages - delete from index if inactive
+        if (isset($page['active']) && $page['active'] === 'n') {
+            return $this->deleteCustomPage((int) $page['id'], $page['lang']);
+        }
+
         $params = [
             'index' => $this->elasticsearchConfiguration->getIndex(),
             'id' => 'page_' . $page['id'] . '_' . $page['lang'],
@@ -415,6 +430,12 @@ public function updateCustomPage(array $page): array
         try {
             return $this->client->update($params)->asArray();
         } catch (ClientResponseException|MissingParameterException|ServerResponseException $e) {
+            // If document doesn't exist, try to create it
+            if (str_contains($e->getMessage(), 'document_missing_exception')) {
+                $result = $this->indexCustomPage($page);
+                return $result ? ['success' => true] : ['error' => 'Failed to create document'];
+            }
+            $this->configuration->getLogger()->error('Update custom page error.', [$e->getMessage()]);
             return ['error' => $e->getMessage()];
         }
     }

phpmyfaq/src/phpMyFAQ/Instance/Search/OpenSearch.php

@@ -202,6 +202,7 @@ public function index(array $faq): array
                 'answer' => strip_tags($faq['answer']),
                 'keywords' => $faq['keywords'],
                 'category_id' => $faq['category_id'],
+                'content_type' => 'faq',
             ],
         ];
 
@@ -238,6 +239,7 @@ public function bulkIndex(array $faqs): array
                 'answer' => strip_tags((string) $faq['content']),
                 'keywords' => $faq['keywords'],
                 'category_id' => $faq['category_id'],
+                'content_type' => 'faq',
             ];
 
             if (($i % 1000) === 0) {
@@ -279,6 +281,7 @@ public function update(array $faq): array
                     'answer' => strip_tags($faq['answer']),
                     'keywords' => $faq['keywords'],
                     'category_id' => $faq['category_id'],
+                    'content_type' => 'faq',
                 ],
             ],
         ];
@@ -321,6 +324,12 @@ public function isAvailable(): bool
      */
     public function indexCustomPage(array $page): array
     {
+        // Only index active pages
+        if (isset($page['active']) && $page['active'] === 'n') {
+            // Delete from index if it exists (in case it was previously active)
+            return $this->deleteCustomPage((int) $page['id'], $page['lang']);
+        }
+
         $params = [
             'index' => $this->openSearchConfiguration->getIndex(),
             'id' => 'page_' . $page['id'] . '_' . $page['lang'],
@@ -352,6 +361,11 @@ public function indexCustomPage(array $page): array
      */
     public function updateCustomPage(array $page): array
     {
+        // Only index active pages - delete from index if inactive
+        if (isset($page['active']) && $page['active'] === 'n') {
+            return $this->deleteCustomPage((int) $page['id'], $page['lang']);
+        }
+
         $params = [
             'index' => $this->openSearchConfiguration->getIndex(),
             'id' => 'page_' . $page['id'] . '_' . $page['lang'],
@@ -372,6 +386,11 @@ public function updateCustomPage(array $page): array
         try {
             return $this->client->update($params);
         } catch (Exception $e) {
+            // If document doesn't exist, try to create it
+            if (str_contains($e->getMessage(), 'document_missing_exception')) {
+                return $this->indexCustomPage($page);
+            }
+            $this->configuration->getLogger()->error('Update custom page error.', [$e->getMessage()]);
             return ['error' => $e->getMessage()];
         }
     }

phpmyfaq/src/phpMyFAQ/Search/Search/Elasticsearch.php

@@ -88,8 +88,8 @@ public function search(string $searchTerm): array
                             // FAQs: must match category filter
                             [
                                 'bool' => [
-                                    'must_not' => [
-                                        'term' => ['content_type' => 'page'],
+                                    'must' => [
+                                        'term' => ['content_type' => 'faq'],
                                     ],
                                     'filter' => [
                                         'terms' => ['category_id' => $this->getCategoryIds()],

phpmyfaq/src/phpMyFAQ/Search/Search/OpenSearch.php

@@ -86,8 +86,8 @@ public function search(string $searchTerm): array
                             // FAQs: must match category filter
                             [
                                 'bool' => [
-                                    'must_not' => [
-                                        'term' => ['content_type' => 'page'],
+                                    'must' => [
+                                        'term' => ['content_type' => 'faq'],
                                     ],
                                     'filter' => [
                                         'terms' => ['category_id' => $this->getCategoryIds()],