Merge pull request #158 from davidpesce/mikemcgowan_context_key_fix

re-did mikemcgowans fix for the context key in translator
xAPI-vle · Feb 22, 2018 · 373dea9 · 373dea9
2 parents 0e528ff + 4a9d7e2
commit 373dea9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/classes/log/store.php b/classes/log/store.php
@@ -148,17 +148,14 @@ public function process_events(array $events) {
             $eventbatches = array_chunk($translatorevents, $maxbatchsize);
         }
 
-        $translatorevent = new Event();
-        $translatoreventreadreturn = @$translatorevent->read([]);
-
         $sentevents = [];
         foreach ($eventbatches as $translatoreventsbatch) {
             $xapievents = $xapicontroller->create_events($translatoreventsbatch);
             $statements = $xapievents['statements'];
             $response = $xapievents['response'];
             foreach (array_keys($statements) as $key) {
                 if (is_numeric($key)) {
-                    $k = $statements[$key]['context']['extensions'][$translatoreventreadreturn[0]['context_ext_key']]['id'];
+                    $k = $xapievents[$key]['context']['extensions'][Event::CONTEXT_EXT_KEY]['id'];
                     $sentevents[$k] = $this->getlast_action_result($response);
                 }
             }

diff --git a/lib/translator/src/Events/Event.php b/lib/translator/src/Events/Event.php
@@ -22,6 +22,12 @@
 use \stdClass as PhpObj;
 
 class Event extends PhpObj {
+
+    /**
+     * @var string
+     */
+    const CONTEXT_EXT_KEY = 'http://lrs.learninglocker.net/define/extensions/moodle_logstore_standard_log';
+
     protected static $xapitype = 'http://lrs.learninglocker.net/define/type/moodle/';
 
     /**
@@ -41,7 +47,7 @@ public function read(array $opts) {
                 || $opts['course']->lang == '' ? "en" : $opts['course']->lang,
             'context_platform' => 'Moodle',
             'context_ext' => $opts['event'],
-            'context_ext_key' => 'http://lrs.learninglocker.net/define/extensions/moodle_logstore_standard_log',
+            'context_ext_key' => self::CONTEXT_EXT_KEY,
             'context_info' => $opts['info'],
             'time' => date('c', $opts['event']['timecreated']),
             'app_url' => $opts['app']->url,