Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/Jobs/UserCreateJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

namespace App\Jobs;

use App\TermOfUseVersion;
use App\User;
use App\UserTermOfUseAcceptance;
use Illuminate\Support\Facades\Hash;

class UserCreateJob extends Job {
Expand Down Expand Up @@ -30,6 +32,12 @@ public function handle() {
'verified' => $this->verified,
]);

UserTermOfUseAcceptance::create([
'user_id' => $user->id,
'tou_version' => TermOfUseVersion::latest(),
'tou_accepted_at' => now(),
]);

return $user;
}
}
26 changes: 26 additions & 0 deletions app/TermOfUseVersion.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

namespace App;

enum TermOfUseVersion: string {
// case V2 = 'yyyy-mm-dd';
// case V1 = 'yyyy-mm-dd';
case v0 = '2025-08-21';

public static function latest(): self {
$latestVersion = self::v0;
$latestNum = 0;
foreach (self::cases() as $case) {
if (!str_starts_with($case->name, 'v')) {
continue;
}
$n = (int) substr($case->name, 1);
if ($n > $latestNum) {
$latestNum = $n;
$latestVersion = $case;
}
}

return $latestVersion;
}
}
4 changes: 4 additions & 0 deletions app/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ public function managesWikis(): \Illuminate\Database\Eloquent\Relations\BelongsT
return $this->belongsToMany(Wiki::class, 'wiki_managers');
}

public function touAcceptances(): \Illuminate\Database\Eloquent\Relations\BelongsToMany {
return $this->belongsToMany(UserTermOfUseAcceptance::class, 'tou_acceptances');
}

public function hasVerifiedEmail() {
return (bool) $this->verified;
}
Expand Down
27 changes: 27 additions & 0 deletions app/UserTermOfUseAcceptance.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

namespace App;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;

class UserTermOfUseAcceptance extends Model {
use HasFactory;

const FIELDS = [
'user_id',
'tou_version',
'tou_accepted_at',
];

protected $fillable = self::FIELDS;

protected $visible = self::FIELDS;

protected $casts = [
'tou_version' => TermOfUseVersion::class,
'tou_accepted_at' => 'datetime',
];

protected $table = 'tou_acceptances';
}
29 changes: 29 additions & 0 deletions database/migrations/2025_09_29_194758_tou_acceptances.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void {
Schema::create('tou_acceptances', function (Blueprint $table) {
$table->id();
$table->unsignedInteger('user_id');
$table->string('tou_version', 10);
$table->timestamp('tou_accepted_at');
$table->timestamps();
$table->unique(['user_id', 'tou_version']);
$table->foreign('user_id')->references('id')->on('users')->cascadeOnDelete();
});
}

/**
* Reverse the migrations.
*/
public function down(): void {
Schema::dropIfExists('tou_acceptances');
}
};
31 changes: 31 additions & 0 deletions tests/Routes/User/UserTermOfUseAcceptanceTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php

namespace Tests\Routes\User;

use App\Jobs\UserCreateJob;
use App\TermOfUseVersion;
use App\UserTermOfUseAcceptance;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;

class UserTermOfUseAcceptanceTest extends TestCase {
use RefreshDatabase;

public function testUserCreationCreatesTouAcceptance(): void {
$email = 'test+' . uniqid('', true) . '@example.com';
$user = (new UserCreateJob($email, 'thisisapassword123', true))->handle();

$this->assertDatabaseHas('tou_acceptances', [
'user_id' => $user->id,
'tou_version' => TermOfUseVersion::latest()->value,
]);

$rows = UserTermOfUseAcceptance::where('user_id', $user->id)->get();
$this->assertCount(1, $rows);
$acceptance = $rows->first();

$this->assertInstanceOf(TermOfUseVersion::class, $acceptance->tou_version);
$this->assertSame(TermOfUseVersion::latest(), $acceptance->tou_version);
$this->assertNotNull($acceptance->tou_accepted_at);
}
}
Loading