Merge pull request #592 from LearningLocker/tidy/statements

Tidies up statement repository.

Author: ryasmi

app/commands/StatementMigrateCommand.php

@@ -55,7 +55,7 @@ public function fire() {
         });
 
         // Uses the repository to migrate the statements.
-        $repo = App::make('Locker\Repository\Statement\EloquentStatementRepository');
+        $repo = App::make('Locker\Repository\Statement\EloquentVoider');
         $repo->updateReferences($statements_array, $lrs);
         $repo->voidStatements($statements_array, $lrs);
 

app/controllers/LrsController.php

@@ -1,7 +1,9 @@
 <?php
 
 use \Locker\Repository\Lrs\Repository as LrsRepo;
-use \Locker\Repository\Statement\StatementRepository as StatementRepo;
+use \Locker\Repository\Statement\Repository as StatementRepo;
+use \Locker\Repository\Statement\EloquentIndexer as StatementIndexer;
+use \Locker\Repository\Statement\IndexOptions as IndexOptions;
 
 class LrsController extends BaseController {
 
@@ -66,7 +68,7 @@ public function store() {
 
     //lrs input validation
     $rules['title']        = 'required';
-    $rules['description']  = '';       
+    $rules['description']  = '';
     $validator = \Validator::make($data, $rules);
     if ($validator->fails()) return \Redirect::back()->withErrors($validator);
 
@@ -103,7 +105,7 @@ public function update($lrs_id){
     $data = \Input::all();
 
     //lrs input validation
-    $rules['title'] = 'required';      
+    $rules['title'] = 'required';
     $validator = \Validator::make($data, $rules);
     if ($validator->fails()) {
       return \Redirect::back()->withErrors($validator);
@@ -123,7 +125,7 @@ public function update($lrs_id){
 
   /**
    * Display the specified resource.
-   * This is a temp hack until the single page app for 
+   * This is a temp hack until the single page app for
    * analytics is ready. v1.0 stable.
    * @param String $lrs_id
    * @return View
@@ -187,10 +189,13 @@ public function destroy($lrs_id){
    * @return View
    */
   public function statements($lrs_id){
-    $statements = $this->statement->index($lrs_id, [], [
+    $statements = (new StatementIndexer)->index(new IndexOptions([
+      'lrs_id' => $lrs_id,
       'ascending' => false,
-      'limit' => $this->statement->count($lrs_id)
-    ])->paginate(15);
+      'limit' => $this->statement->count([
+        'lrs_id' => $lrs_id
+      ])
+    ]))->paginate(15);
 
     return View::make('partials.statements.list', array_merge($this->getLrs($lrs_id), [
       'statements' => $statements,
@@ -240,7 +245,7 @@ public function editCredentials( $lrs_id ){
       $message_type = 'error';
       $message = trans('update_key_error');
     }
-    
+
     return Redirect::back()->with($message_type, $message);
   }
 
@@ -251,7 +256,7 @@ public function editCredentials( $lrs_id ){
    */
   public function users($lrs_id) {
     $opts = $this->getLrs($lrs_id);
-    return View::make('partials.users.list', array_merge($opts, [ 
+    return View::make('partials.users.list', array_merge($opts, [
       'users'    => $opts['lrs']->users,
       'user_nav' => true
     ]));
@@ -260,7 +265,7 @@ public function users($lrs_id) {
 
   public function inviteUsersForm($lrs_id) {
     $opts = $this->getLrs($lrs_id);
-    return View::make('partials.lrs.invite', array_merge($opts, [ 
+    return View::make('partials.lrs.invite', array_merge($opts, [
       'users'    => $opts['lrs']->users,
       'user_nav' => true
     ]));

app/controllers/SiteController.php

@@ -2,7 +2,7 @@
 
 use Locker\Repository\Site\SiteRepository as SiteRepo;
 use Locker\Repository\Lrs\Repository as LrsRepo;
-use Locker\Repository\Statement\StatementRepository as StatementRepo;
+use Locker\Repository\Statement\Repository as StatementRepo;
 use Locker\Repository\User\UserRepository as UserRepo;
 
 class SiteController extends BaseController {
@@ -20,7 +20,7 @@ public function __construct(SiteRepo $site, LrsRepo $lrs, UserRepo $user, Statem
 
     $this->beforeFilter('auth');
     $this->beforeFilter('auth.super', array('except' => array('inviteUsers')));
-    $this->beforeFilter('csrf', array('only' => array('update', 'verifyUser', 'inviteUsers'))); 
+    $this->beforeFilter('csrf', array('only' => array('update', 'verifyUser', 'inviteUsers')));
   }
 
   /**
@@ -35,7 +35,7 @@ public function index(){
     $admin_dashboard = new \app\locker\data\dashboards\AdminDashboard();
 
     return View::make('partials.site.dashboard', [
-      'site' => $site, 
+      'site' => $site,
       'list' => $list,
       'stats' => $admin_dashboard->getFullStats(),
       'graph_data' => $admin_dashboard->getGraphData()
@@ -51,7 +51,7 @@ public function index(){
   public function edit($id){
     $site = $this->site->find($id);
     return View::make('partials.site.edit', [
-      'site' => $site, 
+      'site' => $site,
       'settings_nav' => true
     ]);
   }
@@ -122,7 +122,7 @@ public function lrs(){
     $lrss = $this->lrs->index($opts);
 
     return Response::json(array_map(function ($lrs) {
-      $lrs->statement_total = $this->statement->count($lrs->_id);
+      $lrs->statement_total = $this->statement->count(['lrs_id' => $lrs->_id]);
       return $lrs;
     }, $lrss));
   }
@@ -148,7 +148,7 @@ public function users() {
    */
   public function inviteUsersForm() {
     return View::make('partials.site.invite', [
-      'users_nav' => true, 
+      'users_nav' => true,
       'admin_dash' => true
     ]);
   }

app/controllers/StatementController.php

@@ -1,6 +1,6 @@
 <?php
 
-use Locker\Repository\Statement\StatementRepository as StatementRepo;
+use Locker\Repository\Statement\Repository as StatementRepo;
 use Locker\Repository\Lrs\Repository as LrsRepo;
 
 class StatementController extends BaseController {

app/controllers/xapi/ActivityController.php

@@ -1,7 +1,6 @@
 <?php namespace Controllers\xAPI;
 
 use \Locker\Repository\Document\DocumentRepository as Document;
-use \Locker\Repository\Activity\ActivityRepository as Activity;
 use Locker\Repository\Document\DocumentType as DocumentType;
 
 class ActivityController extends DocumentController {
@@ -22,9 +21,8 @@ class ActivityController extends DocumentController {
    * @param Document $document
    * @param Activity $activity
    */
-  public function __construct(Document $document, Activity $activity){
+  public function __construct(Document $document){
     parent::__construct($document);
-    $this->activity = $activity;
   }
 
   /**

app/controllers/xapi/BaseController.php

@@ -38,17 +38,12 @@ public function setParameters(){
    * @return mixed Result of the method.
    */
   public function selectMethod() {
-    try {
-      switch ($this->method) {
-        case 'HEAD':
-        case 'GET': return $this->get();
-        case 'PUT': return $this->update();
-        case 'POST': return $this->store();
-        case 'DELETE': return $this->destroy();
-      }
-    } catch (\Exception $ex) {
-      $code = method_exists($ex, 'getStatusCode') ? $ex->getStatusCode() : 400;
-      throw new Exceptions\Exception($ex->getMessage(), $code, $ex);
+    switch ($this->method) {
+      case 'HEAD':
+      case 'GET': return $this->get();
+      case 'PUT': return $this->update();
+      case 'POST': return $this->store();
+      case 'DELETE': return $this->destroy();
     }
   }