Fix document counts in index stats (#155)

Author: markus-moser

config/services/search-index-adapter/open-search.yaml

@@ -32,6 +32,8 @@ services:
 
     Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\IndexStatsServiceInterface:
         class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\IndexStatsService
+        arguments:
+            $openSearchClient: '@generic-data-index.opensearch-client'
 
     Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\IndexMappingServiceInterface:
         class: Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch\IndexMappingService

qodana.yaml

@@ -42,6 +42,11 @@ exclude:
   - name: PhpMethodNamingConventionInspection
     paths:
         - src/Migrations
+  - name: PhpDqlBuilderUnknownModelInspection
+    paths:
+      - src/Repository/IndexQueueRepository.php
+      - src/Service/SearchIndex/IndexService/ElementTypeAdapter/AssetTypeAdapter.php
+      - src/Service/SearchIndex/IndexService/ElementTypeAdapter/DataObjectTypeAdapter.php
 include:
   - name: PhpTaintFunctionInspection
   - name: PhpVulnerablePathsInspection

src/SearchIndexAdapter/OpenSearch/IndexStatsService.php

@@ -17,6 +17,7 @@
 namespace Pimcore\Bundle\GenericDataIndexBundle\SearchIndexAdapter\OpenSearch;
 
 use Exception;
+use OpenSearch\Client;
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Stats\IndexStats;
 use Pimcore\Bundle\GenericDataIndexBundle\Model\Stats\IndexStatsIndex;
 use Pimcore\Bundle\GenericDataIndexBundle\Repository\IndexQueueRepository;
@@ -30,9 +31,10 @@ final class IndexStatsService implements IndexStatsServiceInterface
     use LoggerAwareTrait;
 
     public function __construct(
-        protected readonly SearchIndexConfigServiceInterface $searchIndexConfigService,
-        protected readonly IndexQueueRepository $indexQueueRepository,
-        protected readonly SearchIndexServiceInterface $openSearchService,
+        private readonly SearchIndexConfigServiceInterface $searchIndexConfigService,
+        private readonly IndexQueueRepository $indexQueueRepository,
+        private readonly SearchIndexServiceInterface $openSearchService,
+        private readonly Client $openSearchClient,
     ) {
     }
 
@@ -43,12 +45,31 @@ public function getStats(): IndexStats
             $this->searchIndexConfigService->getIndexPrefix() . '*'
         );
 
+        $aggregationResult = $this->openSearchClient->search([
+            'index' => $this->searchIndexConfigService->getIndexPrefix() . '*',
+            'body' => [
+                'size' => 0,
+                'aggs' => [
+                    'indices' => [
+                        'terms' => [
+                            'field' => '_index',
+                            'size' => 10000,
+                            'order' => [
+                                '_key' => 'asc',
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+
         $indices = [];
-        foreach ($allStats['indices'] as $indexName => $index) {
+        foreach ($aggregationResult['aggregations']['indices']['buckets'] as $bucket) {
+            $sizeInBytes = (int)($allStats['indices'][$bucket['key']]['total']['store']['size_in_bytes'] ?? 0);
             $indices[] = new IndexStatsIndex(
-                indexName: $indexName,
-                itemsCount: $index['total']['docs']['count'],
-                sizeInKb: round(((int)$index['total']['store']['size_in_bytes'] / 1024), 2)
+                indexName: $bucket['key'],
+                itemsCount: $bucket['doc_count'],
+                sizeInKb: round(($sizeInBytes / 1024), 2)
             );
         }