Merge branch 'release-53.13.0'

oat-sa · Dec 7, 2023 · 01ee6a8 · 01ee6a8
2 parents 0e6db47 + 94f1b0e
commit 01ee6a8
Show file tree

Hide file tree

Showing 9 changed files with 223 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -67,7 +67,7 @@
         "oat-sa/jig": "~0.2",
         "oat-sa/composer-npm-bridge": "~0.4.2||dev-master",
         "oat-sa/oatbox-extension-installer": "~1.1||dev-master",
-        "oat-sa/generis": ">=15.32.0",
+        "oat-sa/generis": ">=15.33",
         "composer/package-versions-deprecated": "^1.11",
         "paragonie/random_compat": "^2.0",
         "phpdocumentor/reflection-docblock": "^5.2",

diff --git a/manifest.php b/manifest.php
@@ -43,6 +43,7 @@
 use oat\tao\model\featureVisibility\FeatureVisibilityServiceProvider;
 use oat\tao\model\import\ServiceProvider\ImportServiceProvider;
 use oat\tao\model\LanguageServiceProvider;
+use oat\tao\model\listener\PropertyServiceProvider;
 use oat\tao\model\Lists\ServiceProvider\ListsServiceProvider;
 use oat\tao\model\menu\MenuServiceProvider;
 use oat\tao\model\metadata\ServiceProvider\MetadataServiceProvider;
@@ -413,6 +414,7 @@
         ClientConfigServiceProvider::class,
         HelperServiceProvider::class,
         MenuServiceProvider::class,
+        PropertyServiceProvider::class,
     ],
     'middlewares' => [
         MiddlewareConfig::class,

diff --git a/migrations/Version202312011610042234_tao.php b/migrations/Version202312011610042234_tao.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (c) 2023(original work) Open Assessment Technologies SA;
+ */
+
+declare(strict_types=1);
+
+namespace oat\tao\migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use oat\generis\model\data\event\CacheWarmupEvent;
+use oat\generis\model\data\event\ResourceDeleted;
+use oat\generis\model\data\event\ResourceUpdated;
+use oat\oatbox\event\EventManager;
+use oat\tao\model\listener\ClassPropertiesChangedListener;
+use oat\tao\model\listener\ClassPropertyCacheWarmupListener;
+use oat\tao\model\listener\ClassPropertyRemovedListener;
+use oat\tao\scripts\tools\migrations\AbstractMigration;
+
+final class Version202312011610042234_tao extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Register property cache warmup and modify listeners.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        /** @var EventManager $eventManager */
+        $eventManager = $this->getServiceManager()->get(EventManager::SERVICE_ID);
+        $eventManager->attach(
+            CacheWarmupEvent::class,
+            [ClassPropertyCacheWarmupListener::class, 'handleEvent']
+        );
+        $eventManager->attach(
+            ResourceDeleted::class,
+            [ClassPropertyRemovedListener::SERVICE_ID, 'handleDeletedEvent']
+        );
+        $eventManager->attach(
+            ResourceUpdated::class,
+            [ClassPropertiesChangedListener::SERVICE_ID, 'handleUpdatedEvent']
+        );
+        $this->getServiceManager()->register(EventManager::SERVICE_ID, $eventManager);
+    }
+
+    public function down(Schema $schema): void
+    {
+        /** @var EventManager $eventManager */
+        $eventManager = $this->getServiceManager()->get(EventManager::SERVICE_ID);
+        $eventManager->detach(
+            CacheWarmupEvent::class,
+            [ClassPropertyCacheWarmupListener::class, 'handleEvent']
+        );
+        $eventManager->detach(
+            ResourceDeleted::class,
+            [ClassPropertyRemovedListener::SERVICE_ID, 'handleDeletedEvent']
+        );
+        $eventManager->detach(
+            ResourceUpdated::class,
+            [ClassPropertiesChangedListener::SERVICE_ID, 'handleUpdatedEvent']
+        );
+        $this->getServiceManager()->register(EventManager::SERVICE_ID, $eventManager);
+    }
+}
diff --git a/models/classes/listener/ClassPropertiesChangedListener.php b/models/classes/listener/ClassPropertiesChangedListener.php
@@ -23,6 +23,7 @@
 namespace oat\tao\model\listener;
 
 use core_kernel_classes_Property;
+use oat\generis\model\data\event\ResourceUpdated;
 use oat\oatbox\service\ConfigurableService;
 use oat\tao\model\AdvancedSearch\AdvancedSearchChecker;
 use oat\tao\model\dto\OldProperty;
@@ -72,4 +73,12 @@ function (array $property) {
             $taskMessage
         );
     }
+
+    public function handleUpdatedEvent(ResourceUpdated $event): void
+    {
+        if ($event->getResource()->isProperty()) {
+            $classProperty = new \core_kernel_classes_Property($event->getResource());
+            $classProperty->clearCachedValues();
+        }
+    }
 }
diff --git a/models/classes/listener/ClassPropertyCacheWarmupListener.php b/models/classes/listener/ClassPropertyCacheWarmupListener.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (c) 2023 (original work) Open Assessment Technologies SA;
+ *
+ */
+
+declare(strict_types=1);
+
+namespace oat\tao\model\listener;
+
+use oat\generis\Helper\PropertyCache;
+use oat\generis\model\data\event\CacheWarmupEvent;
+use oat\generis\model\data\Ontology;
+use oat\oatbox\reporting\Report;
+
+class ClassPropertyCacheWarmupListener
+{
+    public function __construct(Ontology $model)
+    {
+        $this->model = $model;
+    }
+
+    public function handleEvent(CacheWarmupEvent $event): void
+    {
+        $class = new \core_kernel_classes_Class('http://www.w3.org/1999/02/22-rdf-syntax-ns#Property');
+        $properties = $class->getInstances(true);
+        $properties = array_unique(array_keys($properties));
+
+        PropertyCache::warmupCachedValuesByProperties($properties);
+
+        $event->addReport(Report::createInfo('Generated property cache.'));
+    }
+}
diff --git a/models/classes/listener/ClassPropertyRemovedListener.php b/models/classes/listener/ClassPropertyRemovedListener.php
@@ -52,4 +52,12 @@ public function handleEvent(ClassPropertyRemovedEvent $event): void
             $taskMessage
         );
     }
+
+    public function handleDeletedEvent(ResourceDeleted $event): void
+    {
+        if ($event->getResource()->isProperty()) {
+            $classProperty = new \core_kernel_classes_Property($event->getResource());
+            $classProperty->clearCachedValues();
+        }
+    }
 }
diff --git a/models/classes/listener/PropertyServiceProvider.php b/models/classes/listener/PropertyServiceProvider.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (c) 2023 (original work) Open Assessment Technologies SA;
+ */
+
+declare(strict_types=1);
+
+namespace oat\tao\model\listener;
+
+use common_ext_ExtensionsManager;
+use oat\generis\model\data\Ontology;
+use oat\generis\model\DependencyInjection\ContainerServiceProviderInterface;
+use oat\oatbox\cache\SimpleCache;
+use oat\tao\model\ClientLibConfigRegistry;
+use oat\tao\model\featureFlag\Listener\FeatureFlagCacheWarmupListener;
+use oat\tao\model\featureFlag\Repository\FeatureFlagRepository;
+use oat\tao\model\featureFlag\Repository\FeatureFlagRepositoryInterface;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+/**
+ * @codeCoverageIgnore
+ */
+class PropertyServiceProvider implements ContainerServiceProviderInterface
+{
+    public function __invoke(ContainerConfigurator $configurator): void
+    {
+        $services = $configurator->services();
+
+        $services
+            ->set(ClassPropertyCacheWarmupListener::class, ClassPropertyCacheWarmupListener::class)
+            ->public()
+            ->args(
+                [
+                    service(Ontology::SERVICE_ID)
+                ]
+            );
+    }
+}
diff --git a/scripts/install/RegisterEvents.php b/scripts/install/RegisterEvents.php
@@ -24,12 +24,17 @@
 namespace oat\tao\scripts\install;
 
 use oat\generis\model\data\event\CacheWarmupEvent;
+use oat\generis\model\data\event\ResourceDeleted;
+use oat\generis\model\data\event\ResourceUpdated;
+use oat\generis\model\OntologyAwareTrait;
 use oat\oatbox\event\EventManager;
 use oat\oatbox\extension\InstallAction;
-use oat\generis\model\OntologyAwareTrait;
 use oat\oatbox\reporting\Report;
 use oat\tao\model\featureFlag\Listener\FeatureFlagCacheWarmupListener;
 use oat\tao\model\Language\Listener\LanguageCacheWarmupListener;
+use oat\tao\model\listener\ClassPropertiesChangedListener;
+use oat\tao\model\listener\ClassPropertyCacheWarmupListener;
+use oat\tao\model\listener\ClassPropertyRemovedListener;
 use oat\tao\model\menu\Listener\MenuCacheWarmupListener;
 use oat\tao\model\migrations\MigrationsService;
 use oat\tao\model\routing\Listener\AnnotationCacheWarmupListener;
@@ -66,6 +71,19 @@ public function __invoke($params)
             CacheWarmupEvent::class,
             [MenuCacheWarmupListener::class, 'handleEvent']
         );
+        $eventManager->attach(
+            CacheWarmupEvent::class,
+            [ClassPropertyCacheWarmupListener::class, 'handleEvent']
+        );
+        $eventManager->attach(
+            ResourceDeleted::class,
+            [ClassPropertyRemovedListener::SERVICE_ID, 'handleDeletedEvent']
+        );
+        $eventManager->attach(
+            ResourceUpdated::class,
+            [ClassPropertiesChangedListener::SERVICE_ID, 'handleUpdatedEvent']
+        );
+
         $this->getServiceManager()->register(EventManager::SERVICE_ID, $eventManager);
 
         return Report::createSuccess('Events registered');

diff --git a/scripts/update/OntologyUpdater.php b/scripts/update/OntologyUpdater.php
@@ -25,6 +25,7 @@
 use AppendIterator;
 use common_ext_ExtensionsManager;
 use helpers_RdfDiff;
+use oat\generis\Helper\PropertyCache;
 use oat\generis\model\data\Model;
 use oat\generis\model\data\ModelManager;
 use oat\generis\model\GenerisRdf;
@@ -45,6 +46,7 @@ public static function syncModels()
         self::logDiff($diff);
 
         $diff->applyTo($currentModel);
+        PropertyCache::clearCachedValuesByTriples($diff->getTriplesToRemove());
     }
 
     public static function correctModelId($rdfFile)