Commit Review Workspace ?

+ <?php
+ 
+ namespace App\Console\Commands;
+ 
+ use App\Models\User;
+ use Illuminate\Console\Command;
+ use Illuminate\Support\Facades\DB;
+ use Illuminate\Support\Facades\Schema;
+ 
+ /**
+  * Staged, safe conversion of users.id from CHAR(26) ULID to BIGINT
+  * AUTO_INCREMENT, remapping every dependent foreign-key and audit column
+  * across the schema (see safee_meet_database.sql, repo root, for the
+  * authoritative list this command's config arrays were generated from).
+  *
+  * Run in this exact order, verifying output at each step:
+  *   php artisan users:migrate-to-bigint-id --step=shadow
+  *   php artisan users:migrate-to-bigint-id --step=backfill

- 'kycStatus'          => $this->kyc_status,
- 'trustScore'         => $this->trust_score,
- 'trustTier'          => VerificationLevelResolver::fromUser($this->kyc_status, $this->trust_tier),
-             'email'              => $this->decryptValue($this->email_encrypted),
-             'phone'              => $this->decryptValue($this->phone_encrypted),
- 'isChatEnabled'      => $this->is_chat_enabled,
- 'isMeetingEnabled'   => $this->is_meeting_enabled,
- 'isSosEnabled'       => $this->is_sos_enabled,
- 'createdAt'          => $this->created_at,
- ];
- }
- 
-     private function decryptValue(?string $value): ?string
-     {
-         if (!$value) {
-             return null;
-         }
- 

+ 'kycStatus'          => $this->kyc_status,
+ 'trustScore'         => $this->trust_score,
+ 'trustTier'          => VerificationLevelResolver::fromUser($this->kyc_status, $this->trust_tier),
+             'email'              => $this->email,
+             'phone'              => $this->phone,
+ 'isChatEnabled'      => $this->is_chat_enabled,
+ 'isMeetingEnabled'   => $this->is_meeting_enabled,
+ 'isSosEnabled'       => $this->is_sos_enabled,
+ 'createdAt'          => $this->created_at,
+ ];
+ }
+ }

- protected function casts(): array
- {
- return [
- 'meeting_date' => 'date',
- 'scheduled_start_at' => 'datetime',
- 'arrived_at' => 'datetime',

+ protected function casts(): array
+ {
+ return [
+             // Keep these string-shaped in API responses regardless of the
+             // underlying users.id column type (char ULID or bigint) — the
+             // mobile client expects string ids everywhere.
+             'id' => 'string',
+             'host_user_id' => 'string',
+             'guest_user_id' => 'string',
+ 'meeting_date' => 'date',
+ 'scheduled_start_at' => 'datetime',
+ 'arrived_at' => 'datetime',

- 
- protected function casts(): array
- {
-         return ['recorded_at' => 'datetime'];
- }
- 
- protected static function booted(): void

+ 
+ protected function casts(): array
+ {
+         return [
+             'id' => 'string',
+             'user_id' => 'string',
+             'recorded_at' => 'datetime',
+         ];
+ }
+ 
+ protected static function booted(): void

- use Illuminate\Database\Eloquent\SoftDeletes;
- use Illuminate\Foundation\Auth\User as Authenticatable;
- use Illuminate\Notifications\Notifiable;
- use Illuminate\Support\Str;
- use Laravel\Sanctum\HasApiTokens;
- use App\Models\EmergencyContact;
- {
- use HasApiTokens, HasFactory, Notifiable, SoftDeletes;
- 
-     // users.id is a char(26) ULID (Firebase-based accounts), not an
-     // auto-increment integer — without this, Eloquent overwrites the id
-     // we set on create() with a bogus lastInsertId() after every insert.
-     protected $keyType = 'string';
-     public $incrementing = false;
- 
- protected static function booted(): void
- {
- // 'id' isn't mass-assignable (see $fillable below), so a plain

+ use Illuminate\Database\Eloquent\SoftDeletes;
+ use Illuminate\Foundation\Auth\User as Authenticatable;
+ use Illuminate\Notifications\Notifiable;
+ use Illuminate\Support\Facades\Schema;
+ use Illuminate\Support\Str;
+ use Laravel\Sanctum\HasApiTokens;
+ use App\Models\EmergencyContact;
+ {
+ use HasApiTokens, HasFactory, Notifiable, SoftDeletes;
+ 
+     // users.id was historically a char(26) ULID (Firebase-based accounts) on
+     // some deployments, and is being migrated to a bigint auto-increment.
+     // Detect the live column type at runtime — same pattern as
+     // Meeting::usesUlidKey()/EmergencyContact::usesUlidKey() — so this model
+     // works correctly before, during, and after that migration.
+     public function getIncrementing()
+     {
+         return !static::usesUlidKey();

- 'auth_provider'   => $identity->provider,
- 'display_name'    => $payload['name'] ?? $identity->name ?? 'SAFEE User',
- 'avatar_url'      => $identity->avatarUrl,
-                 'email_encrypted' => ($payload['email'] ?? $identity->email) ? encrypt($payload['email'] ?? $identity->email) : null,
-                 'email_hash'      => ($payload['email'] ?? $identity->email) ? hash_hmac('sha256', strtolower(trim($payload['email'] ?? $identity->email)), config('app.key')) : null,
-                 'phone_encrypted' => $identity->phone ? encrypt($identity->phone) : null,
-                 'phone_hash'      => $identity->phone ? hash_hmac('sha256', $identity->phone, config('app.key')) : null,
- 'status'          => 'active',
- 'onboarding_status' => 'completed',
- 'kyc_status'      => 'not_started',
- }
- 
- if ($email) {
-             $hash = hash_hmac('sha256', strtolower(trim($email)), config('app.key'));
-             $user = User::where('email_hash', $hash)->first();
- if ($user) return $user;
- }
- 

+ 'auth_provider'   => $identity->provider,
+ 'display_name'    => $payload['name'] ?? $identity->name ?? 'SAFEE User',
+ 'avatar_url'      => $identity->avatarUrl,
+                 // Plain columns going forward — email_encrypted/email_hash/
+                 // phone_encrypted/phone_hash are left in place (unused) for
+                 // existing rows; no encryption-at-rest at this stage.
+                 'email'           => ($payload['email'] ?? $identity->email) ? strtolower(trim($payload['email'] ?? $identity->email)) : null,
+                 'phone'           => $identity->phone,
+ 'status'          => 'active',
+ 'onboarding_status' => 'completed',
+ 'kyc_status'      => 'not_started',
+ }
+ 
+ if ($email) {
+             $user = User::where('email', strtolower(trim($email)))->first();
+ if ($user) return $user;
+ }
+ 

+ <?php
+ 
+ use Illuminate\Database\Migrations\Migration;
+ use Illuminate\Database\Schema\Blueprint;
+ use Illuminate\Support\Facades\Schema;
+ 
+ return new class extends Migration
+ {
+     /**
+      * Adds a plain lookup `email` column (replacing email_encrypted/email_hash
+      * as the primary lookup going forward — those stay in place, unused, not
+      * dropped) plus a few lifecycle/account-state columns. Additive only.
+      */
+     public function up(): void
+     {
+         Schema::table('users', function (Blueprint $table): void {
+             if (!Schema::hasColumn('users', 'email')) {
+                 $table->string('email')->nullable()->unique();