XAPI: Throw exception before send statement already sent - refs BT#16742

chamilo · Nov 27, 2020 · 5ac6ee2 · 5ac6ee2
1 parent c6de6cf
commit 5ac6ee2
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 25 deletions.
diff --git a/plugin/xapi/src/Hook/XApiActivityHookObserver.php b/plugin/xapi/src/Hook/XApiActivityHookObserver.php
@@ -3,6 +3,7 @@
 
 use Chamilo\PluginBundle\Entity\XApi\SharedStatement;
 use Xabbuh\XApi\Common\Exception\ConflictException;
+use Xabbuh\XApi\Common\Exception\StatementIdAlreadyExistsException;
 use Xabbuh\XApi\Common\Exception\XApiException;
 use Xabbuh\XApi\Model\Context;
 use Xabbuh\XApi\Model\Statement;
@@ -80,12 +81,20 @@ protected function saveSharedStatement(StatementId $uuid, $dataType, $dataId)
     }
 
     /**
+     * @throws \Xabbuh\XApi\Common\Exception\StatementIdAlreadyExistsException
+     *
      * @return \Xabbuh\XApi\Model\Statement
      */
     protected function createStatement()
     {
+        $id = $this->getId();
+
+        if ($this->statementAlreadyShared($id->getValue())) {
+            throw new StatementIdAlreadyExistsException($id->getValue());
+        }
+
         return new Statement(
-            $this->getId(),
+            $id,
             $this->getActor(),
             $this->getVerb(),
             $this->getActivity(),
@@ -102,6 +111,24 @@ protected function createStatement()
      */
     abstract protected function getId();
 
+    /**
+     * @param string $uuid
+     *
+     * @return bool
+     */
+    protected function statementAlreadyShared($uuid)
+    {
+        $sharedStmt = Database::getManager()
+            ->getRepository(SharedStatement::class)
+            ->findOneByUuid($uuid);
+
+        if ($sharedStmt) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * @return \Xabbuh\XApi\Model\Agent
      */

diff --git a/plugin/xapi/src/Hook/XApiLearningPathEndHook.php b/plugin/xapi/src/Hook/XApiLearningPathEndHook.php
@@ -49,17 +49,13 @@ public function notifyLearningPathEnd(HookLearningPathEndEventInterface $event)
         $this->course = api_get_course_entity($this->lpView->getCId());
         $this->session = api_get_session_entity($this->lpView->getSessionId());
 
-        $statement = $this->createStatement();
-
-        if ($this->isStatementAlreadySent($statement)) {
-            return;
-        }
-
         try {
-            $statement = $this->sendStatementToLrs($statement);
+            $statement = $this->createStatement();
+
+            $sharedStmt = $this->sendStatementToLrs($statement);
 
             $this->saveSharedStatement(
-                $statement->getId(),
+                $sharedStmt->getId(),
                 XApiPlugin::DATA_TYPE_LP_VIEW,
                 $this->lpView->getId()
             );

diff --git a/plugin/xapi/src/Hook/XApiLearningPathItemViewedHook.php b/plugin/xapi/src/Hook/XApiLearningPathItemViewedHook.php
@@ -58,13 +58,13 @@ public function hookLearningPathItemViewed(HookLearningPathItemViewedEventInterf
         $this->course = api_get_course_entity($this->lpView->getCId());
         $this->session = api_get_session_entity($this->lpView->getSessionId());
 
-        $statement = $this->createStatement();
-
         try {
-            $statement = $this->sendStatementToLrs($statement);
+            $statement = $this->createStatement();
+
+            $sharedStmt = $this->sendStatementToLrs($statement);
 
             $this->saveSharedStatement(
-                $statement->getId(),
+                $sharedStmt->getId(),
                 XApiPlugin::DATA_TYPE_LP_ITEM_VIEW,
                 $this->lpItemView->getId()
             );

diff --git a/plugin/xapi/src/Hook/XApiQuizEndHook.php b/plugin/xapi/src/Hook/XApiQuizEndHook.php
@@ -46,13 +46,13 @@ public function hookQuizEnd(HookQuizEndEventInterface $hookEvent)
         $this->course = api_get_course_entity($this->exe->getCId());
         $this->session = api_get_session_entity($this->exe->getSessionId());
 
-        $statement = $this->createStatement();
-
         try {
-            $statement = $this->sendStatementToLrs($statement);
+            $statement = $this->createStatement();
+
+            $sharedStmt = $this->sendStatementToLrs($statement);
 
             $this->saveSharedStatement(
-                $statement->getId(),
+                $sharedStmt->getId(),
                 XApiPlugin::DATA_TYPE_EXERCISE,
                 $this->exe->getExeId()
             );

diff --git a/plugin/xapi/src/Hook/XApiQuizQuestionAnsweredHook.php b/plugin/xapi/src/Hook/XApiQuizQuestionAnsweredHook.php
@@ -57,17 +57,17 @@ public function hookQuizQuestionAnswered(HookQuizQuestionAnsweredEventInterface
         $this->course = api_get_course_entity($this->exe->getCId());
         $this->session = api_get_session_entity($this->exe->getSessionId());
 
-        $statement = $this
-            ->createStatement()
-            ->withCreated(
-                $this->attempt->getTms()
-            );
-
         try {
-            $statement = $this->sendStatementToLrs($statement);
+            $statement = $this
+                ->createStatement()
+                ->withCreated(
+                    $this->attempt->getTms()
+                );
+
+            $sharedStmt = $this->sendStatementToLrs($statement);
 
             $this->saveSharedStatement(
-                $statement->getId(),
+                $sharedStmt->getId(),
                 XApiPlugin::DATA_TYPE_ATTEMPT,
                 $this->attempt->getId()
             );