Merge branch 'release-54.22.3'

oat-sa · Sep 30, 2024 · 478e5ff · 478e5ff
2 parents ea25963 + 2e7608d
commit 478e5ff
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/models/classes/resources/ResourceWatcher.php b/models/classes/resources/ResourceWatcher.php
@@ -144,17 +144,22 @@ private function createResourceIndexingTask(core_kernel_classes_Resource $resour
                 return;
             }
 
-            if ($this->hasResourceSupport($resource)) {
+            $rootIndexClass = $this->getResourceIndexType($resource);
+            if ($rootIndexClass) {
+                $isTest = TaoOntology::CLASS_URI_TEST === $rootIndexClass;
                 $queueDispatcher->createTask(
-                    $this->isTestResource($resource) ? new UpdateTestResourceInIndex() : new UpdateResourceInIndex(),
+                    $isTest ? new UpdateTestResourceInIndex() : new UpdateResourceInIndex(),
                     [$resource->getUri()],
                     $message
                 );
             }
         }
     }
 
-    private function hasResourceSupport(core_kernel_classes_Resource $resource): bool
+    /**
+     * This method actually finds a root class that is supported by used tao/IndexUpdater
+     */
+    private function getResourceIndexType(core_kernel_classes_Resource $resource): ?string
     {
         $resourceTypeIds = $this->getResourceTypes($resource);
         $checkedResourceTypes = [OntologyRdfs::RDFS_RESOURCE, TaoOntology::CLASS_URI_OBJECT];
@@ -169,7 +174,7 @@ private function hasResourceSupport(core_kernel_classes_Resource $resource): boo
                 );
 
             if ($hasClassSupport) {
-                return true;
+                return $classUri;
             }
 
             $class = $this->getClass($classUri);
@@ -182,7 +187,7 @@ private function hasResourceSupport(core_kernel_classes_Resource $resource): boo
             $checkedResourceTypes[] = $class->getUri();
         }
 
-        return false;
+        return null;
     }
 
     private function getResourceTypes(core_kernel_classes_Resource $resource): array
@@ -195,11 +200,6 @@ function (core_kernel_classes_Class $resourceType): string {
         );
     }
 
-    private function isTestResource(core_kernel_classes_Resource $resource): bool
-    {
-        return in_array(TaoOntology::CLASS_URI_TEST, $this->getResourceTypes($resource));
-    }
-
     private function hasClassSupport(core_kernel_classes_Resource $resource): bool
     {
         return $resource instanceof core_kernel_classes_Class;