From f09b3b888a24afd74793e4b78e2a43f52affcbf9 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nshahzad@gmail.com>
Date: Sun, 21 Jan 2018 13:43:32 -0500
Subject: [PATCH] Cast the required field properly and add helper #146

---
 .../Controllers/Admin/AirportController.php   | 11 ++--------
 .../Admin/PirepFieldController.php            |  9 +++++++--
 app/helpers.php                               | 20 +++++++++++++++++++
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Admin/AirportController.php b/app/Http/Controllers/Admin/AirportController.php
index 32f4edd2..98f52e72 100644
--- a/app/Http/Controllers/Admin/AirportController.php
+++ b/app/Http/Controllers/Admin/AirportController.php
@@ -18,13 +18,6 @@ class AirportController extends BaseController
     /** @var  AirportRepository */
     private $airportRepository;
 
-    public static $enabledStates = [
-        'on',
-        'true',
-        '1',
-        true,
-    ];
-
     public function __construct(AirportRepository $airportRepo)
     {
         $this->airportRepository = $airportRepo;
@@ -73,7 +66,7 @@ class AirportController extends BaseController
     public function store(CreateAirportRequest $request)
     {
         $input = $request->all();
-        $input['hub'] = \in_array($input['hub'], self::$enabledStates);
+        $input['hub'] = get_truth_state($input['hub']);
 
         $this->airportRepository->create($input);
 
@@ -137,7 +130,7 @@ class AirportController extends BaseController
         }
 
         $attrs = $request->all();
-        $attrs['hub'] = \in_array($attrs['hub'], self::$enabledStates);
+        $attrs['hub'] = get_truth_state($attrs['hub']);
 
         $this->airportRepository->update($attrs, $id);
 
diff --git a/app/Http/Controllers/Admin/PirepFieldController.php b/app/Http/Controllers/Admin/PirepFieldController.php
index 7238e867..75f7a1a0 100644
--- a/app/Http/Controllers/Admin/PirepFieldController.php
+++ b/app/Http/Controllers/Admin/PirepFieldController.php
@@ -52,12 +52,14 @@ class PirepFieldController extends BaseController
      * @param CreatePirepFieldRequest $request
      *
      * @return Response
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
      */
     public function store(CreatePirepFieldRequest $request)
     {
         $input = $request->all();
+        $input['required'] = get_truth_state($input['required']);
 
-        $field = $this->pirepFieldRepo->create($input);
+        $this->pirepFieldRepo->create($input);
 
         Flash::success('PirepField saved successfully.');
         return redirect(route('admin.pirepfields.index'));
@@ -107,6 +109,7 @@ class PirepFieldController extends BaseController
 
     /**
      * Update the specified PirepField in storage.
+     * @throws \Prettus\Validator\Exceptions\ValidatorException
      */
     public function update($id, UpdatePirepFieldRequest $request)
     {
@@ -117,7 +120,9 @@ class PirepFieldController extends BaseController
             return redirect(route('admin.pirepfields.index'));
         }
 
-        $field = $this->pirepFieldRepo->update($request->all(), $id);
+        $attrs = $request->all();
+        $attrs['required'] = get_truth_state($attrs['required']);
+        $this->pirepFieldRepo->update($attrs, $id);
 
         Flash::success('PirepField updated successfully.');
         return redirect(route('admin.pirepfields.index'));
diff --git a/app/helpers.php b/app/helpers.php
index 323eaa5b..44265d88 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -1,5 +1,25 @@
 <?php
 
+if(!function_exists('get_truth_state')) {
+    /**
+     * Check if the passed state matches any of the states that
+     * we regard as being true or false
+     * @param $state
+     * @return bool
+     */
+    function get_truth_state($state)
+    {
+        $enabledStates = [
+            'on',
+            'true',
+            '1',
+            true,
+        ];
+
+        return \in_array($state, $enabledStates, false);
+    }
+}
+
 if(!function_exists('list_to_assoc')) {
     /**
      * Converts a straight list into an assoc array with