Merge pull request #566 from dbarzin/dev

add missing fields

Author: dbarzin

app/Http/Controllers/API/MeasureController.php

@@ -12,7 +12,7 @@ class MeasureController extends Controller
 {
     public function index()
     {
-        abort_if(Auth::User()->role !== 4, Response::HTTP_FORBIDDEN, '403 Forbidden');
+        abort_if(Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');
 
         $measures = Measure::all();
 
@@ -21,9 +21,9 @@ public function index()
 
     public function store(Request $request)
     {
-        abort_if(Auth::User()->role !== 4, Response::HTTP_FORBIDDEN, '403 Forbidden');
+        abort_if(Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');
 
-        $measure = Measure::create($request->all());
+        $measure = Measure::query()->create($request->all());
         if ($request->has('controls')) {
             $measure->controls()->sync($request->input('controls', []));
         }
@@ -33,14 +33,14 @@ public function store(Request $request)
 
     public function show(Measure $measure)
     {
-        abort_if(Auth::User()->role !== 4, Response::HTTP_FORBIDDEN, '403 Forbidden');
+        abort_if(Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');
 
         return response()->json($measure);
     }
 
     public function update(Request $request, Measure $measure)
     {
-        abort_if(Auth::User()->role !== 4, Response::HTTP_FORBIDDEN, '403 Forbidden');
+        abort_if(Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');
 
         $measure->update($request->all());
         if ($request->has('controls')) {
@@ -52,7 +52,7 @@ public function update(Request $request, Measure $measure)
 
     public function destroy(Measure $measure)
     {
-        abort_if(Auth::User()->role !== 4, Response::HTTP_FORBIDDEN, '403 Forbidden');
+        abort_if(Auth::User()->isAPI(), Response::HTTP_FORBIDDEN, '403 Forbidden');
 
         $measure->delete();
 

app/Http/Controllers/MeasureController.php

@@ -13,6 +13,7 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\View\View;
 use Maatwebsite\Excel\Facades\Excel;
+use Mercator\Core\Models\Task;
 
 class MeasureController extends Controller
 {
@@ -195,18 +196,21 @@ public function store(Request $request)
             ]
         );
 
-        $measure = new Measure();
-        $measure->domain_id = request('domain_id');
-        $measure->clause = request('clause');
-        $measure->name = request('name');
-        $measure->attributes = request('attributes') !== null ? implode(' ', request('attributes')) : null;
-        $measure->objective = request('objective');
-        $measure->input = request('input');
-        $measure->model = request('model');
-        $measure->indicator = request('indicator');
-        $measure->action_plan = request('action_plan');
-
-        $measure->save();
+        $attributes = $request->get('attributes');
+        $request['attributes'] = $attributes !== null ? implode(' ', $attributes) : null;
+
+        $measure = Measure::query()->create($request->all());
+        // $measure = new Measure();
+        // $measure->domain_id = request('domain_id');
+        // $measure->clause = request('clause');
+        // $measure->name = request('name');
+        // $measure->attributes = request('attributes') !== null ? implode(' ', request('attributes')) : null;
+        // $measure->objective = request('objective');
+        // $measure->input = request('input');
+        // $measure->model = request('model');
+        // $measure->indicator = request('indicator');
+        // $measure->action_plan = request('action_plan');
+        // $measure->save();
 
         $request->session()->put('domain', $measure->domain_id);
 
@@ -378,23 +382,14 @@ public function update(Request $request)
         );
 
         // find measure
-        $measure = Measure::find($request->id);
+        $measure = Measure::query()->find($request->id);
 
         // not found
         abort_if($measure === null, Response::HTTP_NOT_FOUND, '404 Not Found');
 
         // update measure
-        $measure->domain_id = request('domain_id');
-        $measure->name = request('name');
-        $measure->clause = request('clause');
-        $measure->attributes = request('attributes') !== null ? implode(' ', request('attributes')) : null;
-        $measure->objective = request('objective');
-        $measure->input = request('input');
-        $measure->model = request('model');
-        $measure->indicator = request('indicator');
-        $measure->action_plan = request('action_plan');
-
-        $measure->update();
+        $request['attributes'] = implode(' ', $request->get('attributes') !== null ? $request->get('attributes') : []);
+        $measure->update($request->all());
 
         // return to view measure
         return redirect('/alice/show/'.$measure->id);

app/Models/Measure.php

@@ -28,12 +28,15 @@ class Measure extends Model
     ];
 
     protected $fillable = [
-        'name',
+        'domain_id',
         'clause',
+        'name',
         'objective',
-        'input',
         'attributes',
+        'input',
         'model',
+        'indicator',
+        'action_plan',
     ];
 
     // Return the domain associated to this measure