Skip to content

Commit 71b67f1

Browse files
committed
use incrementing ids for team ids
1 parent 49e57d4 commit 71b67f1

File tree

7 files changed

+13
-39
lines changed

7 files changed

+13
-39
lines changed

database/migrations/2020_05_21_100000_create_teams_table.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class CreateTeamsTable extends Migration
1414
public function up()
1515
{
1616
Schema::create('teams', function (Blueprint $table) {
17-
$table->uuid('id')->primary();
17+
$table->id();
1818
$table->foreignId('user_id')->index();
1919
$table->string('name');
2020
$table->boolean('personal_team');

database/migrations/2020_05_21_200000_create_team_user_table.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public function up()
1515
{
1616
Schema::create('team_user', function (Blueprint $table) {
1717
$table->id();
18-
$table->uuid('team_id');
18+
$table->foreignId('team_id');
1919
$table->foreignId('user_id');
2020
$table->string('role')->nullable();
2121
$table->timestamps();

src/Http/Controllers/Inertia/TeamController.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ class TeamController extends Controller
1818
* Show the team management screen.
1919
*
2020
* @param \Illuminate\Http\Request $request
21-
* @param string $teamId
21+
* @param mixed $teamId
2222
* @return \Inertia\Response
2323
*/
24-
public function show(Request $request, string $teamId)
24+
public function show(Request $request, $teamId)
2525
{
2626
$team = Jetstream::newTeamModel()->findOrFail($teamId);
2727

@@ -71,10 +71,10 @@ public function store(Request $request)
7171
* Update the given team's name.
7272
*
7373
* @param \Illuminate\Http\Request $request
74-
* @param string $teamId
74+
* @param mixed $teamId
7575
* @return \Illuminate\Http\RedirectResponse
7676
*/
77-
public function update(Request $request, string $teamId)
77+
public function update(Request $request, $teamId)
7878
{
7979
$team = Jetstream::newTeamModel()->findOrFail($teamId);
8080

@@ -87,10 +87,10 @@ public function update(Request $request, string $teamId)
8787
* Delete the given team.
8888
*
8989
* @param \Illuminate\Http\Request $request
90-
* @param string $teamId
90+
* @param mixed $teamId
9191
* @return \Illuminate\Http\RedirectResponse
9292
*/
93-
public function destroy(Request $request, string $teamId)
93+
public function destroy(Request $request, $teamId)
9494
{
9595
$team = Jetstream::newTeamModel()->findOrFail($teamId);
9696

src/Http/Controllers/Inertia/TeamMemberController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class TeamMemberController extends Controller
1515
* Add a new team member to a team.
1616
*
1717
* @param \Illuminate\Http\Request $request
18-
* @param string $teamId
18+
* @param mixed $teamId
1919
* @return \Illuminate\Http\RedirectResponse
2020
*/
2121
public function store(Request $request, $teamId)
@@ -36,7 +36,7 @@ public function store(Request $request, $teamId)
3636
* Update the given team member's role.
3737
*
3838
* @param \Illuminate\Http\Request $request
39-
* @param string $teamId
39+
* @param mixed $teamId
4040
* @param int $userId
4141
* @return \Illuminate\Http\RedirectResponse
4242
*/
@@ -56,7 +56,7 @@ public function update(Request $request, $teamId, $userId)
5656
* Remove the given user from the given team.
5757
*
5858
* @param \Illuminate\Http\Request $request
59-
* @param string $teamId
59+
* @param mixed $teamId
6060
* @param int $userId
6161
* @return \Illuminate\Http\RedirectResponse
6262
*/

src/Http/Controllers/Livewire/TeamController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ class TeamController extends Controller
1212
* Show the team management screen.
1313
*
1414
* @param \Illuminate\Http\Request $request
15-
* @param string $teamId
15+
* @param mixed $teamId
1616
* @return \Illuminate\View\View
1717
*/
18-
public function show(Request $request, string $teamId)
18+
public function show(Request $request, $teamId)
1919
{
2020
$team = Jetstream::newTeamModel()->findOrFail($teamId);
2121

src/Team.php

-14
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@
66

77
abstract class Team extends Model
88
{
9-
/**
10-
* The "type" of the primary key ID.
11-
*
12-
* @var string
13-
*/
14-
protected $keyType = 'string';
15-
16-
/**
17-
* Indicates if the IDs are auto-incrementing.
18-
*
19-
* @var bool
20-
*/
21-
public $incrementing = false;
22-
239
/**
2410
* Get the owner of the team.
2511
*/

stubs/app/Models/Team.php

-12
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,4 @@ class Team extends JetstreamTeam
4040
'updated' => TeamUpdated::class,
4141
'deleted' => TeamDeleted::class,
4242
];
43-
44-
/**
45-
* Handle the model "booted" event.
46-
*
47-
* @return void
48-
*/
49-
public static function booted()
50-
{
51-
static::creating(function ($model) {
52-
$model->id = $model->id ?: (string) Str::orderedUuid();
53-
});
54-
}
5543
}

0 commit comments

Comments
 (0)