use numeric ids for users (#22)

* use numeric ids for users

* Apply fixes from StyleCI (#21)

Author: taylorotwell

database/migrations/2014_10_12_000000_create_users_table.php

@@ -14,7 +14,7 @@ class CreateUsersTable extends Migration
     public function up()
     {
         Schema::create('users', function (Blueprint $table) {
-            $table->uuid('id')->primary();
+            $table->id();
             $table->string('name');
             $table->string('email')->unique();
             $table->timestamp('email_verified_at')->nullable();

database/migrations/2020_05_21_100000_create_teams_table.php

@@ -15,7 +15,7 @@ public function up()
     {
         Schema::create('teams', function (Blueprint $table) {
             $table->uuid('id')->primary();
-            $table->uuid('user_id')->index();
+            $table->foreignId('user_id')->index();
             $table->string('name');
             $table->boolean('personal_team');
             $table->timestamps();

database/migrations/2020_05_21_200000_create_team_user_table.php

@@ -16,7 +16,7 @@ public function up()
         Schema::create('team_user', function (Blueprint $table) {
             $table->id();
             $table->uuid('team_id');
-            $table->uuid('user_id');
+            $table->foreignId('user_id');
             $table->string('role')->nullable();
             $table->timestamps();
 

src/Console/InstallCommand.php

@@ -103,14 +103,6 @@ protected function configureSession()
         $this->replaceInFile("'SESSION_DRIVER', 'file'", "'SESSION_DRIVER', 'database'", config_path('session.php'));
         $this->replaceInFile('SESSION_DRIVER=file', 'SESSION_DRIVER=database', base_path('.env'));
         $this->replaceInFile('SESSION_DRIVER=file', 'SESSION_DRIVER=database', base_path('.env.example'));
-
-        foreach ((new Filesystem)->files(database_path('migrations')) as $file) {
-            if (Str::contains($file->getRealPath(), 'create_sessions_table')) {
-                $this->replaceInFile("foreignId('user_id')", "uuid('user_id')", $file->getRealPath());
-
-                break;
-            }
-        }
     }
 
     /**
@@ -132,8 +124,6 @@ protected function installLivewireStack()
                     $this->output->write($output);
                 });
 
-        $this->replaceInFile('morphs', 'uuidMorphs', database_path('migrations/2019_12_14_000001_create_personal_access_tokens_table.php'));
-
         // Update Configuration...
         $this->replaceInFile('inertia', 'livewire', config_path('jetstream.php'));
         $this->replaceInFile("'guard' => 'web'", "'guard' => 'sanctum'", config_path('auth.php'));
@@ -279,8 +269,6 @@ protected function installInertiaStack()
                     $this->output->write($output);
                 });
 
-        $this->replaceInFile('morphs', 'uuidMorphs', database_path('migrations/2019_12_14_000001_create_personal_access_tokens_table.php'));
-
         // Update Configuration...
         $this->replaceInFile("'guard' => 'web'", "'guard' => 'sanctum'", config_path('auth.php'));
 

src/HasTeams.php

@@ -80,7 +80,7 @@ public function personalTeam()
      */
     public function ownsTeam($team)
     {
-        return $this->id === $team->user_id;
+        return (int) $this->id === (int) $team->user_id;
     }
 
     /**

src/Http/Controllers/Inertia/TeamMemberController.php

@@ -37,7 +37,7 @@ public function store(Request $request, $teamId)
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  string  $teamId
-     * @param  string  $userId
+     * @param  int  $userId
      * @return \Illuminate\Http\RedirectResponse
      */
     public function update(Request $request, $teamId, $userId)
@@ -57,7 +57,7 @@ public function update(Request $request, $teamId, $userId)
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  string  $teamId
-     * @param  string  $userId
+     * @param  int  $userId
      * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(Request $request, $teamId, $userId)

src/Http/Livewire/TeamMemberManager.php

@@ -56,7 +56,7 @@ class TeamMemberManager extends Component
     /**
      * The ID of the team member being removed.
      *
-     * @var string|null
+     * @var int|null
      */
     public $teamMemberIdBeingRemoved = null;
 
@@ -111,7 +111,7 @@ public function addTeamMember(AddsTeamMembers $adder)
     /**
      * Allow the given user's role to be managed.
      *
-     * @param  string  $userId
+     * @param  int  $userId
      * @return void
      */
     public function manageRole($userId)
@@ -173,7 +173,7 @@ public function leaveTeam(RemoveTeamMember $remover)
     /**
      * Confirm that the given team member should be removed.
      *
-     * @param  string  $userId
+     * @param  int  $userId
      * @return void
      */
     public function confirmTeamMemberRemoval($userId)

src/Jetstream.php

@@ -160,9 +160,9 @@ public static function hasTeamFeatures()
     /**
      * Find a user instance by the given ID.
      *
-     * @param  string  $id
+     * @param  int  $id
      */
-    public static function findUserByIdOrFail(string $id)
+    public static function findUserByIdOrFail($id)
     {
         return static::newUserModel()->where('id', $id)->firstOrFail();
     }

stubs/app/Models/User.php

@@ -5,7 +5,6 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
-use Illuminate\Support\Str;
 use Laravel\Fortify\TwoFactorAuthenticatable;
 use Laravel\Jetstream\HasProfilePhoto;
 use Laravel\Sanctum\HasApiTokens;
@@ -18,20 +17,6 @@ class User extends Authenticatable
     use Notifiable;
     use TwoFactorAuthenticatable;
 
-    /**
-     * The "type" of the primary key ID.
-     *
-     * @var string
-     */
-    protected $keyType = 'string';
-
-    /**
-     * Indicates if the IDs are auto-incrementing.
-     *
-     * @var bool
-     */
-    public $incrementing = false;
-
     /**
      * The attributes that are mass assignable.
      *
@@ -72,16 +57,4 @@ class User extends Authenticatable
     protected $appends = [
         'profile_photo_url',
     ];
-
-    /**
-     * Handle the model "booted" event.
-     *
-     * @return void
-     */
-    public static function booted()
-    {
-        static::creating(function ($model) {
-            $model->id = $model->id ?: (string) Str::orderedUuid();
-        });
-    }
 }

stubs/app/Models/UserWithTeams.php

@@ -5,7 +5,6 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
-use Illuminate\Support\Str;
 use Laravel\Fortify\TwoFactorAuthenticatable;
 use Laravel\Jetstream\HasProfilePhoto;
 use Laravel\Jetstream\HasTeams;
@@ -20,20 +19,6 @@ class User extends Authenticatable
     use Notifiable;
     use TwoFactorAuthenticatable;
 
-    /**
-     * The "type" of the primary key ID.
-     *
-     * @var string
-     */
-    protected $keyType = 'string';
-
-    /**
-     * Indicates if the IDs are auto-incrementing.
-     *
-     * @var bool
-     */
-    public $incrementing = false;
-
     /**
      * The attributes that are mass assignable.
      *
@@ -72,16 +57,4 @@ class User extends Authenticatable
     protected $appends = [
         'profile_photo_url',
     ];
-
-    /**
-     * Handle the model "booted" event.
-     *
-     * @return void
-     */
-    public static function booted()
-    {
-        static::creating(function ($model) {
-            $model->id = $model->id ?: (string) Str::orderedUuid();
-        });
-    }
 }