Merge pull request #749 from LearningLocker/develop

v1.11.0

Author: daniel-abbey

VERSION

@@ -1 +1 @@
-1.10.0
+1.11.0

app/config/auth.php

@@ -60,7 +60,7 @@
 
 	'reminder' => array(
 
-		'email' => 'emails.auth.reminder',
+		'email' => ['emails.auth.reminderHtml', 'emails.auth.reminderPlain'],
 
 		'table' => 'password_reminders',
 

app/controllers/EmailController.php

@@ -73,7 +73,7 @@ public function inviteEmail( $token ){
               ->where('token', $token)
               ->pluck('email');
     $user = \User::where('email', $email)->first();
-    if (!isset($user->_id)) \App::abort(404, 'This token cannot be found or has expired.');
+    if (!isset($user->_id)) \App::abort(404, 'Your email verification link has expired - please request a new one. ');
     Auth::loginUsingId($user->_id);
     \DB::table('user_tokens')
       ->where('token', $token)

app/controllers/LrsController.php

@@ -192,9 +192,9 @@ public function destroy($lrs_id){
   public function statements($lrs_id){
     $site = \Site::first();
     $statements = (new StatementIndexer)->index(new IndexOptions([
-      'lrs_id' => new \MongoId($lrs_id),
+      'lrs_id' => $lrs_id,
       'limit' => $this->statement->count([
-        'lrs_id' => new \MongoId($lrs_id),
+        'lrs_id' => $lrs_id,
         'scopes' => ['all']
       ]),
       'scopes' => ['all']

app/controllers/ReportingController.php

@@ -91,10 +91,10 @@ public function statements($lrs_id, $report_id) {
     return View::make("{$this->views}.statements", array_merge($this->getLrs($lrs_id), [
       'reporting_nav' => true,
       'statements' => $this->report->statements($report_id, [
-        'lrs_id' => new \MongoId($lrs_id)
+        'lrs_id' => $lrs_id
       ])->select('statement')->paginate(20),
       'report' => $this->report->show($report_id, [
-        'lrs_id' => new \MongoId($lrs_id)
+        'lrs_id' => $lrs_id
       ]),
       'lang' => $site->lang
     ]));
@@ -107,10 +107,10 @@ public function statements($lrs_id, $report_id) {
    * @param String $query to match against.
    * @return [Typeahead values] Typeahead values.
    **/
-  public function typeahead($lrs, $segment, $query){
+  public function typeahead($lrs_id, $segment, $query){
     $options = self::$segments[$segment];
     return Response::json($this->report->setQuery(
-      new \MongoId($lrs),
+      $lrs_id,
       $query,
       self::statementKey.$options['return'],
       self::statementKey.$options['query']

app/controllers/xapi/AgentController.php

@@ -34,13 +34,20 @@ public function search() {
     )->toArray();
     $agents = array_column($agents, 'agent');
 
+    $accounts = array_map(function ($agent) {
+      return isset($agent['account']) ? json_encode($agent['account']) : null;
+    }, $agents);
+    $accounts = array_map(function ($account) {
+      return json_decode($account);
+    }, array_unique($accounts));
+
     $person = (object) [
       'objectType' => 'Person',
       'name' => array_unique(array_column($agents, 'name')),
       'mbox' => array_unique(array_column($agents, 'mbox')),
       'mbox_sha1sum' => array_unique(array_column($agents, 'mbox_sha1sum')),
       'openid' => array_unique(array_column($agents, 'openid')),
-      'account' => array_unique(array_column($agents, 'account'))
+      'account' => $accounts
     ];
 
     return \Response::json($person);

app/controllers/xapi/StateController.php

@@ -16,7 +16,8 @@ class StateController extends DocumentController {
     'stateId' => 'string'
   ];
   protected $optional = [
-    'registration' => 'uuid'
+    'registration' => 'uuid',
+    'since' => 'timestamp'
   ];
   protected $document_type = DocumentType::STATE;
 

app/database/migrations/2015_09_14_090000_lrs_foreign_ids.php

@@ -0,0 +1,41 @@
+<?php
+use Illuminate\Database\Migrations\Migration;
+use \Locker\Helpers\Helpers as Helpers;
+
+class LrsForeignIds extends Migration
+{
+
+  public function up()
+  {
+    $db = \DB::getMongoDB();
+    
+    Lrs::get()->each(function (Lrs $lrs) use($db)
+    {
+      if( isset($lrs->users) ) $lrs->users = Helpers::convertIds($lrs->users);
+      
+      $lrs->owner_id = new \MongoId($lrs->owner_id);
+      $lrs->save();
+      
+      echo 'IDs for lrs collection "' . $lrs->title . '" converted to MongoIds.' . PHP_EOL;
+    });
+  }
+
+  public function down()
+  {
+    $db = \DB::getMongoDB();
+    
+    Lrs::get()->each(function (Lrs $lrs) use($db)
+    {
+      $users = $lrs->getAttribute('users');
+      foreach ($users as &$user) {
+        $user['_id'] = (string)$user['_id'];
+      }
+      $lrs->setAttribute('users', $users);
+      
+      $lrs->owner_id = (string)$lrs->owner_id;
+      $lrs->save();
+      
+      echo 'IDs for lrs collection "' . $lrs->title . '" converted to strings.' . PHP_EOL;
+    });
+  }
+}

app/database/migrations/2015_09_15_075532_client_foreign_ids.php

@@ -0,0 +1,60 @@
+<?php
+use Illuminate\Database\Migrations\Migration;
+
+class ClientForeignIds extends Migration
+{
+
+  /**
+   * Convert foreign id values from string to MongoId.
+   *
+   * @return void
+   */
+  public function up()
+  {
+    $db = \DB::getMongoDB();
+    
+    Client::get()->each(function (Client $client) use($db)
+    {
+      // The Client model has a mutator that converts lrs_id values to MongoId objects.
+      $client->lrs_id = $client->lrs_id;
+      $client->save();
+    });
+    
+    echo 'Foreign id values in client collection converted from string to MongoId.' . PHP_EOL;
+  }
+
+  /**
+   * Convert foreign id values from MongoId to string.
+   *
+   * @return void
+   */
+  public function down()
+  {
+    // The Client model has a mutator that converts lrs_id from string to MongoId,
+    // so the Mongo classes are used to directly modify the client collection.
+    $db = \DB::getMongoDB();
+    $clients = new MongoCollection($db, 'client');
+    
+    $lrsIds = $clients->aggregateCursor([
+      [
+        '$group' => [
+          '_id' => '$lrs_id'
+        ]
+      ]
+    ]);
+    
+    foreach ($lrsIds as $lrsId) {
+      $clients->update([
+        'lrs_id' => $lrsId['_id']
+      ], [
+        '$set' => [
+          'lrs_id' => (string) $lrsId['_id']
+        ]
+      ], [
+        'multiple' => true
+      ]);
+    }
+    
+    echo 'Foreign id values in client collection converted from MongoId to string.' . PHP_EOL;
+  }
+}

app/database/migrations/2015_09_15_105751_remove_orphan_clients.php

@@ -0,0 +1,33 @@
+<?php
+use Illuminate\Database\Migrations\Migration;
+
+class RemoveOrphanClients extends Migration
+{
+
+  /**
+   * Removes documents from the client collection that have
+   * an lrs_id that does not exist in the lrs collection.
+   *
+   * @return void
+   */
+  public function up()
+  {
+    $db = \DB::getMongoDB();
+    $clients = new MongoCollection($db, 'client');
+    $lrss = new MongoCollection($db, 'lrs');
+    
+    $clientCursor = $clients->find([], ['lrs_id' => true]);
+    
+    foreach ($clientCursor as $client) {
+      $count = $lrss->count(['_id' => $client['lrs_id']]);
+      if ($count == 0) {
+        $clients->remove(['_id' => $client['_id']]);
+      }
+    }
+  }
+
+  public function down()
+  {
+    //
+  }
+}