identifier fixes

Locastic · Aug 3, 2023 · cd51a44 · cd51a44
1 parent 0b1f169
commit cd51a44
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 41 deletions.
diff --git a/src/Bridge/Elasticsearch/ElasticsearchService.php b/src/Bridge/Elasticsearch/ElasticsearchService.php
@@ -15,10 +15,9 @@ public function __construct(private readonly ElasticsearchClient $elasticsearchC
     {
     }
 
-    public function createItem($item, string $index, array $groups = [])
+    public function createItem($item, string $index, array $groups = []): void
     {
         $body = $this->normalizer->normalize($item, 'array', $this->getNormalizationContext(['groups' => $groups]));
-        $body['id'] = $item->getId();
 
         $request = [
             'index' => $index,
@@ -38,7 +37,6 @@ public function bulkCreate(array $items, string $index, array $groups = []): voi
             }
 
             $normalizedItem = $this->normalizer->normalize($item, 'array', $this->getNormalizationContext(['groups' => $groups]));
-            $normalizedItem['id'] = $item->getId();
 
             $params[] = [
                 'index' => [
@@ -57,7 +55,7 @@ public function bulkCreate(array $items, string $index, array $groups = []): voi
         $this->elasticsearchClient->getClient()->bulk($request);
     }
 
-    public function getItemById($id, string $index, string $denormalizeToClass)
+    public function getItemById($id, string $index, string $denormalizeToClass): mixed
     {
         $documents = $this->elasticsearchClient->getClient()->search([
             'index' => $index,
@@ -74,7 +72,7 @@ public function getItemById($id, string $index, string $denormalizeToClass)
         return $this->denormalizer->denormalize($data, $denormalizeToClass);
     }
 
-    public function getItemByQuery(string $index, string $denormalizeToClass, array $body = [])
+    public function getItemByQuery(string $index, string $denormalizeToClass, array $body = []): mixed
     {
         $documents = $this->elasticsearchClient->getClient()->search([
             'index' => $index,
@@ -106,34 +104,6 @@ public function updateItem($id, $item, string $index, array $groups = []): void
         $this->elasticsearchClient->getClient()->update($request);
     }
 
-    public function bulkUpdate(array $items, string $index, array $groups = []): void
-    {
-        $params = [];
-        foreach ($items as $i => $item) {
-            if (0 === $i % 2) {
-                echo '.';
-            }
-
-            $normalizedItem = $this->normalizer->normalize($item, 'array', $this->getNormalizationContext(['groups' => $groups]));
-            $normalizedItem['id'] = $item->getId();
-
-            $params[] = [
-                'update' => [
-                    '_index' => $index,
-                    '_id' => $item->getId(),
-                ],
-            ];
-            $params[] = ['doc' => $normalizedItem];
-        }
-
-        $request = [
-            'index' => $index,
-            'body' => $params,
-        ];
-
-        $this->elasticsearchClient->getClient()->bulk($request);
-    }
-
     public function getCollection(string $index, ?string $denormalizeToClass = null, array $body = [], $limit = 20, $offset = 0): array
     {
         $documents = $this->elasticsearchClient->getClient()->search([

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -73,7 +73,6 @@ public function getConfigTreeBuilder(): TreeBuilder
     private function getActivityLogProperties(): array
     {
         return [
-            'id' => ['type' => 'keyword'],
             'action' => ['type' => 'text'],
             'loggedAt' => ['type' => 'date'],
             'objectId' => ['type' => 'text'],

diff --git a/src/Model/ActivityLog.php b/src/Model/ActivityLog.php
@@ -114,6 +114,10 @@ public function setDataChangesFromArray(?array $dataChanges = null): void
 
     public function getDataChangesArray(): ?array
     {
+        if(null === $this->dataChanges) {
+            return null;
+        }
+
         return json_decode($this->dataChanges, true, 512, JSON_THROW_ON_ERROR);
     }
 

diff --git a/src/Model/CurrentDataTracker.php b/src/Model/CurrentDataTracker.php
@@ -10,6 +10,7 @@
  */
 class CurrentDataTracker implements CurrentDataTrackerInterface
 {
+    #[Groups(["current_data_tracker"])]
     protected $id;
 
     #[Groups(["current_data_tracker"])]

diff --git a/src/Util/RecursiveClassIterator.php b/src/Util/RecursiveClassIterator.php
@@ -2,21 +2,42 @@
 
 namespace Locastic\Loggastic\Util;
 
-use Symfony\Component\Finder\Finder;
-
 class RecursiveClassIterator
 {
     public static function getReflectionClasses(array $paths): \Generator
     {
-        $finder = Finder::create();
-        $finder->files()->name('*.php');
+        foreach ($paths as $path) {
+            $iterator = new \RegexIterator(
+                new \RecursiveIteratorIterator(
+                    new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS),
+                    \RecursiveIteratorIterator::LEAVES_ONLY
+                ),
+                '/^.+\.php$/i',
+                \RecursiveRegexIterator::GET_MATCH
+            );
+
+            foreach ($iterator as $file) {
+                $sourceFile = $file[0];
+
+                if (!preg_match('(^phar:)i', $sourceFile)) {
+                    $sourceFile = realpath($sourceFile);
+                }
 
-        $files = iterator_to_array($finder->in($paths)->getIterator());
+                try {
+                    require_once $sourceFile;
+                } catch (\Throwable $t) {
+                    continue;
+                }
+
+                $includedFiles[$sourceFile] = true;
+            }
+        }
 
-        foreach (get_declared_classes() as $className) {
+        $declared = array_merge(get_declared_classes(), get_declared_interfaces());
+        foreach ($declared as $className) {
             $reflectionClass = new \ReflectionClass($className);
             $sourceFile = $reflectionClass->getFileName();
-            if (isset($files[$sourceFile])) {
+            if (isset($includedFiles[$sourceFile])) {
                 yield $className => $reflectionClass;
             }
         }