ahmido
d939d45bcf
Resolves assignment filter names when Graph stores filter IDs at assignment root. Tracks assignment fetch success/failure and shows clearer UI states for versions. Adds scope tag fallback display in backup set items. Restored versions now capture applied assignments consistently. Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.local> Reviewed-on: #8
99 lines
2.9 KiB
PHP
99 lines
2.9 KiB
PHP
<?php
|
|
|
|
namespace App\Jobs;
|
|
|
|
use App\Models\BackupItem;
|
|
use App\Services\AssignmentBackupService;
|
|
use Illuminate\Bus\Queueable;
|
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
use Illuminate\Foundation\Bus\Dispatchable;
|
|
use Illuminate\Queue\InteractsWithQueue;
|
|
use Illuminate\Queue\SerializesModels;
|
|
use Illuminate\Support\Facades\Log;
|
|
|
|
class FetchAssignmentsJob implements ShouldQueue
|
|
{
|
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
|
|
|
/**
|
|
* The number of times the job may be attempted.
|
|
*/
|
|
public int $tries = 1;
|
|
|
|
/**
|
|
* The number of seconds to wait before retrying the job.
|
|
*/
|
|
public int $backoff = 0;
|
|
|
|
/**
|
|
* Create a new job instance.
|
|
*/
|
|
public function __construct(
|
|
public int $backupItemId,
|
|
public string $tenantExternalId,
|
|
public string $policyExternalId,
|
|
public array $policyPayload
|
|
) {}
|
|
|
|
/**
|
|
* Execute the job.
|
|
*/
|
|
public function handle(AssignmentBackupService $assignmentBackupService): void
|
|
{
|
|
try {
|
|
$backupItem = BackupItem::find($this->backupItemId);
|
|
|
|
if ($backupItem === null) {
|
|
Log::warning('FetchAssignmentsJob: BackupItem not found', [
|
|
'backup_item_id' => $this->backupItemId,
|
|
]);
|
|
|
|
return;
|
|
}
|
|
|
|
$tenant = $backupItem->tenant;
|
|
|
|
if ($tenant === null) {
|
|
Log::warning('FetchAssignmentsJob: Tenant not found for BackupItem', [
|
|
'backup_item_id' => $this->backupItemId,
|
|
]);
|
|
|
|
return;
|
|
}
|
|
|
|
// Only process Settings Catalog policies
|
|
if ($backupItem->policy_type !== 'settingsCatalogPolicy') {
|
|
Log::info('FetchAssignmentsJob: Skipping non-Settings Catalog policy', [
|
|
'backup_item_id' => $this->backupItemId,
|
|
'policy_type' => $backupItem->policy_type,
|
|
]);
|
|
|
|
return;
|
|
}
|
|
|
|
$assignmentBackupService->enrichWithAssignments(
|
|
backupItem: $backupItem,
|
|
tenant: $tenant,
|
|
policyType: $backupItem->policy_type,
|
|
policyId: $backupItem->policy_identifier,
|
|
policyPayload: $this->policyPayload,
|
|
includeAssignments: true
|
|
);
|
|
|
|
Log::info('FetchAssignmentsJob: Successfully enriched BackupItem', [
|
|
'backup_item_id' => $this->backupItemId,
|
|
'assignment_count' => $backupItem->getAssignmentCount(),
|
|
]);
|
|
} catch (\Throwable $e) {
|
|
Log::error('FetchAssignmentsJob: Failed to enrich BackupItem', [
|
|
'backup_item_id' => $this->backupItemId,
|
|
'error' => $e->getMessage(),
|
|
'trace' => $e->getTraceAsString(),
|
|
]);
|
|
|
|
// Don't retry - fail soft
|
|
$this->fail($e);
|
|
}
|
|
}
|
|
}
|