From 995d53df3e8c78f6df765ff247592cfedfb93143 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Tue, 6 Feb 2018 10:02:34 -0600
Subject: [PATCH] Set slug properly on pirep field and fix validation

---
 app/Http/Controllers/Admin/PirepFieldController.php |  8 +++++---
 app/Http/Controllers/Frontend/PirepController.php   |  7 ++++---
 app/Http/Requests/CreatePirepRequest.php            |  3 ++-
 app/Models/PirepField.php                           | 10 ++++------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Admin/PirepFieldController.php b/app/Http/Controllers/Admin/PirepFieldController.php
index 0e388997..793e5e99 100644
--- a/app/Http/Controllers/Admin/PirepFieldController.php
+++ b/app/Http/Controllers/Admin/PirepFieldController.php
@@ -53,10 +53,11 @@ class PirepFieldController extends BaseController
      */
     public function store(CreatePirepFieldRequest $request)
     {
-        $input = $request->all();
-        $input['required'] = get_truth_state($input['required']);
+        $attrs = $request->all();
+        $attrs['slug'] = str_slug($attrs['name']);
+        $attrs['required'] = get_truth_state($attrs['required']);
 
-        $this->pirepFieldRepo->create($input);
+        $this->pirepFieldRepo->create($attrs);
 
         Flash::success('PirepField saved successfully.');
         return redirect(route('admin.pirepfields.index'));
@@ -114,6 +115,7 @@ class PirepFieldController extends BaseController
         }
 
         $attrs = $request->all();
+        $attrs['slug'] = str_slug($attrs['name']);
         $attrs['required'] = get_truth_state($attrs['required']);
         $this->pirepFieldRepo->update($attrs, $id);
 
diff --git a/app/Http/Controllers/Frontend/PirepController.php b/app/Http/Controllers/Frontend/PirepController.php
index 8b9f3b2d..21647fa5 100644
--- a/app/Http/Controllers/Frontend/PirepController.php
+++ b/app/Http/Controllers/Frontend/PirepController.php
@@ -129,7 +129,7 @@ class PirepController extends Controller
     public function store(CreatePirepRequest $request)
     {
         // Create the main PIREP
-        $pirep = new Pirep($request->all());
+        $pirep = new Pirep($request->post());
         $pirep->user_id = Auth::user()->id;
 
         # Make sure this isn't a duplicate
@@ -140,8 +140,9 @@ class PirepController extends Controller
         }
 
         // Any special fields
-        $pirep->flight_time = ((int) Utils::hoursToMinutes($request['hours']))
-                            + ((int) $request['minutes']);
+        $hours = (int) $request->input('hours', 0);
+        $minutes = (int) $request->input('minutes', 0);
+        $pirep->flight_time = Utils::hoursToMinutes($hours) + $minutes;
 
         // The custom fields from the form
         $custom_fields = [];
diff --git a/app/Http/Requests/CreatePirepRequest.php b/app/Http/Requests/CreatePirepRequest.php
index d91705c0..0cb2abec 100644
--- a/app/Http/Requests/CreatePirepRequest.php
+++ b/app/Http/Requests/CreatePirepRequest.php
@@ -30,13 +30,14 @@ class CreatePirepRequest extends FormRequest
         $field_rules = Pirep::$rules;
 
         $field_rules['hours'] = 'nullable|integer';
-        $field_rules['minutes'] = 'required|integer';
+        $field_rules['minutes'] = 'nullable|integer';
 
         # Add the validation rules for the custom fields
         $pirepFieldRepo = app(PirepFieldRepository::class);
 
         $custom_fields = $pirepFieldRepo->all();
         foreach ($custom_fields as $field) {
+            Log::info('field:', $field->toArray());
             $field_rules[$field->slug] = $field->required ? 'required' : 'nullable';
         }
 
diff --git a/app/Models/PirepField.php b/app/Models/PirepField.php
index 138f9de9..7c8cfc25 100644
--- a/app/Models/PirepField.php
+++ b/app/Models/PirepField.php
@@ -2,6 +2,8 @@
 
 namespace App\Models;
 
+use Log;
+
 /**
  * Class PirepField
  *
@@ -37,18 +39,14 @@ class PirepField extends BaseModel
          * On creation
          */
         static::creating(function (PirepField $model) {
-            if (!empty($model->slug)) {
-                $model->slug = str_slug($model->name);
-            }
+            $model->slug = str_slug($model->name);
         });
 
         /**
          * When updating
          */
         static::updating(function(PirepField $model) {
-            if (!empty($model->slug)) {
-                $model->slug = str_slug($model->name);
-            }
+            $model->slug = str_slug($model->name);
         });
     }
 }