BREAKING CHANGE: Assignment capture flow completely refactored Core Changes: - Created PolicyCaptureOrchestrator service for centralized capture coordination - Refactored BackupService to use orchestrator (version-first approach) - Fixed domain model bug: PolicyVersion now stores assignments (source of truth) - BackupItem references PolicyVersion and copies assignments for restore Database: - Added assignments, scope_tags, assignments_hash, scope_tags_hash to policy_versions - Added policy_version_id foreign key to backup_items - Migrations: 2025_12_22_171525, 2025_12_22_171545 Services: - PolicyCaptureOrchestrator: Intelligent version reuse, idempotent backfilling - VersionService: Enhanced to capture assignments during version creation - BackupService: Uses orchestrator, version-first capture flow UI: - Moved assignments widget from Policy to PolicyVersion view - Created PolicyVersionAssignmentsWidget Livewire component - Updated BackupItemsRelationManager columns for new assignment fields Tests: - Deleted BackupWithAssignmentsTest (old behavior) - Created BackupWithAssignmentsConsistencyTest (4 tests, all passing) - Fixed AssignmentFetcherTest and GroupResolverTest for GraphResponse - All 162 tests passing Issue: Assignments/scope tags not displaying in BackupSet items table (UI only) Status: Database contains correct data, UI column definitions need adjustment
174 lines
5.5 KiB
PHP
174 lines
5.5 KiB
PHP
<?php
|
|
|
|
use App\Models\Policy;
|
|
use App\Models\Tenant;
|
|
use App\Services\Graph\AssignmentFetcher;
|
|
use App\Services\Graph\GroupResolver;
|
|
use App\Services\Intune\PolicySnapshotService;
|
|
use App\Services\Intune\VersionService;
|
|
|
|
beforeEach(function () {
|
|
$this->tenant = Tenant::factory()->create();
|
|
$this->policy = Policy::factory()->create([
|
|
'tenant_id' => $this->tenant->id,
|
|
'external_id' => 'test-policy-id',
|
|
]);
|
|
});
|
|
|
|
it('captures policy version with assignments from graph', function () {
|
|
// Mock dependencies
|
|
$this->mock(PolicySnapshotService::class, function ($mock) {
|
|
$mock->shouldReceive('fetch')
|
|
->once()
|
|
->andReturn([
|
|
'payload' => [
|
|
'id' => 'test-policy-id',
|
|
'name' => 'Test Policy',
|
|
'settings' => [],
|
|
],
|
|
]);
|
|
});
|
|
|
|
$this->mock(AssignmentFetcher::class, function ($mock) {
|
|
$mock->shouldReceive('fetch')
|
|
->once()
|
|
->andReturn([
|
|
[
|
|
'id' => 'assignment-1',
|
|
'intent' => 'apply',
|
|
'target' => [
|
|
'@odata.type' => '#microsoft.graph.groupAssignmentTarget',
|
|
'groupId' => 'group-123',
|
|
],
|
|
],
|
|
]);
|
|
});
|
|
|
|
$this->mock(GroupResolver::class, function ($mock) {
|
|
$mock->shouldReceive('resolve')
|
|
->once()
|
|
->andReturn([
|
|
'resolved' => [
|
|
'group-123' => ['id' => 'group-123', 'displayName' => 'Test Group'],
|
|
],
|
|
'orphaned' => [],
|
|
]);
|
|
});
|
|
|
|
$versionService = app(VersionService::class);
|
|
$version = $versionService->captureFromGraph(
|
|
$this->tenant,
|
|
$this->policy,
|
|
'test@example.com'
|
|
);
|
|
|
|
expect($version)->not->toBeNull()
|
|
->and($version->assignments)->not->toBeNull()
|
|
->and($version->assignments)->toHaveCount(1)
|
|
->and($version->assignments[0]['target']['groupId'])->toBe('group-123')
|
|
->and($version->assignments_hash)->not->toBeNull()
|
|
->and($version->metadata['assignments_count'])->toBe(1)
|
|
->and($version->metadata['has_orphaned_assignments'])->toBeFalse();
|
|
});
|
|
|
|
it('captures policy version without assignments when none exist', function () {
|
|
// Mock dependencies
|
|
$this->mock(PolicySnapshotService::class, function ($mock) {
|
|
$mock->shouldReceive('fetch')
|
|
->once()
|
|
->andReturn([
|
|
'payload' => [
|
|
'id' => 'test-policy-id',
|
|
'name' => 'Test Policy',
|
|
'settings' => [],
|
|
],
|
|
]);
|
|
});
|
|
|
|
$this->mock(AssignmentFetcher::class, function ($mock) {
|
|
$mock->shouldReceive('fetch')
|
|
->once()
|
|
->andReturn([]);
|
|
});
|
|
|
|
$versionService = app(VersionService::class);
|
|
$version = $versionService->captureFromGraph(
|
|
$this->tenant,
|
|
$this->policy,
|
|
'test@example.com'
|
|
);
|
|
|
|
expect($version)->not->toBeNull()
|
|
->and($version->assignments)->toBeNull()
|
|
->and($version->assignments_hash)->toBeNull();
|
|
});
|
|
|
|
it('handles assignment fetch failure gracefully', function () {
|
|
// Mock dependencies
|
|
$this->mock(PolicySnapshotService::class, function ($mock) {
|
|
$mock->shouldReceive('fetch')
|
|
->once()
|
|
->andReturn([
|
|
'payload' => [
|
|
'id' => 'test-policy-id',
|
|
'name' => 'Test Policy',
|
|
'settings' => [],
|
|
],
|
|
]);
|
|
});
|
|
|
|
$this->mock(AssignmentFetcher::class, function ($mock) {
|
|
$mock->shouldReceive('fetch')
|
|
->once()
|
|
->andThrow(new \Exception('Graph API error'));
|
|
});
|
|
|
|
$versionService = app(VersionService::class);
|
|
$version = $versionService->captureFromGraph(
|
|
$this->tenant,
|
|
$this->policy,
|
|
'test@example.com'
|
|
);
|
|
|
|
expect($version)->not->toBeNull()
|
|
->and($version->assignments)->toBeNull()
|
|
->and($version->metadata['assignments_fetch_failed'])->toBeTrue()
|
|
->and($version->metadata['assignments_fetch_error'])->toBe('Graph API error');
|
|
});
|
|
|
|
it('calculates correct hash for assignments', function () {
|
|
$assignments = [
|
|
['id' => '1', 'target' => ['groupId' => 'group-1']],
|
|
['id' => '2', 'target' => ['groupId' => 'group-2']],
|
|
];
|
|
|
|
$version = $this->policy->versions()->create([
|
|
'tenant_id' => $this->tenant->id,
|
|
'policy_id' => $this->policy->id,
|
|
'version_number' => 1,
|
|
'policy_type' => 'deviceManagementConfigurationPolicy',
|
|
'snapshot' => ['test' => 'data'],
|
|
'assignments' => $assignments,
|
|
'assignments_hash' => hash('sha256', json_encode($assignments)),
|
|
'captured_at' => now(),
|
|
]);
|
|
|
|
$expectedHash = hash('sha256', json_encode($assignments));
|
|
|
|
expect($version->assignments_hash)->toBe($expectedHash);
|
|
|
|
// Verify same assignments produce same hash
|
|
$version2 = $this->policy->versions()->create([
|
|
'tenant_id' => $this->tenant->id,
|
|
'policy_id' => $this->policy->id,
|
|
'version_number' => 2,
|
|
'policy_type' => 'deviceManagementConfigurationPolicy',
|
|
'snapshot' => ['test' => 'data'],
|
|
'assignments' => $assignments,
|
|
'assignments_hash' => hash('sha256', json_encode($assignments)),
|
|
'captured_at' => now(),
|
|
]);
|
|
|
|
expect($version2->assignments_hash)->toBe($version->assignments_hash);
|
|
});
|