Merge 6907980 into e52875f

.gitignore

@@ -3,3 +3,4 @@ vendor
 tests/logs
 build
 composer.lock
+.vscode/launch.json

database/factories/ModelFactory.php

@@ -4,12 +4,12 @@
 $factory->define(\FriendsOfCat\LaravelFeatureFlags\FeatureFlag::class, function ($faker) {
     return [
         'key' => str_random(3),
+        'usage_count' => $faker->randomDigit,
         'variants' => []
     ];
 });
 
 
-
 $factory->define(\FriendsOfCat\LaravelFeatureFlags\FeatureFlagUser::class, function ($faker) {
     return [
         'name' => $faker->word,

database/migrations/2020_06_21_223741_add_update_created_and_other_meta_info.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddUpdateCreatedAndOtherMetaInfo extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table("feature_flags", function (Blueprint $table) {
+            $table->timestamps(0);
+            $table->unsignedInteger("usage_count")->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

src/FeatureFlag.php

@@ -11,7 +11,10 @@ class FeatureFlag extends Model
         'variants' => 'json',
     ];
 
-    public $timestamps = false;
+    protected $fillable = [
+        "usage_count", "variants"
+    ];
+
 
     protected static function boot()
     {

src/FeatureFlagSettingsController.php

@@ -54,7 +54,9 @@ public function store(Request $request)
             $flag->save();
             return redirect()->route('laravel-feature-flag.index')->withMessage("Created Feature");
         } catch (\Exception $e) {
-            return redirect()->route('laravel-feature-flag.index')->withMessage("Could not find feature flag");
+            \Log::error("Error storing feature flags");
+            \Log::error($e);
+            return redirect()->route('laravel-feature-flag.index')->withMessage("Could save feature flag");
         }
     }
 
@@ -81,7 +83,9 @@ public function update(Request $request, $id)
                 'laravel-feature-flag.index'
             )->withMessage(sprintf("Feature Flag Updated %d", $id));
         } catch (\Exception $e) {
-            return redirect()->route('laravel-feature-flag.index')->withMessage("Could not find feature flag");
+            \Log::error("Error updating feature flags");
+            \Log::error($e);
+            return redirect()->route('laravel-feature-flag.index')->withMessage("Could not update feature flag");
         }
     }
 
@@ -96,6 +100,8 @@ public function destroy($id)
                 'laravel-feature-flag.index'
             )->withMessage(sprintf("Feature Flag deleted %d", $id));
         } catch (\Exception $e) {
+            \Log::error("Error deleting feature flags");
+            \Log::error($e);
             return redirect()->route('laravel-feature-flag.index')
                 ->withMessage("Could not find feature flag");
         }

tests/FeatureFlagSettingControllerTest.php

@@ -123,7 +123,7 @@ public function testShouldStoreFail()
 
         $example_controller = \App::make(FeatureFlagSettingsController::class);
         $data = $example_controller->store($request);
-        $this->assertEquals($data->getSession()->get('message'), 'Could not find feature flag');
+        $this->assertEquals($data->getSession()->get('message'), 'Could save feature flag');
     }
 
 
@@ -159,7 +159,6 @@ public function testShouldUpdate()
         $request = new Request();
         $request->merge(['variants' => '["on"]']);
         $feature_flag = FeatureFlag::where('key', 'add-twitter-field')->first();
-
         $example_controller = \App::make(FeatureFlagSettingsController::class);
         $data = $example_controller->update($request, $feature_flag->id);
 
@@ -177,7 +176,7 @@ public function testShouldUpdateFail()
         $example_controller = \App::make(FeatureFlagSettingsController::class);
         $data = $example_controller->update($request, null);
 
-        $this->assertEquals($data->getSession()->get('message'), "Could not find feature flag");
+        $this->assertEquals($data->getSession()->get('message'), "Could not update feature flag");
     }
 
     public function testShouldDestroy()

tests/FeatureFlagTest.php

@@ -50,6 +50,16 @@ public function testOff()
         $this->assertFalse($this->app->get(Gate::class)->allows('feature-flag', 'testing'));
     }
 
+    public function testTimeStamp()
+    {
+        $feature = factory(FeatureFlag::class)->create(
+            ['usage_count' => 2, "variants" => "off"]
+        );
+
+        $this->assertNotNull($feature->created_at);
+        $this->assertNotNull($feature->updated_at);
+    }
+
 
     public function testOnForUserEmail()
     {
@@ -110,5 +120,4 @@ public function testForNotFindFeature()
 
         $this->assertFalse($this->app->get(Gate::class)->allows('feature-flag', 'testing'));
     }
-
 }

views/settings.blade.php

@@ -33,6 +33,8 @@
                     <td>ID</td>
                     <td>Key</td>
                     <td>Variant</td>
+                    <td>Created At</td>
+                    <td>Updated</td>
                     <td>Edit</td>
                     <td>Delete</td>
                 </tr>
@@ -42,6 +44,12 @@
                 <td>#{{ $setting->id }}</td>
                 <td>{{ $setting->key }}</td>
                 <td>{{ json_encode($setting->variants, JSON_PRETTY_PRINT) }}</td>
+                <td>
+                    @if($setting->created_at) {{ $setting->created_at->toFormattedDateString() }} @else "empty" @endif
+                </td>
+                <td>
+                    @if($setting->updated_at) {{ $setting->updated_at->diffForHumans()}} @else "empty" @endif
+                </td>
                 <td>
                     <a class="btn btn-success" href="/admin/feature_flags/{{ $setting->id }}/edit">Edit</a>
                 </td>