Merge pull request #2570 from CachetHQ/system-meta

jbrooksuk · web-flow · commit bd34264d3c4a · 2017-06-13T22:47:23.000+01:00
Global Meta System
diff --git a/app/Bus/Commands/Incident/CreateIncidentCommand.php b/app/Bus/Commands/Incident/CreateIncidentCommand.php
@@ -96,6 +96,13 @@ final class CreateIncidentCommand
      */
     public $template_vars;
 
+    /**
+     * Meta key/value pairs.
+     *
+     * @var array
+     */
+    public $meta = [];
+
     /**
      * The validation rules.
      *
@@ -112,6 +119,7 @@ final class CreateIncidentCommand
         'stickied'         => 'required|bool',
         'occurred_at'      => 'nullable|string',
         'template'         => 'nullable|string',
+        'meta'             => 'required|array',
     ];
 
     /**
@@ -128,10 +136,11 @@ final class CreateIncidentCommand
      * @param string|null $occurred_at
      * @param string|null $template
      * @param array       $template_vars
+     * @param array       $meta
      *
      * @return void
      */
-    public function __construct($name, $status, $message, $visible, $component_id, $component_status, $notify, $stickied, $occurred_at, $template, array $template_vars = [])
+    public function __construct($name, $status, $message, $visible, $component_id, $component_status, $notify, $stickied, $occurred_at, $template, array $template_vars = [], $meta = [])
     {
         $this->name = $name;
         $this->status = $status;
@@ -144,5 +153,6 @@ public function __construct($name, $status, $message, $visible, $component_id, $
         $this->occurred_at = $occurred_at;
         $this->template = $template;
         $this->template_vars = $template_vars;
+        $this->meta = $meta;
     }
 }
diff --git a/app/Bus/Handlers/Commands/Incident/CreateIncidentCommandHandler.php b/app/Bus/Handlers/Commands/Incident/CreateIncidentCommandHandler.php
@@ -18,6 +18,7 @@
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\Incident;
 use CachetHQ\Cachet\Models\IncidentTemplate;
+use CachetHQ\Cachet\Models\Meta;
 use CachetHQ\Cachet\Services\Dates\DateFactory;
 use Carbon\Carbon;
 use Illuminate\Contracts\Auth\Guard;
@@ -100,6 +101,18 @@ public function handle(CreateIncidentCommand $command)
         // Create the incident
         $incident = Incident::create($data);
 
+        // Store any meta?
+        if ($meta = $command->meta) {
+            foreach ($meta as $key => $value) {
+                Meta::create([
+                    'key'       => $key,
+                    'value'     => $value,
+                    'meta_type' => 'incidents',
+                    'meta_id'   => $incident->id,
+                ]);
+            }
+        }
+
         // Update the component.
         if ($component = Component::find($command->component_id)) {
             dispatch(new UpdateComponentCommand(
diff --git a/app/Foundation/Providers/AppServiceProvider.php b/app/Foundation/Providers/AppServiceProvider.php
@@ -14,6 +14,7 @@
 use AltThree\Bus\Dispatcher;
 use CachetHQ\Cachet\Bus\Middleware\UseDatabaseTransactions;
 use CachetHQ\Cachet\Services\Dates\DateFactory;
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 
@@ -42,6 +43,14 @@ public function boot(Dispatcher $dispatcher)
         Str::macro('canonicalize', function ($url) {
             return preg_replace('/([^\/])$/', '$1/', $url);
         });
+
+        Relation::morphMap([
+            'components' => \CachetHQ\Cachet\Models\Component::class,
+            'incidents'  => \CachetHQ\Cachet\Models\Incident::class,
+            'metrics'    => \CachetHQ\Cachet\Models\Metric::class,
+            'schedules'  => \CachetHQ\Cachet\Models\Schedule::class,
+            'subscriber' => \CachetHQ\Cachet\Models\Subscriber::class,
+        ]);
     }
 
     /**
diff --git a/app/Http/Controllers/Api/IncidentController.php b/app/Http/Controllers/Api/IncidentController.php
@@ -78,7 +78,8 @@ public function postIncidents()
                 Binput::get('stickied', false),
                 Binput::get('occurred_at'),
                 Binput::get('template'),
-                Binput::get('vars', [])
+                Binput::get('vars', []),
+                Binput::get('meta', [])
             ));
         } catch (QueryException $e) {
             throw new BadRequestHttpException();
diff --git a/app/Models/Component.php b/app/Models/Component.php
@@ -134,6 +134,16 @@ public function incidents()
         return $this->hasMany(Incident::class, 'component_id', 'id');
     }
 
+    /**
+     * Get all of the meta relation.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     */
+    public function meta()
+    {
+        return $this->morphMany(Meta::class, 'meta');
+    }
+
     /**
      * Get the tags relation.
      *
diff --git a/app/Models/Incident.php b/app/Models/Incident.php
@@ -145,7 +145,10 @@ class Incident extends Model implements HasPresenter
      *
      * @var string[]
      */
-    protected $with = ['updates'];
+    protected $with = [
+        'meta',
+        'updates',
+    ];
 
     /**
      * Get the component relation.
@@ -157,6 +160,16 @@ public function component()
         return $this->belongsTo(Component::class, 'component_id', 'id');
     }
 
+    /**
+     * Get all of the meta relation.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     */
+    public function meta()
+    {
+        return $this->morphMany(Meta::class, 'meta');
+    }
+
     /**
      * Get the updates relation.
      *
diff --git a/app/Models/Meta.php b/app/Models/Meta.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Models;
+
+use AltThree\Validator\ValidatingTrait;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * This is the meta model class.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+class Meta extends Model
+{
+    use ValidatingTrait;
+
+    /**
+     * The attributes that should be casted to native types.
+     *
+     * @var string[]
+     */
+    protected $casts = [
+        'id'        => 'int',
+        'key'       => 'string',
+        'value'     => 'json',
+        'meta_id'   => 'int',
+        'meta_type' => 'string',
+    ];
+
+    /**
+     * The fillable properties.
+     *
+     * @var string[]
+     */
+    protected $fillable = [
+        'key',
+        'value',
+        'meta_id',
+        'meta_type',
+    ];
+
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'id'        => 'nullable|int|min:1',
+        'key'       => 'required|string',
+        'value'     => 'nullable',
+        'meta_id'   => 'required|int',
+        'meta_type' => 'required|string',
+    ];
+
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'meta';
+
+   /**
+    * Get all of the owning meta models.
+    *
+    * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+    */
+   public function meta()
+   {
+       return $this->morphTo();
+   }
+}
diff --git a/app/Models/Metric.php b/app/Models/Metric.php
@@ -165,6 +165,16 @@ public static function boot()
         });
     }
 
+    /**
+     * Get all of the meta relation.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     */
+    public function meta()
+    {
+        return $this->morphMany(Meta::class, 'meta');
+    }
+
     /**
      * Get the points relation.
      *
diff --git a/app/Models/Schedule.php b/app/Models/Schedule.php
@@ -131,6 +131,26 @@ class Schedule extends Model implements HasPresenter
      */
     protected $with = ['components'];
 
+    /**
+     * Get the components relation.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function components()
+    {
+        return $this->hasMany(ScheduleComponent::class);
+    }
+
+    /**
+     * Get all of the meta relation.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     */
+    public function meta()
+    {
+        return $this->morphMany(Meta::class, 'meta');
+    }
+
     /**
      * Scopes schedules to those in the future.
      *
@@ -155,16 +175,6 @@ public function scopePastSchedules($query)
         return $query->where('status', '<', self::COMPLETE)->where('scheduled_at', '<=', Carbon::now());
     }
 
-    /**
-     * Get the components relation.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\HasMany
-     */
-    public function components()
-    {
-        return $this->hasMany(ScheduleComponent::class);
-    }
-
     /**
      * Get the presenter class.
      *
diff --git a/app/Models/Subscriber.php b/app/Models/Subscriber.php
@@ -90,6 +90,16 @@ public static function boot()
         });
     }
 
+    /**
+     * Get all of the meta relation.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     */
+    public function meta()
+    {
+        return $this->morphMany(Meta::class, 'meta');
+    }
+
     /**
      * Get the subscriptions relation.
      *
diff --git a/app/Presenters/IncidentPresenter.php b/app/Presenters/IncidentPresenter.php
@@ -279,6 +279,16 @@ public function duration()
         return 0;
     }
 
+    /**
+     * Return the meta in a key value pair.
+     *
+     * @return array
+     */
+    public function meta()
+    {
+        return $this->wrappedObject->meta->pluck('value', 'key')->all();
+    }
+
     /**
      * Convert the presenter instance to an array.
      *
@@ -294,6 +304,7 @@ public function toArray()
             'latest_icon'         => $this->latest_icon(),
             'permalink'           => $this->permalink(),
             'duration'            => $this->duration(),
+            'meta'                => $this->meta(),
             'occurred_at'         => $this->occurred_at(),
             'created_at'          => $this->created_at(),
             'updated_at'          => $this->updated_at(),
diff --git a/database/migrations/2017_06_13_181049_CreateMetaTable.php b/database/migrations/2017_06_13_181049_CreateMetaTable.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateMetaTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('meta', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('key')->index();
+            $table->string('value');
+            $table->integer('meta_id')->unsigned();
+            $table->string('meta_type');
+            $table->timestamps();
+
+            $table->index(['meta_id', 'meta_type']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('meta');
+    }
+}
diff --git a/tests/Api/IncidentTest.php b/tests/Api/IncidentTest.php
diff --git a/tests/Bus/Commands/Incident/CreateIncidentCommandTest.php b/tests/Bus/Commands/Incident/CreateIncidentCommandTest.php
diff --git a/tests/Models/MetaTest.php b/tests/Models/MetaTest.php
