Component/CmiXapi: contribute cron jobs

ILIAS-eLearning · Dec 16, 2024 · 3bad331 · 3bad331
1 parent e0a0dba
commit 3bad331
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 13 deletions.
diff --git a/components/ILIAS/CmiXapi/CmiXapi.php b/components/ILIAS/CmiXapi/CmiXapi.php
@@ -36,5 +36,17 @@ public function init(
             new \ilCmiXapiSetupAgent(
                 $pull[\ILIAS\Refinery\Factory::class]
             );
+        $contribute[\ILIAS\Cron\CronJob::class] = static fn() =>
+            new \ilXapiResultsCronjob(
+                'components\\' . self::class,
+                $use[\ILIAS\Language\Language::class],
+                true
+            );
+        $contribute[\ILIAS\Cron\CronJob::class] = static fn() =>
+            new \ilCmiXapiDelCron(
+                'components\\' . self::class,
+                $use[\ILIAS\Language\Language::class],
+                true
+            );
     }
 }
diff --git a/components/ILIAS/CmiXapi/classes/class.ilCmiXapiDelCron.php b/components/ILIAS/CmiXapi/classes/class.ilCmiXapiDelCron.php
@@ -39,19 +39,29 @@ class ilCmiXapiDelCron extends ilCronJob
 
     private \ILIAS\DI\Container $dic;
 
-    public function __construct()
+    public function __construct(
+        string $component,
+        \ILIAS\Language\Language $lng,
+        bool $registration = false
+    ) {
+        parent::__construct($component, $lng);
+        $this->lng->loadLanguageModule('cmix');
+        if (!$registration) {
+            $this->additionalConstruct();
+        }
+    }
+
+    private function additionalConstruct()
     {
         global $DIC; /* @var \ILIAS\DI\Container $DIC */
         $this->dic = $DIC;
 
-        $DIC->language()->loadLanguageModule('cmix');
-
         $this->log = ilLoggerFactory::getLogger('cmix');
 
         $settings = new ilSetting(self::JOB_ID);
         $lrsTypeId = $settings->get('lrs_type_id', '0');
 
-        if($lrsTypeId) {
+        if ($lrsTypeId) {
             $this->lrsType = new ilCmiXapiLrsType((int) $lrsTypeId);
         } else {
             $this->lrsType = null;
@@ -224,7 +234,7 @@ public function run(): ilCronJobResult
         $deletedObjectData = array();
         $allDone = true;
         foreach ($newDeletedObjects as $deletedObject) {
-            $this->log->debug("delete for " . (string)$deletedObject['obj_id']);
+            $this->log->debug("delete for " . (string) $deletedObject['obj_id']);
             // set object to updated
             $this->model->setXapiObjAsUpdated($deletedObject['obj_id']);
             // delete data
@@ -239,7 +249,7 @@ public function run(): ilCronJobResult
             // entry in xxcf_users is already deleted from ilXapiCmi5StatementsDeleteRequest
             // delete in obj_id from xxcf_data_settings
             if ($done) {
-                $this->log->debug("deleted data for object: " . (string)$deletedObject['obj_id']);
+                $this->log->debug("deleted data for object: " . (string) $deletedObject['obj_id']);
                 $deletedObjectData[] = $deletedObject['obj_id'];
                 $this->model->deleteXapiObjectEntry($deletedObject['obj_id']);
             } else {

diff --git a/components/ILIAS/CmiXapi/classes/class.ilXapiResultsCronjob.php b/components/ILIAS/CmiXapi/classes/class.ilXapiResultsCronjob.php
@@ -40,13 +40,23 @@ class ilXapiResultsCronjob extends ilCronJob
 
     private \ILIAS\DI\Container $dic;
 
-    public function __construct()
+    public function __construct(
+        string $component,
+        \ILIAS\Language\Language $lng,
+        bool $registration = false
+    ) {
+        parent::__construct($component, $lng);
+        $this->lng->loadLanguageModule('cmix');
+        if (!$registration) {
+            $this->additionalConstruct();
+        }
+    }
+
+    private function additionalConstruct()
     {
         global $DIC; /* @var \ILIAS\DI\Container $DIC */
         $this->dic = $DIC;
 
-        $DIC->language()->loadLanguageModule('cmix');
-
         $this->log = ilLoggerFactory::getLogger('cmix');
 
         $this->initThisRunTS();

diff --git a/components/ILIAS/CmiXapi/module.xml b/components/ILIAS/CmiXapi/module.xml
@@ -31,10 +31,6 @@
 		<event type="listen" id="components/ILIAS/Course" />
 		<event type="listen" id="components/ILIAS/Group" />
 	</events>
-	<crons>
-		<cron id="xapi_results_evaluation" class="ilXapiResultsCronjob" />
-		<cron id="xapi_deletion_cron" class="ilCmiXapiDelCron" />
-	</crons>
 	<copage />
 	<web_access_checker />
 	<logging />