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
164 lines
4.6 KiB
PHP
164 lines
4.6 KiB
PHP
<?php
|
|
|
|
use App\Services\Graph\AssignmentFetcher;
|
|
use App\Services\Graph\GraphException;
|
|
use App\Services\Graph\GraphResponse;
|
|
use App\Services\Graph\MicrosoftGraphClient;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Tests\TestCase;
|
|
|
|
uses(TestCase::class, RefreshDatabase::class);
|
|
|
|
beforeEach(function () {
|
|
$this->graphClient = Mockery::mock(MicrosoftGraphClient::class);
|
|
$this->fetcher = new AssignmentFetcher($this->graphClient);
|
|
});
|
|
|
|
test('primary endpoint success', function () {
|
|
$tenantId = 'tenant-123';
|
|
$policyId = 'policy-456';
|
|
$assignments = [
|
|
['id' => 'assign-1', 'target' => ['@odata.type' => '#microsoft.graph.groupAssignmentTarget', 'groupId' => 'group-1']],
|
|
['id' => 'assign-2', 'target' => ['@odata.type' => '#microsoft.graph.groupAssignmentTarget', 'groupId' => 'group-2']],
|
|
];
|
|
|
|
$response = new GraphResponse(
|
|
success: true,
|
|
data: ['value' => $assignments]
|
|
);
|
|
|
|
$this->graphClient
|
|
->shouldReceive('request')
|
|
->once()
|
|
->with('GET', "/deviceManagement/configurationPolicies/{$policyId}/assignments", [
|
|
'tenant' => $tenantId,
|
|
])
|
|
->andReturn($response);
|
|
|
|
$result = $this->fetcher->fetch($tenantId, $policyId);
|
|
|
|
expect($result)->toBe($assignments);
|
|
});
|
|
|
|
test('fallback on empty response', function () {
|
|
$tenantId = 'tenant-123';
|
|
$policyId = 'policy-456';
|
|
$assignments = [
|
|
['id' => 'assign-1', 'target' => ['@odata.type' => '#microsoft.graph.groupAssignmentTarget', 'groupId' => 'group-1']],
|
|
];
|
|
|
|
// Primary returns empty
|
|
$primaryResponse = new GraphResponse(
|
|
success: true,
|
|
data: ['value' => []]
|
|
);
|
|
|
|
$this->graphClient
|
|
->shouldReceive('request')
|
|
->once()
|
|
->with('GET', "/deviceManagement/configurationPolicies/{$policyId}/assignments", [
|
|
'tenant' => $tenantId,
|
|
])
|
|
->andReturn($primaryResponse);
|
|
|
|
// Fallback returns assignments
|
|
$fallbackResponse = new GraphResponse(
|
|
success: true,
|
|
data: ['value' => [['id' => $policyId, 'assignments' => $assignments]]]
|
|
);
|
|
|
|
$this->graphClient
|
|
->shouldReceive('request')
|
|
->once()
|
|
->with('GET', '/deviceManagement/configurationPolicies', [
|
|
'tenant' => $tenantId,
|
|
'query' => [
|
|
'$expand' => 'assignments',
|
|
'$filter' => "id eq '{$policyId}'",
|
|
],
|
|
])
|
|
->andReturn($fallbackResponse);
|
|
|
|
$result = $this->fetcher->fetch($tenantId, $policyId);
|
|
|
|
expect($result)->toBe($assignments);
|
|
});
|
|
|
|
test('fail soft on error', function () {
|
|
$tenantId = 'tenant-123';
|
|
$policyId = 'policy-456';
|
|
|
|
$this->graphClient
|
|
->shouldReceive('request')
|
|
->once()
|
|
->andThrow(new GraphException('Graph API error', 500, ['request_id' => 'request-id-123']));
|
|
|
|
$result = $this->fetcher->fetch($tenantId, $policyId);
|
|
|
|
expect($result)->toBe([]);
|
|
});
|
|
|
|
test('returns empty array when both endpoints return empty', function () {
|
|
$tenantId = 'tenant-123';
|
|
$policyId = 'policy-456';
|
|
|
|
// Primary returns empty
|
|
$primaryResponse = new GraphResponse(
|
|
success: true,
|
|
data: ['value' => []]
|
|
);
|
|
|
|
$this->graphClient
|
|
->shouldReceive('request')
|
|
->once()
|
|
->with('GET', "/deviceManagement/configurationPolicies/{$policyId}/assignments", Mockery::any())
|
|
->andReturn($primaryResponse);
|
|
|
|
// Fallback returns empty
|
|
$fallbackResponse = new GraphResponse(
|
|
success: true,
|
|
data: ['value' => []]
|
|
);
|
|
|
|
$this->graphClient
|
|
->shouldReceive('request')
|
|
->once()
|
|
->with('GET', '/deviceManagement/configurationPolicies', Mockery::any())
|
|
->andReturn($fallbackResponse);
|
|
|
|
$result = $this->fetcher->fetch($tenantId, $policyId);
|
|
|
|
expect($result)->toBe([]);
|
|
});
|
|
|
|
test('fallback handles missing assignments key', function () {
|
|
$tenantId = 'tenant-123';
|
|
$policyId = 'policy-456';
|
|
|
|
// Primary returns empty
|
|
$primaryResponse = new GraphResponse(
|
|
success: true,
|
|
data: ['value' => []]
|
|
);
|
|
|
|
$this->graphClient
|
|
->shouldReceive('request')
|
|
->once()
|
|
->andReturn($primaryResponse);
|
|
|
|
// Fallback returns policy without assignments key
|
|
$fallbackResponse = new GraphResponse(
|
|
success: true,
|
|
data: ['value' => [['id' => $policyId]]]
|
|
);
|
|
|
|
$this->graphClient
|
|
->shouldReceive('request')
|
|
->once()
|
|
->andReturn($fallbackResponse);
|
|
|
|
$result = $this->fetcher->fetch($tenantId, $policyId);
|
|
|
|
expect($result)->toBe([]);
|
|
});
|