Skip to content

Commit 8ffed30

Browse files
claudeclaude
committed
fix(phase-20): fix audit_log migration to add columns not recreate table
The Phase 20 migration was dropping and recreating audit_logs, removing the original 'event' column and missing auditable_label/url/module columns. Now adds only the missing columns (action, auditable_label, url, module) to preserve backward compatibility with existing audit log tests. AuditLogObserver and LogsActivity trait now write both 'event' and 'action' fields to ensure compatibility with both old and new code paths. All 2424 tests pass. Co-Authored-By: Claude <noreply@anthropic.com>
1 parent a880eae commit 8ffed30

4 files changed

Lines changed: 84 additions & 33 deletions

File tree

‎erp/app/Modules/Core/Models/AuditLog.php‎

Lines changed: 49 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,44 @@
44

55
use Illuminate\Database\Eloquent\Model;
66
use Illuminate\Database\Eloquent\Relations\BelongsTo;
7+
use Illuminate\Database\Eloquent\Relations\MorphTo;
78

89
class AuditLog extends Model
910
{
11+
public const UPDATED_AT = null;
12+
13+
public $timestamps = false;
14+
1015
protected $fillable = [
11-
'tenant_id',
1216
'user_id',
17+
'tenant_id',
18+
'event',
1319
'action',
1420
'auditable_type',
1521
'auditable_id',
22+
'auditable_label',
1623
'old_values',
1724
'new_values',
1825
'ip_address',
1926
'user_agent',
27+
'url',
28+
'module',
29+
'created_at',
2030
];
2131

2232
protected $casts = [
23-
'old_values' => 'array',
24-
'new_values' => 'array',
33+
'old_values' => 'array',
34+
'new_values' => 'array',
35+
'created_at' => 'datetime',
2536
];
2637

38+
protected $dates = ['created_at'];
39+
40+
public function auditable(): MorphTo
41+
{
42+
return $this->morphTo();
43+
}
44+
2745
public function user(): BelongsTo
2846
{
2947
return $this->belongsTo(\App\Models\User::class);
@@ -37,11 +55,15 @@ public function tenant(): BelongsTo
3755
/**
3856
* Record an audit log entry.
3957
*
40-
* @param string $action
41-
* @param Model|null $model
42-
* @param array $oldValues
43-
* @param array $newValues
44-
* @param mixed $moduleOrTenantId ignored (kept for backward compat)
58+
* Supports two call styles:
59+
* record(string $action, $model, array $old, array $new, string $module) -- new style
60+
* record(string $event, $model, array $old, array $new, int $tenantId) -- legacy style
61+
*
62+
* @param string $action
63+
* @param Model|null $model
64+
* @param array $oldValues
65+
* @param array $newValues
66+
* @param string|int|null $moduleOrTenantId
4567
* @return static
4668
*/
4769
public static function record(
@@ -52,25 +74,33 @@ public static function record(
5274
$moduleOrTenantId = null
5375
): static {
5476
$tenantId = null;
77+
$module = '';
5578

5679
if (is_int($moduleOrTenantId)) {
5780
$tenantId = $moduleOrTenantId;
81+
} elseif (is_string($moduleOrTenantId)) {
82+
$module = $moduleOrTenantId;
5883
}
5984

6085
if ($tenantId === null) {
61-
$tenantId = $model->tenant_id ?? auth()->user()?->tenant_id ?? 0;
86+
$tenantId = auth()->user()?->tenant_id ?? 0;
6287
}
6388

6489
return static::create([
65-
'tenant_id' => $tenantId,
66-
'user_id' => auth()->id(),
67-
'action' => $action,
68-
'auditable_type' => $model ? get_class($model) : null,
69-
'auditable_id' => $model?->getKey(),
70-
'old_values' => $oldValues ?: null,
71-
'new_values' => $newValues ?: null,
72-
'ip_address' => request()?->ip(),
73-
'user_agent' => request()?->userAgent(),
90+
'tenant_id' => $tenantId,
91+
'user_id' => auth()->id(),
92+
'event' => $action,
93+
'action' => $action,
94+
'auditable_type' => $model ? get_class($model) : null,
95+
'auditable_id' => $model?->getKey(),
96+
'auditable_label' => $model?->name ?? $model?->title ?? $model?->subject ?? null,
97+
'old_values' => $oldValues ?: null,
98+
'new_values' => $newValues ?: null,
99+
'ip_address' => request()?->ip(),
100+
'user_agent' => request()?->userAgent(),
101+
'url' => request()?->fullUrl(),
102+
'module' => $module,
103+
'created_at' => now(),
74104
]);
75105
}
76106

@@ -92,6 +122,6 @@ public function getChangeSummaryAttribute(): string
92122
return implode(', ', $changedKeys) . ' changed';
93123
}
94124

95-
return $this->action ?? '';
125+
return $this->action ?? $this->event ?? '';
96126
}
97127
}

‎erp/app/Modules/Core/Observers/AuditLogObserver.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ private function log(string $action, Model $model, array $old, array $new): void
3737
AuditLog::create([
3838
'user_id' => Auth::id(),
3939
'tenant_id' => $tenantId,
40+
'event' => $action,
4041
'action' => $action,
4142
'auditable_type' => get_class($model),
4243
'auditable_id' => $model->getKey(),

‎erp/app/Traits/LogsActivity.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ protected static function logActivity($model, string $action, array $oldValues,
3030
AuditLog::create([
3131
'tenant_id' => $tenantId,
3232
'user_id' => Auth::id(),
33+
'event' => $action,
3334
'action' => $action,
3435
'auditable_type' => get_class($model),
3536
'auditable_id' => $model->id,

‎erp/database/migrations/2026_06_19_000001_create_audit_logs_table.php‎

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,48 @@
11
<?php
2+
23
use Illuminate\Database\Migrations\Migration;
34
use Illuminate\Database\Schema\Blueprint;
45
use Illuminate\Support\Facades\Schema;
56

67
return new class extends Migration {
78
public function up(): void
89
{
9-
Schema::dropIfExists('audit_logs');
10-
Schema::create('audit_logs', function (Blueprint $table) {
11-
$table->id();
12-
$table->unsignedBigInteger('tenant_id')->index();
13-
$table->unsignedBigInteger('user_id')->nullable();
14-
$table->string('action'); // created, updated, deleted, viewed
15-
$table->string('auditable_type');
16-
$table->unsignedBigInteger('auditable_id');
17-
$table->json('old_values')->nullable();
18-
$table->json('new_values')->nullable();
19-
$table->string('ip_address', 45)->nullable();
20-
$table->string('user_agent')->nullable();
21-
$table->timestamps();
10+
// Add columns to audit_logs that were missing from the 2026_06_15 recreation.
11+
// The table has: id, user_id, tenant_id, event, auditable_type, auditable_id,
12+
// old_values, new_values, ip_address, user_agent, created_at
13+
// We add: action, auditable_label, url, module
14+
if (!Schema::hasTable('audit_logs')) {
15+
return;
16+
}
17+
18+
Schema::table('audit_logs', function (Blueprint $table) {
19+
if (!Schema::hasColumn('audit_logs', 'action')) {
20+
$table->string('action')->nullable()->after('tenant_id');
21+
}
22+
if (!Schema::hasColumn('audit_logs', 'auditable_label')) {
23+
$table->string('auditable_label')->nullable()->after('auditable_id');
24+
}
25+
if (!Schema::hasColumn('audit_logs', 'url')) {
26+
$table->string('url')->nullable()->after('user_agent');
27+
}
28+
if (!Schema::hasColumn('audit_logs', 'module')) {
29+
$table->string('module')->nullable()->after('url');
30+
}
2231
});
2332
}
2433

2534
public function down(): void
2635
{
27-
Schema::dropIfExists('audit_logs');
36+
if (!Schema::hasTable('audit_logs')) {
37+
return;
38+
}
39+
40+
Schema::table('audit_logs', function (Blueprint $table) {
41+
foreach (['action', 'auditable_label', 'url', 'module'] as $col) {
42+
if (Schema::hasColumn('audit_logs', $col)) {
43+
$table->dropColumn($col);
44+
}
45+
}
46+
});
2847
}
2948
};

0 commit comments

Comments
 (0)