admin
bb2c574f5c
Backend models + DB: - Adds tenant_id to 13 more parent tables: service_areas, routes, collection_teams, trucks, trips, qr_code_batches, qr_codes, collection_logs, dumpsite_releases, payments, daily_collection_stats, weekly_route_performance, monthly_store_sales. Child tables (route_stops, trip_stops, team_members, truck_location_history, etc.) inherit scoping via their parent relation — they aren't queried directly in production code. - HasTenant trait applied to all 13 models, plus tenant_id added to each fillable. Creating any one of these now auto-fills tenant_id from Tenancy::current(). - BatchGenerator's bulk QrCode insert was bypassing model events (and therefore the HasTenant creating hook). Now sets tenant_id inline from the just-created batch's tenant_id, which itself goes through the trait. Fixes "0 codes returned for resident in same tenant" regression. Backfill: - SanPascualTenantSeeder extended to backfill all 18 tenant-aware tables. Idempotent — only updates rows where tenant_id is null. Production live data: backfilled 1 route, 1 team, 1 truck, 3 trips, 1 batch, 200 codes, 5 collection logs. Tests: - TestCase base now creates a default "TEST-LGU" tenant in setUp, sets it as Tenancy::current(), and attaches X-Tenant-Code on every JSON request. Tear-down clears the tenant. - UserFactory defaults tenant_id to Tenancy::current()->id, so factory-created users land in the test tenant. - Net result: 202 tests still passing, no per-test changes required. Phase A scope (5 tables) + Phase B scope (13 tables) = 18 of the ~22 tenant-aware tables. The remaining child tables (route_stops, trip_stops, team_members, truck_location_history, household_members, trip_timeline_events, store_purchases, store_sales) are scoped implicitly through their parent. What's still un-tenant-aware: - Admin web (Blade-based) — single-tenant context for now - Driver/scanner endpoints — they currently rely on the bearer token's user.tenant_id, which works correctly via ResolveTenant's fallback. No action needed. - Super-admin onboarding UI — Phase C. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
67 lines
1.6 KiB
PHP
67 lines
1.6 KiB
PHP
<?php
|
|
|
|
namespace App\Models;
|
|
|
|
use App\Tenancy\HasTenant;
|
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
|
use Illuminate\Database\Eloquent\Model;
|
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
|
use Illuminate\Database\Eloquent\SoftDeletes;
|
|
use Illuminate\Support\Str;
|
|
|
|
class CollectionTeam extends Model
|
|
{
|
|
use HasFactory, HasTenant, SoftDeletes;
|
|
|
|
public const STATUS_ACTIVE = 'active';
|
|
public const STATUS_INACTIVE = 'inactive';
|
|
|
|
protected $fillable = [
|
|
'uuid', 'tenant_id', 'name', 'area_id', 'driver_id', 'scanner_id', 'truck_id',
|
|
'status', 'notes',
|
|
];
|
|
|
|
public function getRouteKeyName(): string
|
|
{
|
|
return 'uuid';
|
|
}
|
|
|
|
protected static function booted(): void
|
|
{
|
|
static::creating(function (self $t): void {
|
|
if (empty($t->uuid)) $t->uuid = (string) Str::uuid();
|
|
});
|
|
}
|
|
|
|
public function area(): BelongsTo
|
|
{
|
|
return $this->belongsTo(ServiceArea::class, 'area_id');
|
|
}
|
|
|
|
public function driver(): BelongsTo
|
|
{
|
|
return $this->belongsTo(User::class, 'driver_id');
|
|
}
|
|
|
|
public function scanner(): BelongsTo
|
|
{
|
|
return $this->belongsTo(User::class, 'scanner_id');
|
|
}
|
|
|
|
public function truck(): BelongsTo
|
|
{
|
|
return $this->belongsTo(Truck::class, 'truck_id');
|
|
}
|
|
|
|
public function members(): HasMany
|
|
{
|
|
return $this->hasMany(TeamMember::class, 'team_id');
|
|
}
|
|
|
|
public function helpers(): HasMany
|
|
{
|
|
return $this->members()->where('role_in_team', TeamMember::ROLE_HELPER);
|
|
}
|
|
}
|