change users.first_name and users.last_name to just users.name

Author: cmgmyr

src/Cmgmyr/Messenger/Models/Thread.php

@@ -205,7 +205,7 @@ public function activateAllParticipants()
      * @param array $columns
      * @return string
      */
-    public function participantsString($userId=null, $columns=['first_name', 'last_name'])
+    public function participantsString($userId=null, $columns=['name'])
     {
         $selectString = $this->createSelectString($columns);
 

src/Cmgmyr/Messenger/examples/create_users_table.php

@@ -14,8 +14,7 @@ public function up()
     {
         Schema::create('users', function (Blueprint $table) {
             $table->increments('id')->unsigned();
-            $table->string('first_name');
-            $table->string('last_name');
+            $table->string('name');
             $table->string('email')->unique();
             $table->enum('notify', ['y', 'n'])->default('y');
             $table->timestamps();

src/Cmgmyr/Messenger/examples/views/create.blade.php

@@ -19,7 +19,7 @@
     @if($users->count() > 0)
     <div class="checkbox">
         @foreach($users as $user)
-            <label title="{{$user->first_name}} {{$user->last_name}}"><input type="checkbox" name="recipients[]" value="{{$user->id}}">{{$user->first_name}}</label>
+            <label title="{{$user->name}}"><input type="checkbox" name="recipients[]" value="{{$user->id}}">{{$user->name}}</label>
         @endforeach
     </div>
     @endif

src/Cmgmyr/Messenger/examples/views/show.blade.php

@@ -7,10 +7,10 @@
         @foreach($thread->messages as $message)
             <div class="media">
                 <a class="pull-left" href="#">
-                    <img src="//www.gravatar.com/avatar/{{$message->user->email}}?s=64" alt="{{$message->user->first_name}}" class="img-circle">
+                    <img src="//www.gravatar.com/avatar/{{$message->user->email}}?s=64" alt="{{$message->user->name}}" class="img-circle">
                 </a>
                 <div class="media-body">
-                    <h5 class="media-heading">{{$message->user->first_name}} {{$message->user->last_name}}</h5>
+                    <h5 class="media-heading">{{$message->user->name}}</h5>
                     <p>{{$message->body}}</p>
                     <div class="text-muted"><small>Posted {{$message->created_at->diffForHumans()}}</small></div>
                 </div>
@@ -27,7 +27,7 @@
         @if($users->count() > 0)
         <div class="checkbox">
             @foreach($users as $user)
-                <label title="{{$user->first_name}} {{$user->last_name}}"><input type="checkbox" name="recipients[]" value="{{$user->id}}">{{$user->first_name}}</label>
+                <label title="{{$user->name}}"><input type="checkbox" name="recipients[]" value="{{$user->id}}">{{$user->name}}</label>
             @endforeach
         </div>
         @endif

tests/EloquentThreadTest.php

@@ -222,13 +222,9 @@ public function it_should_generate_participant_select_string()
         $select = $method->invokeArgs($thread, [$columns]);
         $this->assertEquals("(" . Eloquent::getConnectionResolver()->getTablePrefix() . "users.name) as name", $select);
 
-        $columns = ['first_name', 'last_name'];
+        $columns = ['name', 'email'];
         $select = $method->invokeArgs($thread, [$columns]);
-        $this->assertEquals("(" . Eloquent::getConnectionResolver()->getTablePrefix() . "users.first_name || ' ' || " . Eloquent::getConnectionResolver()->getTablePrefix() . "users.last_name) as name", $select);
-
-        $columns = ['first_name', 'last_name', 'email'];
-        $select = $method->invokeArgs($thread, [$columns]);
-        $this->assertEquals("(" . Eloquent::getConnectionResolver()->getTablePrefix() . "users.first_name || ' ' || " . Eloquent::getConnectionResolver()->getTablePrefix() . "users.last_name || ' ' || " . Eloquent::getConnectionResolver()->getTablePrefix() . "users.email) as name", $select);
+        $this->assertEquals("(" . Eloquent::getConnectionResolver()->getTablePrefix() . "users.name || ' ' || " . Eloquent::getConnectionResolver()->getTablePrefix() . "users.email) as name", $select);
     }
 
     /** @test */
@@ -248,7 +244,7 @@ public function it_should_get_participants_string()
         $string = $thread->participantsString(1);
         $this->assertEquals("Adam Wathan, Taylor Otwell", $string);
 
-        $string = $thread->participantsString(1, ['first_name']);
-        $this->assertEquals("Adam, Taylor", $string);
+        $string = $thread->participantsString(1, ['email']);
+        $this->assertEquals("[email protected], [email protected]", $string);
     }
 }

tests/MessagableTraitTest.php

@@ -17,8 +17,7 @@ public function it_should_get_all_threads_with_new_messages()
     {
         $user = User::create(
             [
-                'first_name' => 'John',
-                'last_name' => 'Doe',
+                'name' => 'John Doe',
                 'email' => '[email protected]',
                 'notify' => 'y'
             ]
@@ -53,5 +52,5 @@ class User extends Eloquent
 
     protected $table = 'users';
 
-    protected $fillable = ['first_name', 'last_name', 'email', 'notify'];
+    protected $fillable = ['name', 'email', 'notify'];
 }

tests/TestCase.php

@@ -68,8 +68,7 @@ private function createUsersTable()
             'users',
             function ($table) {
                 $table->increments('id');
-                $table->string('first_name');
-                $table->string('last_name');
+                $table->string('name');
                 $table->string('email')->unique();
                 $table->enum('notify', ['y', 'n'])->default('y');
                 $table->timestamps();
@@ -82,9 +81,9 @@ function ($table) {
      */
     private function seedUsersTable()
     {
-        DB::insert('INSERT INTO ' . DB::getTablePrefix() . 'users (id, first_name, last_name, email, created_at, updated_at) VALUES (?, ?, ?, ?, datetime(), datetime())', [1, 'Chris', 'Gmyr', '[email protected]']);
-        DB::insert('INSERT INTO ' . DB::getTablePrefix() . 'users (id, first_name, last_name, email, created_at, updated_at) VALUES (?, ?, ?, ?, datetime(), datetime())', [2, 'Adam', 'Wathan', '[email protected]']);
-        DB::insert('INSERT INTO ' . DB::getTablePrefix() . 'users (id, first_name, last_name, email, created_at, updated_at) VALUES (?, ?, ?, ?, datetime(), datetime())', [3, 'Taylor', 'Otwell', '[email protected]']);
+        DB::insert('INSERT INTO ' . DB::getTablePrefix() . 'users (id, name, email, created_at, updated_at) VALUES (?, ?, ?, datetime(), datetime())', [1, 'Chris Gmyr', '[email protected]']);
+        DB::insert('INSERT INTO ' . DB::getTablePrefix() . 'users (id, name, email, created_at, updated_at) VALUES (?, ?, ?, datetime(), datetime())', [2, 'Adam Wathan', '[email protected]']);
+        DB::insert('INSERT INTO ' . DB::getTablePrefix() . 'users (id, name, email, created_at, updated_at) VALUES (?, ?, ?, datetime(), datetime())', [3, 'Taylor Otwell', '[email protected]']);
     }
 
     /**