Bugfix/inf 248 not send ags with outcome processing set to none (#2435)

* bugfix: move event to proper delivery finish * bugfix: code review fixes * fix: code check (cherry picked from commit d87be4b)
oat-sa · Jan 8, 2024 · f7875c9 · f7875c9
1 parent b327c85
commit f7875c9
Show file tree

Hide file tree

Showing 5 changed files with 317 additions and 412 deletions.
diff --git a/helpers/class.TestSession.php b/helpers/class.TestSession.php
@@ -773,12 +773,11 @@ private function triggerResultTestVariablesTransmissionEvent(
             $this->getSessionId(),
             $variables,
             $this->getSessionId(),
-            $testUri,
-            $this->isManualScored()
+            $testUri
         ));
     }
 
-    private function isManualScored(): bool
+    public function isManualScored(): bool
     {
         /** @var AssessmentItemRef $itemRef */
         foreach ($this->getRoute()->getAssessmentItemRefs() as $itemRef) {

diff --git a/...s/classes/event/TestVariablesRecorded.php → ...classes/event/DeliveryExecutionFinish.php b/...s/classes/event/TestVariablesRecorded.php → ...classes/event/DeliveryExecutionFinish.php
@@ -23,19 +23,20 @@
 namespace oat\taoQtiTest\models\event;
 
 use oat\oatbox\event\Event;
+use oat\taoDelivery\model\execution\DeliveryExecution;
 
-class TestVariablesRecorded implements Event
+class DeliveryExecutionFinish implements Event
 {
-    private string $deliveryExecutionId;
+    private DeliveryExecution $deliveryExecution;
     private array $variables;
     private bool $isManualScored;
 
     public function __construct(
-        string $deliveryExecutionId,
+        DeliveryExecution $deliveryExecution,
         array $variables,
         bool $isManualScored
     ) {
-        $this->deliveryExecutionId = $deliveryExecutionId;
+        $this->deliveryExecution = $deliveryExecution;
         $this->variables = $variables;
         $this->isManualScored = $isManualScored;
     }
@@ -45,9 +46,9 @@ public function getName(): string
         return self::class;
     }
 
-    public function getDeliveryExecutionId(): string
+    public function getDeliveryExecution(): DeliveryExecution
     {
-        return $this->deliveryExecutionId;
+        return $this->deliveryExecution;
     }
 
     public function getVariables(): array

diff --git a/models/classes/event/ResultTestVariablesTransmissionEvent.php b/models/classes/event/ResultTestVariablesTransmissionEvent.php
@@ -34,21 +34,17 @@ class ResultTestVariablesTransmissionEvent implements Event
     private $transmissionId;
     /** @var string */
     private $testUri;
-    /** @var bool  */
-    private bool $isManualScored;
 
     public function __construct(
         string $deliveryExecutionId,
         array $variables,
         string $transmissionId,
-        string $testUri = '',
-        bool $isManualScored = null,
+        string $testUri = ''
     ) {
         $this->deliveryExecutionId = $deliveryExecutionId;
         $this->variables = $variables;
         $this->transmissionId = $transmissionId;
         $this->testUri = $testUri;
-        $this->isManualScored = $isManualScored;
     }
 
     public function getName(): string
@@ -75,9 +71,4 @@ public function getTestUri(): string
     {
         return $this->testUri;
     }
-
-    public function isManualScored(): bool
-    {
-        return $this->isManualScored;
-    }
 }
diff --git a/...ls/classes/eventHandler/ResultTransmissionEventHandler/ResultTransmissionEventHandler.php b/...ls/classes/eventHandler/ResultTransmissionEventHandler/ResultTransmissionEventHandler.php
@@ -22,19 +22,13 @@
 
 namespace oat\taoQtiTest\models\classes\eventHandler\ResultTransmissionEventHandler;
 
-use common_exception_Error;
-use oat\oatbox\event\EventManager;
-use oat\oatbox\service\ServiceManager;
 use oat\oatbox\service\ServiceNotFoundException;
 use oat\tao\model\service\InjectionAwareService;
 use oat\taoDelivery\model\execution\DeliveryServerService;
 use oat\taoQtiTest\models\classes\event\ResultTestVariablesTransmissionEvent;
 use oat\taoQtiTest\models\event\ResultItemVariablesTransmissionEvent;
-use oat\taoQtiTest\models\event\TestVariablesRecorded;
 use taoQtiCommon_helpers_ResultTransmitter;
 use oat\oatbox\service\exception\InvalidServiceManagerException;
-use oat\taoResultServer\models\classes\implementation\ResultServerService;
-use taoResultServer_models_classes_ReadableResultStorage as ReadableResultStorage;
 
 class ResultTransmissionEventHandler extends InjectionAwareService implements Api\ResultTransmissionEventHandlerInterface
 {
@@ -55,6 +49,7 @@ public function transmitResultItemVariable(ResultItemVariablesTransmissionEvent
     /**
      * @param ResultTestVariablesTransmissionEvent $event
      * @throws InvalidServiceManagerException
+     * @throws ServiceNotFoundException
      * @throws \taoQtiCommon_helpers_ResultTransmissionException
      */
     public function transmitResultTestVariable(ResultTestVariablesTransmissionEvent $event): void
@@ -64,14 +59,14 @@ public function transmitResultTestVariable(ResultTestVariablesTransmissionEvent
             $event->getTransmissionId(),
             $event->getTestUri()
         );
-
-        if (!$this->containsScoreTotal($event)) {
-            return;
-        }
-
-        $this->triggerTestVariablesRecorded($event);
     }
 
+    /**
+     * @param $deliveryExecutionIdigcicd
+     * @return taoQtiCommon_helpers_ResultTransmitter
+     * @throws InvalidServiceManagerException
+     * @throws \oat\oatbox\service\ServiceNotFoundException
+     */
     private function buildTransmitter($deliveryExecutionId): taoQtiCommon_helpers_ResultTransmitter
     {
         /** @var DeliveryServerService $deliveryServerService */
@@ -80,58 +75,4 @@ private function buildTransmitter($deliveryExecutionId): taoQtiCommon_helpers_Re
 
         return new taoQtiCommon_helpers_ResultTransmitter($resultStore);
     }
-
-    public function getEventManager()
-    {
-        return $this->getServiceLocator()->get(EventManager::SERVICE_ID);
-    }
-
-    public function getServiceLocator()
-    {
-        return ServiceManager::getServiceManager();
-    }
-
-    /**
-     * @return ReadableResultStorage
-     * @throws ServiceNotFoundException
-     * @throws common_exception_Error
-     */
-    private function getResultsStorage(): ReadableResultStorage
-    {
-        $resultServerService = $this->getServiceLocator()->get(ResultServerService::SERVICE_ID);
-        $storage = $resultServerService->getResultStorage();
-
-        if (!$storage instanceof ReadableResultStorage) {
-            throw new common_exception_Error('Configured result storage is not writable.');
-        }
-
-        return $storage;
-    }
-
-    private function containsScoreTotal(ResultTestVariablesTransmissionEvent $event): bool
-    {
-        $scoreTotal = array_filter(
-            $event->getVariables(),
-            function ($item) {
-                return $item->getIdentifier() === 'SCORE_TOTAL';
-            }
-        );
-
-        return !empty($scoreTotal);
-    }
-
-    /**
-     * @param ResultTestVariablesTransmissionEvent $event
-     * @return void
-     * @throws InvalidServiceManagerException
-     */
-    private function triggerTestVariablesRecorded(ResultTestVariablesTransmissionEvent $event): void
-    {
-        $outcomeVariables = $this->getResultsStorage()->getDeliveryVariables($event->getDeliveryExecutionId());
-        $this->getEventManager()->trigger(new TestVariablesRecorded(
-            $event->getDeliveryExecutionId(),
-            $outcomeVariables,
-            $event->isManualScored()
-        ));
-    }
 }