forked from fa/breadcrumb-the-shire
The "Last run" KPI tile stayed empty after a manual policy run, even
though the run completed successfully. Two distinct bugs were
involved:
1. The dashboard read latestSystemRun() from the audit log filtered by
trigger_type='system'. UserLifecycleService::run() never sets that
value — it uses 'manual' for actor-triggered runs and 'cron' for
scheduled ones. The query never matched anything.
2. Even with the right trigger_type, the audit log only writes per-user
entries (logDeactivate / logDelete / logDeleteFailure). A run that
processes zero users — including most cron ticks on a healthy
tenant — leaves no trace, so the tile would still show "—" after a
correct execution.
Both bugs share one root cause: run-trigger state was being inferred
from audit-log details, but those are two semantically different
things. Audit log answers "what did the run do?". A "last run" tile
answers "did the run happen?".
This commit moves run-trigger state to the core settings table and
keeps the audit log strictly for per-user events:
* Two new keys in core/Service/Settings/SettingKeys —
USER_LIFECYCLE_LAST_RUN_AT_KEY and USER_LIFECYCLE_LAST_RUN_STATUS_KEY.
* SettingsUserLifecycleGateway gains recordLastRun() and getLastRun().
UserSettingsGateway exposes them as recordLifecycleLastRun() /
getLifecycleLastRun() so UserLifecycleService can call through its
existing dependency without growing its constructor.
* UserLifecycleService::run() writes both keys in finally — every time
the lock was acquired, regardless of whether any user was processed
and regardless of whether the run finished cleanly. Status reflects
$result['ok'] ('success' / 'failed').
* UserLifecyclePolicyDashboardService gains a lastRun() reader. Action
page now sources the KPI tile from this core service instead of the
audit interface — so the tile works even when the audit module is
disabled.
* The audit-side lastRun() / latestSystemRun() / their tests are
removed (YAGNI). Phase 4 (activity feed) can rebuild from the audit
filter grid without a special method.
Behaviorally: a no-op run now records "Last run: just now · ✓ Success"
in the cockpit, exactly as expected.
All six quality gates green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
119 lines
4.1 KiB
PHP
119 lines
4.1 KiB
PHP
<?php
|
|
|
|
namespace MintyPHP\Service\Settings;
|
|
|
|
class SettingsUserLifecycleGateway
|
|
{
|
|
private const USER_INACTIVITY_DEACTIVATE_DAYS_FALLBACK = 180;
|
|
private const USER_INACTIVITY_DELETE_DAYS_FALLBACK = 365;
|
|
private const USER_INACTIVITY_DAYS_MIN = 0;
|
|
private const USER_INACTIVITY_DAYS_MAX = 3650;
|
|
|
|
public function __construct(private readonly SettingsMetadataGateway $settingsMetadataGateway)
|
|
{
|
|
}
|
|
|
|
public function getUserInactivityDeactivateDays(): int
|
|
{
|
|
$value = $this->settingsMetadataGateway->getInt(SettingKeys::USER_INACTIVITY_DEACTIVATE_DAYS_KEY);
|
|
if ($value !== null && $this->isValidInactivityDays($value)) {
|
|
return $value;
|
|
}
|
|
|
|
return self::USER_INACTIVITY_DEACTIVATE_DAYS_FALLBACK;
|
|
}
|
|
|
|
public function setUserInactivityDeactivateDays(?int $days, ?string $description = null): bool
|
|
{
|
|
$value = $days ?? self::USER_INACTIVITY_DEACTIVATE_DAYS_FALLBACK;
|
|
if (!$this->isValidInactivityDays($value)) {
|
|
return false;
|
|
}
|
|
if ($value === 0) {
|
|
$deleteUpdated = $this->settingsMetadataGateway->set(
|
|
SettingKeys::USER_INACTIVITY_DELETE_DAYS_KEY,
|
|
'0',
|
|
'setting.user_inactivity_delete_days'
|
|
);
|
|
if (!$deleteUpdated) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
$desc = $description ?? 'setting.user_inactivity_deactivate_days';
|
|
return $this->settingsMetadataGateway->set(SettingKeys::USER_INACTIVITY_DEACTIVATE_DAYS_KEY, (string) $value, $desc);
|
|
}
|
|
|
|
public function getUserInactivityDeleteDays(): int
|
|
{
|
|
$deactivateDays = $this->getUserInactivityDeactivateDays();
|
|
if ($deactivateDays <= 0) {
|
|
return 0;
|
|
}
|
|
|
|
$value = $this->settingsMetadataGateway->getInt(SettingKeys::USER_INACTIVITY_DELETE_DAYS_KEY);
|
|
if ($value !== null && $this->isValidInactivityDays($value)) {
|
|
return $value;
|
|
}
|
|
|
|
return self::USER_INACTIVITY_DELETE_DAYS_FALLBACK;
|
|
}
|
|
|
|
public function setUserInactivityDeleteDays(?int $days, ?string $description = null): bool
|
|
{
|
|
$value = $days ?? self::USER_INACTIVITY_DELETE_DAYS_FALLBACK;
|
|
if (!$this->isValidInactivityDays($value)) {
|
|
return false;
|
|
}
|
|
if ($value > 0 && $this->getUserInactivityDeactivateDays() <= 0) {
|
|
return false;
|
|
}
|
|
|
|
$desc = $description ?? 'setting.user_inactivity_delete_days';
|
|
return $this->settingsMetadataGateway->set(SettingKeys::USER_INACTIVITY_DELETE_DAYS_KEY, (string) $value, $desc);
|
|
}
|
|
|
|
private function isValidInactivityDays(int $days): bool
|
|
{
|
|
return $days >= self::USER_INACTIVITY_DAYS_MIN && $days <= self::USER_INACTIVITY_DAYS_MAX;
|
|
}
|
|
|
|
/**
|
|
* Record the completion of a UserLifecycleService::run() invocation.
|
|
*
|
|
* The two state keys (created_at, status) are written even when no users
|
|
* were processed (no-op runs) so that the lifecycle cockpit can show the
|
|
* tile correctly in every case. Audit-log entries cover what was done;
|
|
* these settings cover that the run itself happened.
|
|
*/
|
|
public function recordLastRun(string $createdAtUtc, string $status): bool
|
|
{
|
|
$atOk = $this->settingsMetadataGateway->set(
|
|
SettingKeys::USER_LIFECYCLE_LAST_RUN_AT_KEY,
|
|
$createdAtUtc
|
|
);
|
|
$statusOk = $this->settingsMetadataGateway->set(
|
|
SettingKeys::USER_LIFECYCLE_LAST_RUN_STATUS_KEY,
|
|
$status
|
|
);
|
|
return $atOk && $statusOk;
|
|
}
|
|
|
|
/**
|
|
* @return array{created_at: string, status: string}|null
|
|
* null when no run has been recorded yet.
|
|
*/
|
|
public function getLastRun(): ?array
|
|
{
|
|
$createdAt = $this->settingsMetadataGateway->getValue(SettingKeys::USER_LIFECYCLE_LAST_RUN_AT_KEY);
|
|
if ($createdAt === null || $createdAt === '') {
|
|
return null;
|
|
}
|
|
$status = (string) ($this->settingsMetadataGateway->getValue(SettingKeys::USER_LIFECYCLE_LAST_RUN_STATUS_KEY) ?? '');
|
|
return [
|
|
'created_at' => $createdAt,
|
|
'status' => $status,
|
|
];
|
|
}
|
|
}
|