diff --git a/plugin/xapi/README.md b/plugin/xapi/README.md index 77e2008671..a8f6c1a687 100644 --- a/plugin/xapi/README.md +++ b/plugin/xapi/README.md @@ -74,6 +74,6 @@ With the LRS an internal log is registered based on the actor mbox's email or th To update, execute this queries: ```sql -CREATE TABLE xapi_internal_log (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, statement_id VARCHAR(255) NOT NULL, verb VARCHAR(255) NOT NULL, activity_id VARCHAR(255) NOT NULL, activity_name VARCHAR(255) DEFAULT NULL, activity_description VARCHAR(255) DEFAULT NULL, score_scaled DOUBLE PRECISION DEFAULT NULL, score_raw DOUBLE PRECISION DEFAULT NULL, score_min DOUBLE PRECISION DEFAULT NULL, score_max DOUBLE PRECISION DEFAULT NULL, created_at DATETIME DEFAULT NULL, INDEX IDX_C1C667ACA76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB; +CREATE TABLE xapi_internal_log (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, statement_id VARCHAR(255) NOT NULL, verb VARCHAR(255) NOT NULL, object_id VARCHAR(255) NOT NULL, activity_name VARCHAR(255) DEFAULT NULL, activity_description VARCHAR(255) DEFAULT NULL, score_scaled DOUBLE PRECISION DEFAULT NULL, score_raw DOUBLE PRECISION DEFAULT NULL, score_min DOUBLE PRECISION DEFAULT NULL, score_max DOUBLE PRECISION DEFAULT NULL, created_at DATETIME DEFAULT NULL, INDEX IDX_C1C667ACA76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB; ALTER TABLE xapi_internal_log ADD CONSTRAINT FK_C1C667ACA76ED395 FOREIGN KEY (user_id) REFERENCES user (id); ``` diff --git a/plugin/xapi/src/Entity/InternalLog.php b/plugin/xapi/src/Entity/InternalLog.php index 088db75d16..ff8d4753f1 100644 --- a/plugin/xapi/src/Entity/InternalLog.php +++ b/plugin/xapi/src/Entity/InternalLog.php @@ -42,9 +42,9 @@ class InternalLog /** * @var string * - * @ORM\Column(name="activity_id", type="string") + * @ORM\Column(name="object_id", type="string") */ - private $activityId; + private $objectId; /** * @var string|null * @@ -129,14 +129,14 @@ class InternalLog return $this; } - public function getActivityId(): string + public function getObjectId(): string { - return $this->activityId; + return $this->objectId; } - public function setActivityId(string $activityId): InternalLog + public function setObjectId(string $objectId): InternalLog { - $this->activityId = $activityId; + $this->objectId = $objectId; return $this; } @@ -153,9 +153,6 @@ class InternalLog return $this; } - /** - * @return string|null - */ public function getActivityDescription(): ?string { return $this->activityDescription; diff --git a/plugin/xapi/src/Lrs/Utils/InternalLogUtil.php b/plugin/xapi/src/Lrs/Utils/InternalLogUtil.php index fe247f076f..737b87504b 100644 --- a/plugin/xapi/src/Lrs/Utils/InternalLogUtil.php +++ b/plugin/xapi/src/Lrs/Utils/InternalLogUtil.php @@ -38,13 +38,10 @@ class InternalLogUtil return; } + $internalLog->setObjectId($statementObject->getId()->getValue()); $internalLog->setStatementId($statement->getId()->getValue()); if (null !== $definition = $statementObject->getDefinition()) { - $internalLog->setActivityId( - $statementObject->getId()->getValue() - ); - if (null !== $nameInLanguages = $definition->getName()) { $internalLog->setActivityName( XApiPlugin::extractVerbInLanguage($nameInLanguages, $languageIso)