Summary Consolidates the “Tenant Operate Hub” work (Spec 085) and the follow-up adjustments from the 086 session merge into a single branch ready to merge into dev. Primary focus: stabilize Ops/Operate Hub UX flows, tighten/align authorization semantics, and make the full Sail test suite green. Key Changes Ops UX / Verification Readonly members can view verification operation runs (reports) while starting verification remains restricted. Normalized failure reason-code handling and aligned UX expectations with the provider reason-code taxonomy. Onboarding wizard UX “Start verification” CTA is hidden while a verification run is active; “Refresh” is shown during in-progress runs. Treats provider_permission_denied as a blocking reason (while keeping legacy compatibility). Test + fixture hardening Standardized use of default provider connection fixtures in tests where sync/restore flows require it. Fixed multiple Filament URL/tenant-context test cases to avoid 404s and reduce tenancy routing brittleness. Policy sync / restore safety Enrollment configuration type collision classification tests now exercise the real sync path (with required provider connection present). Restore edge-case safety tests updated to reflect current provider-connection requirements. Testing vendor/bin/sail artisan test --compact (green) vendor/bin/sail bin pint --dirty (green) Notes Includes merged 086 session work already (no separate PR needed). Co-authored-by: Ahmed Darrazi <ahmeddarrazi@ebc83aaa-d947-4a08-b88e-bd72ac9645f7.fritz.box> Co-authored-by: Ahmed Darrazi <ahmeddarrazi@MacBookPro.fritz.box> Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.fritz.box> Reviewed-on: #103
124 lines
4.0 KiB
PHP
124 lines
4.0 KiB
PHP
<?php
|
|
|
|
namespace App\Jobs;
|
|
|
|
use App\Jobs\Middleware\TrackOperationRun;
|
|
use App\Models\OperationRun;
|
|
use App\Models\Tenant;
|
|
use App\Services\Directory\RoleDefinitionsSyncService;
|
|
use App\Services\Intune\AuditLogger;
|
|
use App\Services\OperationRunService;
|
|
use Carbon\CarbonImmutable;
|
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
use Illuminate\Foundation\Bus\Dispatchable;
|
|
use Illuminate\Foundation\Queue\Queueable;
|
|
use Illuminate\Queue\InteractsWithQueue;
|
|
use Illuminate\Queue\SerializesModels;
|
|
use RuntimeException;
|
|
|
|
class SyncRoleDefinitionsJob implements ShouldQueue
|
|
{
|
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
|
|
public ?OperationRun $operationRun = null;
|
|
|
|
/**
|
|
* Create a new job instance.
|
|
*/
|
|
public function __construct(
|
|
public int $tenantId,
|
|
?OperationRun $operationRun = null,
|
|
) {
|
|
$this->operationRun = $operationRun;
|
|
}
|
|
|
|
public function middleware(): array
|
|
{
|
|
return [new TrackOperationRun];
|
|
}
|
|
|
|
/**
|
|
* Execute the job.
|
|
*/
|
|
public function handle(RoleDefinitionsSyncService $syncService, AuditLogger $auditLogger): void
|
|
{
|
|
if (! $this->operationRun) {
|
|
$this->fail(new RuntimeException('OperationRun context is required for SyncRoleDefinitionsJob.'));
|
|
|
|
return;
|
|
}
|
|
|
|
$tenant = Tenant::query()->find($this->tenantId);
|
|
if (! $tenant instanceof Tenant) {
|
|
throw new RuntimeException('Tenant not found.');
|
|
}
|
|
|
|
$auditLogger->log(
|
|
tenant: $tenant,
|
|
action: 'directory_role_definitions.sync.started',
|
|
context: [
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
],
|
|
actorId: $this->operationRun->user_id,
|
|
status: 'success',
|
|
resourceType: 'operation_run',
|
|
resourceId: (string) $this->operationRun->getKey(),
|
|
);
|
|
|
|
$result = $syncService->sync($tenant);
|
|
|
|
/** @var OperationRunService $opService */
|
|
$opService = app(OperationRunService::class);
|
|
|
|
$outcome = 'succeeded';
|
|
|
|
if ($result['error_code'] !== null) {
|
|
$outcome = 'failed';
|
|
} elseif ($result['safety_stop_triggered'] === true) {
|
|
$outcome = 'partially_succeeded';
|
|
}
|
|
|
|
$failures = [];
|
|
if (is_string($result['error_code']) && $result['error_code'] !== '') {
|
|
$failures[] = [
|
|
'code' => $result['error_code'],
|
|
'message' => is_string($result['error_summary']) ? $result['error_summary'] : 'Role definitions sync failed.',
|
|
];
|
|
}
|
|
|
|
$opService->updateRun(
|
|
$this->operationRun,
|
|
'completed',
|
|
$outcome,
|
|
[
|
|
'total' => $result['items_observed_count'],
|
|
'processed' => $result['items_observed_count'],
|
|
'updated' => $result['items_upserted_count'],
|
|
'failed' => $result['error_count'],
|
|
],
|
|
$failures,
|
|
);
|
|
|
|
$auditLogger->log(
|
|
tenant: $tenant,
|
|
action: $outcome === 'succeeded'
|
|
? 'directory_role_definitions.sync.succeeded'
|
|
: ($outcome === 'partially_succeeded'
|
|
? 'directory_role_definitions.sync.partial'
|
|
: 'directory_role_definitions.sync.failed'),
|
|
context: [
|
|
'pages_fetched' => $result['pages_fetched'],
|
|
'items_observed_count' => $result['items_observed_count'],
|
|
'items_upserted_count' => $result['items_upserted_count'],
|
|
'error_code' => $result['error_code'],
|
|
'error_category' => $result['error_category'],
|
|
'finished_at' => CarbonImmutable::now('UTC')->toIso8601String(),
|
|
],
|
|
actorId: $this->operationRun->user_id,
|
|
status: $outcome === 'failed' ? 'failed' : 'success',
|
|
resourceType: 'operation_run',
|
|
resourceId: (string) $this->operationRun->getKey(),
|
|
);
|
|
}
|
|
}
|