Merge branch 'hotfix-v1.2.2'

app/Http/Controllers/SubjectController.php

@@ -3,7 +3,9 @@
 namespace App\Http\Controllers;
 
 use App\Models\Subject;
+use App\Models\SubjectPrefix;
 use App\Http\Transformers\SubjectTransformer;
+use App\Http\Transformers\SubjectPrefixTransformer;
 use App\Http\Controllers\Controller;
 use App\Http\Serializers\CustomDataArraySerializer;
 use Illuminate\Http\Request;
@@ -20,11 +22,10 @@ class SubjectController extends ApiController{
   * Return all subjects
   **/
   public function index(Manager $fractal){
-        $subjects  = Subject::all();
-
+        $subjects = SubjectPrefix::with('subject')->get();
         $data = $subjects;
         if ( !is_null($subjects) ) {
-            $collection = new Collection($subjects, new SubjectTransformer, self::WRAPPER);
+            $collection = new Collection($subjects, new SubjectPrefixTransformer, self::WRAPPER);
 
             $fractal->setSerializer(new CustomDataArraySerializer);
             $data = $fractal->createData($collection)->toArray();
@@ -38,12 +39,12 @@ public function index(Manager $fractal){
     **/
     public function getSubject($slug){
 
-        $subject  = Subject::where('Slug', '=', $slug)->first();
+        $subject  = SubjectPrefix::where('CoursePrefixID', '=', $slug)->first();
 
         $data = $subject;
         //handle gracefully if null
         if( !is_null($subject) ) {
-            $item = new Item($subject, new SubjectTransformer, "subject");
+            $item = new Item($subject, new SubjectPrefixTransformer, "subject");
 
             $fractal = new Manager;
 

app/Http/Transformers/SubjectPrefixTransformer.php

@@ -0,0 +1,22 @@
+<?php namespace App\Http\Transformers;
+
+use App\Models\SubjectPrefix;
+use League\Fractal\Resource\Collection;
+use League\Fractal\TransformerAbstract;
+
+class SubjectPrefixTransformer extends TransformerAbstract {
+
+    /**
+    * A Fractal transformer for a subject. Defines how data for 
+    * a subject should be output in the API.
+    **/
+
+    public function transform(SubjectPrefix $prefix)
+    {
+        return [
+            'subject'  =>  $prefix->CoursePrefixID,
+            'name'  =>  $prefix->subject->Title,
+        ];
+    }
+
+}

app/Models/Subject.php

@@ -11,6 +11,10 @@ class Subject extends Model
      protected $connection = 'cs';
      protected $primaryKey = 'SubjectID';
      public $timestamps = false;
-
+
+    public function prefixes()
+    {
+        return $this->hasMany('App\Models\SubjectPrefix', 'SubjectID');
+    }
 }
 ?>

app/Models/SubjectPrefix.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SubjectPrefix extends Model
+{
+    /**
+    * Model for course subject prefixes (many to one with Subjects)
+    **/
+     protected $table = 'SubjectsCoursePrefixes';
+     protected $connection = 'cs';
+     protected $primaryKey = 'CoursePrefixID';
+     public $timestamps = false;
+     public $incrementing = false;
+
+     public function subject()
+    {
+        return $this->belongsTo('App\Models\Subject', 'SubjectID');
+    }
+}

config/dataapi.php

@@ -6,7 +6,7 @@
     'yearquarter_max'       => 'Z999',
     'timezone'              => 'America/Los_Angeles',
     'common_course_char'    => '&',
-    'app_version'           => '1.2.1',
+    'app_version'           => '1.2.2',
     'admin_group'           => env('ADMIN_GROUP', null),
     'api_internal_domain'   => env('API_INTERNAL_DOMAIN', 'internal.localhost.test'),
 ];