Rename twitter_handle field

Author: joedixon

app/Http/Requests/UpdateProfileRequest.php

@@ -12,7 +12,7 @@ public function rules()
             'name' => 'required|max:255',
             'email' => 'required|email|max:255|unique:users,email,'.Auth::id(),
             'username' => 'required|alpha_dash|max:255|unique:users,username,'.Auth::id(),
-            'twitter_handle' => 'max:255|nullable|unique:users,twitter_handle,'.Auth::id(),
+            'twitter' => 'max:255|nullable|unique:users,twitter,'.Auth::id(),
             'bio' => 'max:160',
         ];
     }
@@ -39,6 +39,6 @@ public function username(): string
 
     public function twitterHandle(): ?string
     {
-        return $this->get('twitter_handle');
+        return $this->get('twitter');
     }
 }

app/Jobs/UpdateProfile.php

@@ -22,7 +22,7 @@ final class UpdateProfile
     public function __construct(User $user, array $attributes = [])
     {
         $this->user = $user;
-        $this->attributes = Arr::only($attributes, ['name', 'email', 'username', 'github_username', 'bio', 'twitter_handle']);
+        $this->attributes = Arr::only($attributes, ['name', 'email', 'username', 'github_username', 'bio', 'twitter']);
     }
 
     public static function fromRequest(User $user, UpdateProfileRequest $request): self
@@ -32,7 +32,7 @@ public static function fromRequest(User $user, UpdateProfileRequest $request): s
             'email' => $request->email(),
             'username' => strtolower($request->username()),
             'bio' => trim(strip_tags($request->bio())),
-            'twitter_handle' => $request->twitterHandle(),
+            'twitter' => $request->twitterHandle(),
         ]);
     }
 

app/User.php

@@ -39,7 +39,7 @@ final class User extends Authenticatable implements MustVerifyEmail
     protected $fillable = [
         'name',
         'email',
-        'twitter_handle',
+        'twitter',
         'username',
         'password',
         'ip',
@@ -87,7 +87,7 @@ public function githubUsername(): string
 
     public function twitterHandle(): ?string
     {
-        return $this->twitter_handle;
+        return $this->twitter;
     }
 
     public function gravatarUrl($size = 100): string

database/migrations/2020_07_16_185353_update_articles_table_add_shared_at_field.php renamed to database/migrations/2020_07_16_185353_update_articles_and_users_tables_to_include_share_information.php

@@ -4,12 +4,16 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class UpdateArticlesTableAddSharedAtField extends Migration
+class UpdateArticlesAndUsersTablesToIncludeShareInformation extends Migration
 {
     public function up()
     {
         Schema::table('articles', function (Blueprint $table) {
             $table->dateTime('shared_at')->after('approved_at')->nullable();
         });
+
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('twitter')->after('email')->nullable();
+        });
     }
 }

database/migrations/2020_07_18_122946_update_users_table_add_twitter_handle_field.php

@@ -27,13 +27,13 @@ public function users_can_update_their_profile()
                 'name' => 'Freek Murze',
                 'email' => 'freek@example.com',
                 'username' => 'freekmurze',
-                'twitter_handle' => 'freek-murze',
+                'twitter' => 'freektwitter',
                 'bio' => 'My bio',
             ])
             ->seePageIs('/settings')
             ->see('Freek Murze')
             ->see('freekmurze')
-            ->see('freek-murze')
+            ->see('freektwitter')
             ->see('Settings successfully saved!')
             ->see('My bio');
     }
@@ -113,9 +113,9 @@ public function users_can_set_their_password_when_they_have_none_set_yet()
     }
 
     /** @test */
-    public function twitter_handle_is_optional()
+    public function twitter_is_optional()
     {
-        $user = $this->createUser(['email' => 'freek@example.com', 'username' => 'freekmurze', 'twitter_handle' => 'freek-murze']);
+        $user = $this->createUser(['email' => 'freek@example.com', 'username' => 'freekmurze', 'twitter' => 'freektwitter']);
 
         $this->loginAs($user);
 
@@ -124,10 +124,10 @@ public function twitter_handle_is_optional()
                 'name' => 'Freek Murze',
                 'email' => 'freek@example.com',
                 'username' => 'freekmurze',
-                'twitter_handle' => '',
+                'twitter' => '',
             ])
             ->seePageIs('/settings')
-            ->dontSee('freek-murze');
+            ->dontSee('freektwitter');
 
         $this->assertNull($user->fresh()->twitterHandle());
     }

tests/Feature/SettingsTest.php

@@ -38,8 +38,10 @@ public function published_articles_can_be_shared_on_twitter()
             PostArticleToTwitterNotification::class,
             function ($notification, $channels, $notifiable) use ($article) {
                 $tweet = $notification->generateTweet();
-                return Str::contains($tweet, 'My First Article') &&
-                Str::contains($tweet, route('articles.show', $article->slug()));
+                return (
+                    Str::contains($tweet, 'My First Article') &&
+                    Str::contains($tweet, route('articles.show', $article->slug()))
+                );
             }
         );
 
@@ -50,7 +52,7 @@ function ($notification, $channels, $notifiable) use ($article) {
     public function articles_are_shared_with_twitter_handle()
     {
         $user = $this->createUser([
-            'twitter_handle' => '_joedixon',
+            'twitter' => '_joedixon',
         ]);
 
         factory(Article::class)->create([