Merge pull request #6 from osinitiative/develop

Added Morph for Address, Phone and Email.

app/Macros/Database/Schema/Blueprint.php

@@ -2,8 +2,8 @@
 
 namespace OSI\Macros\Database\Schema;
 
-use OSI\Contracts\MacroContract;
 use Illuminate\Database\Schema\Blueprint as DefaultBlueprint;
+use OSI\Contracts\MacroContract;
 
 /**
  * Extended Blueprint by using Macro
@@ -23,11 +23,10 @@ public static function registerMacros()
                 ->nullable();
         });
 
-        DefaultBlueprint::macro('fkDeleteCascade', function ($key, $table) {
-            $this->foreign($key)
-                ->references('id')
-                ->on($table)
-                ->onDelete('cascade');
+        DefaultBlueprint::macro('referenceOn', function ($key, $table, $references = 'id') {
+            return $this->foreign($key)
+                ->references($references)
+                ->on($table);
         });
 
         DefaultBlueprint::macro('addAcceptance', function ($value) {
@@ -57,7 +56,7 @@ public static function registerMacros()
 
         DefaultBlueprint::macro('user', function () {
             $this->addForeign('user_id', 'users');
-            $this->fkDeleteCascade('user_id', 'users');
+            $this->referenceOn('user_id', 'users');
         });
 
         DefaultBlueprint::macro('amount', function ($label = 'amount') {

app/Models/Address.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace OSI\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Address extends Model
+{
+    protected $guarded = ['id'];
+
+    /**
+     * Get all of the owning addressable models.
+     */
+    public function addressable()
+    {
+        return $this->morphTo();
+    }
+
+    /**
+     * Get Country
+     * @return \OSI\Models\Country
+     */
+    public function country()
+    {
+        return $this->belongsTo(Country::class);
+    }
+}

app/Models/Country.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace OSI\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Country extends Model
+{
+    protected $guarded = [];
+}

app/Models/Email.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace OSI\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Email extends Model
+{
+    protected $guarded = ['id'];
+
+    /**
+     * Get all of the owning emailable models.
+     */
+    public function emailable()
+    {
+        return $this->morphTo();
+    }
+}

app/Models/Phone.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace OSI\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Phone extends Model
+{
+    protected $guarded = ['id'];
+
+    /**
+     * Get all of the owning phoneable models.
+     */
+    public function phoneable()
+    {
+        return $this->morphTo();
+    }
+}

app/Models/PhoneType.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace OSI\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class PhoneType extends Model
+{
+    const HOME   = 1;
+    const MOBILE = 2;
+    const OFFICE = 3;
+    const OTHER  = 4;
+}

app/Models/User.php

@@ -6,6 +6,7 @@
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use OSI\Traits\HasMediaExtended;
+use OSI\Traits\HasProfile;
 use OSI\Traits\HasSlugExtended;
 use OSI\Traits\HasThumbnail;
 use OSI\Traits\LogsActivityExtended;
@@ -14,7 +15,13 @@
 
 class User extends Authenticatable implements HasMediaConversions
 {
-    use HasMediaExtended, HasThumbnail, HasRoles, HasSlugExtended, LogsActivityExtended, Notifiable, SoftDeletes;
+    use HasProfile, HasMediaExtended, HasThumbnail, HasRoles, HasSlugExtended, LogsActivityExtended, Notifiable, SoftDeletes;
+
+    /**
+     * Guarded Field
+     * @var array
+     */
+    protected $guarded = ['id'];
 
     /**
      * Create Slug From

app/Observers/HashidsObserver.php

@@ -14,9 +14,9 @@
 class HashidsObserver
 {
     /**
-     * Listen to the created event.
+     * Listen to the creating event.
      *
-     * @param  DummyModelClass $DummyModelVariable
+     * @param  \Illuminate\Database\Eloquent\Model $model
      * @return void
      */
     public function creating(Model $model)

app/Observers/ReferenceObserver.php

@@ -14,12 +14,12 @@
 class ReferenceObserver
 {
     /**
-     * Listen to the created event.
+     * Listen to the creating event.
      *
-     * @param  Model $DummyModelVariable
+     * @param  \Illuminate\Database\Eloquent\Model $model
      * @return void
      */
-    public function created(Model $model)
+    public function creating(Model $model)
     {
         if (Schema::hasColumn($model->getTable(), 'reference') && is_null($model->reference)) {
 

app/Traits/HasProfile.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace OSI\Traits;
+
+use OSI\Traits\Morphs\Addressable;
+use OSI\Traits\Morphs\Emailable;
+use OSI\Traits\Morphs\Phoneable;
+
+/**
+ * HasProfile Trait
+ */
+trait HasProfile
+{
+    use Addressable, Emailable, Phoneable;
+}

app/Traits/Morphs/Addressable.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace OSI\Traits\Morphs;
+
+/**
+ * Addressable Trait
+ */
+trait Addressable
+{
+    /**
+     * Get all of the addresses
+     */
+    public function addresses()
+    {
+        return $this->morphMany(\OSI\Models\Address::class, 'addressable');
+    }
+}

app/Traits/Morphs/Emailable.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace OSI\Traits\Morphs;
+
+/**
+ * Emailable Trait
+ */
+trait Emailable
+{
+    /**
+     * Get all of the emails.
+     */
+    public function emails()
+    {
+        return $this->morphMany(\CLNQCDRS\Models\Email::class, 'emailable');
+    }
+}

app/Traits/Morphs/Phoneable.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace OSI\Traits\Morphs;
+
+/**
+ * Phoneable Trait
+ */
+trait Phoneable
+{
+    /**
+     * Get all of the phones.
+     */
+    public function phones()
+    {
+        return $this->morphMany(\OSI\Models\Phone::class, 'phoneable');
+    }
+}

config/auth.php

@@ -67,7 +67,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model'  => App\Models\User::class,
+            'model'  => OSI\Models\User::class,
         ],
 
         // 'users' => [

database/factories/AddressFactory.php

@@ -0,0 +1,14 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(\OSI\Models\Address::class, function (Faker $faker) {
+    return [
+        'country_id' => $faker->randomElement(range(1, 200)),
+        'primary'    => $faker->streetName,
+        'secondary'  => $faker->streetAddress,
+        'postcode'   => $faker->postcode,
+        'city'       => $faker->city,
+        'state'      => $faker->state,
+    ];
+});

database/factories/EmailFactory.php

@@ -0,0 +1,9 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(\OSI\Models\Email::class, function (Faker $faker) {
+    return [
+        'email' => $faker->companyEmail,
+    ];
+});

database/factories/PhoneFactory.php

@@ -0,0 +1,10 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(\OSI\Models\Phone::class, function (Faker $faker) {
+    return [
+        'phone_type_id' => $faker->randomElement([1, 2, 3, 4]),
+        'phone_number'  => $faker->phoneNumber,
+    ];
+});

database/factories/UserFactory.php

@@ -11,15 +11,15 @@
 | your application. Factories provide a convenient way to generate new
 | model instances for testing / seeding your application's database.
 |
-*/
+ */
 
-$factory->define(OSI\User::class, function (Faker $faker) {
+$factory->define(\OSI\Models\User::class, function (Faker $faker) {
     static $password;
 
     return [
-        'name' => $faker->name,
-        'email' => $faker->unique()->safeEmail,
-        'password' => $password ?: $password = bcrypt('secret'),
+        'name'           => $faker->name,
+        'email'          => $faker->unique()->safeEmail,
+        'password'       => $password ?: $password = bcrypt('secret'),
         'remember_token' => str_random(10),
     ];
 });

database/migrations/2017_12_23_000005_create_countries_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateCountriesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('countries', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('code');
+            $table->label();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('countries');
+    }
+}

database/migrations/2017_12_23_000009_create_phone_types_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreatePhoneTypesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('phone_types', function (Blueprint $table) {
+            $table->increments('id');
+            $table->label();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('phone_types');
+    }
+}