- **Sentry** wired in bootstrap/app.php via Sentry\Laravel\Integration.
No-op when SENTRY_LARAVEL_DSN is empty.
- **Audit logging** broadened: LogsActivity applied to Household, QrCode,
Trip, Payment with tight logOnly whitelists and named log channels
('household', 'qr_code', 'trip', 'payment') to keep the activity
stream useful.
- **Bulk admin actions**:
POST /admin/households/bulk-approve — skips already-approved /
no-proof / unknown ids, reports per-id outcomes
POST /admin/bulk/users/{suspend,activate} — admins protected
POST /admin/bulk/qr-codes/void — respects state machine transitions
- **FCM push scaffold**: PushDriver contract with LogPushDriver
(default) and FcmPushDriver (activates when FCM_SERVER_KEY is set).
PushChannel adapts notifications. RoutesByPreferences now also
routes via push when push_enabled + fcm_token. toPush() payloads
added to HouseholdApproved / QrBalanceLow / PickupImminent.
- **Reverb WebSocket broadcast**: laravel/reverb installed.
TruckLocationBroadcast fires on every TruckTracker::record().
routes/channels.php authenticates: admins → private-admin.live,
residents → area.{id}.trucks (only if their household barangay is
covered by the service area).
- **PSGC seeder** expanded: all 17 PH regions, 4 NCR districts,
all 17 NCR cities. Sample barangays still carry rectangular
boundaries for point-in-polygon resolution tests.
- **Conditional SPATIAL INDEX migration** for barangays.boundary —
safe no-op until every row has a polygon (i.e., after full PSA
dataset import). Re-running `php artisan migrate` after import
flips the column to NOT NULL and adds the index.
196 feature tests passing.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
104 lines
3.0 KiB
PHP
104 lines
3.0 KiB
PHP
<?php
|
|
|
|
namespace App\Models;
|
|
|
|
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;
|
|
use Spatie\Activitylog\LogOptions;
|
|
use Spatie\Activitylog\Traits\LogsActivity;
|
|
|
|
class Trip extends Model
|
|
{
|
|
use HasFactory, LogsActivity, SoftDeletes;
|
|
|
|
public const STATUS_SCHEDULED = 'scheduled';
|
|
public const STATUS_IN_PROGRESS = 'in_progress';
|
|
public const STATUS_AT_DUMPSITE = 'at_dumpsite';
|
|
public const STATUS_COMPLETED = 'completed';
|
|
public const STATUS_CANCELLED = 'cancelled';
|
|
|
|
protected $fillable = [
|
|
'uuid', 'trip_number', 'route_id', 'team_id', 'truck_id', 'dumpsite_id',
|
|
'scheduled_date', 'scheduled_start_time',
|
|
'actual_start_time', 'actual_end_time',
|
|
'dumpsite_arrival_time', 'dumpsite_departure_time',
|
|
'status', 'total_load_kg', 'notes', 'created_by_admin_id',
|
|
];
|
|
|
|
protected function casts(): array
|
|
{
|
|
return [
|
|
'scheduled_date' => 'date',
|
|
'actual_start_time' => 'datetime',
|
|
'actual_end_time' => 'datetime',
|
|
'dumpsite_arrival_time' => 'datetime',
|
|
'dumpsite_departure_time' => 'datetime',
|
|
];
|
|
}
|
|
|
|
public function getRouteKeyName(): string
|
|
{
|
|
return 'uuid';
|
|
}
|
|
|
|
public function getActivitylogOptions(): LogOptions
|
|
{
|
|
return LogOptions::defaults()
|
|
->logOnly(['status', 'team_id', 'truck_id', 'scheduled_date', 'total_load_kg'])
|
|
->logOnlyDirty()
|
|
->dontSubmitEmptyLogs()
|
|
->useLogName('trip');
|
|
}
|
|
|
|
protected static function booted(): void
|
|
{
|
|
static::creating(function (self $t): void {
|
|
if (empty($t->uuid)) $t->uuid = (string) Str::uuid();
|
|
if (empty($t->trip_number)) {
|
|
$date = ($t->scheduled_date ? \Carbon\Carbon::parse($t->scheduled_date) : now())->format('Ymd');
|
|
$seq = self::where('trip_number', 'like', "TRIP-{$date}-%")->count() + 1;
|
|
$t->trip_number = sprintf('TRIP-%s-%03d', $date, $seq);
|
|
}
|
|
});
|
|
}
|
|
|
|
public function route(): BelongsTo
|
|
{
|
|
return $this->belongsTo(\App\Models\Route::class);
|
|
}
|
|
|
|
public function team(): BelongsTo
|
|
{
|
|
return $this->belongsTo(CollectionTeam::class, 'team_id');
|
|
}
|
|
|
|
public function truck(): BelongsTo
|
|
{
|
|
return $this->belongsTo(Truck::class);
|
|
}
|
|
|
|
public function dumpsite(): BelongsTo
|
|
{
|
|
return $this->belongsTo(Dumpsite::class);
|
|
}
|
|
|
|
public function stops(): HasMany
|
|
{
|
|
return $this->hasMany(TripStop::class)->orderBy('sequence');
|
|
}
|
|
|
|
public function timelineEvents(): HasMany
|
|
{
|
|
return $this->hasMany(TripTimelineEvent::class)->orderBy('event_at');
|
|
}
|
|
|
|
public function dumpsiteReleases(): HasMany
|
|
{
|
|
return $this->hasMany(DumpsiteRelease::class);
|
|
}
|
|
}
|