reporting updates

Author: KelvinTegelaar

Modules/CIPPCore/Public/Add-CippTestResult.ps1

@@ -47,6 +47,9 @@ function Add-CippTestResult {
         [Parameter(Mandatory = $true)]
         [string]$TestId,
 
+        [Parameter(Mandatory = $true)]
+        [string]$testType = 'identity',
+
         [Parameter(Mandatory = $true)]
         [string]$Status,
 
@@ -86,6 +89,7 @@ function Add-CippTestResult {
             UserImpact           = $UserImpact ?? ''
             ImplementationEffort = $ImplementationEffort ?? ''
             Category             = $Category ?? ''
+            TestType             = $TestType
         }
 
         Add-CIPPAzDataTableEntity @Table -Entity $Entity -Force

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Invoke-ListTests.ps1

@@ -25,35 +25,67 @@ function Invoke-ListTests {
 
         $TestResultsData = Get-CIPPTestResults -TenantFilter $TenantFilter
 
-        $TotalTests = 0
+        $IdentityTotal = 0
+        $DevicesTotal = 0
 
         if ($ReportId) {
             $ReportTable = Get-CippTable -tablename 'CippReportTemplates'
             $Filter = "PartitionKey eq 'ReportingTemplate' and RowKey eq '{0}'" -f $ReportId
             $ReportTemplate = Get-CIPPAzDataTableEntity @ReportTable -Filter $Filter
 
             if ($ReportTemplate) {
-                $ReportTests = $ReportTemplate.Tests | ConvertFrom-Json
-                $TotalTests = @($ReportTests).Count
-                $FilteredTests = $TestResultsData.TestResults | Where-Object { $ReportTests -contains $_.TestId }
-                $TestResultsData.TestResults = $FilteredTests
+                $IdentityTests = @()
+                $DeviceTests = @()
+
+                if ($ReportTemplate.identityTests) {
+                    $IdentityTests = $ReportTemplate.identityTests | ConvertFrom-Json
+                    $IdentityTotal = @($IdentityTests).Count
+                }
+
+                if ($ReportTemplate.deviceTests) {
+                    $DeviceTests = $ReportTemplate.deviceTests | ConvertFrom-Json
+                    $DevicesTotal = @($DeviceTests).Count
+                }
+
+                $AllReportTests = $IdentityTests + $DeviceTests
+                $FilteredTests = $TestResultsData.TestResults | Where-Object { $AllReportTests -contains $_.RowKey }
+                $TestResultsData.TestResults = @($FilteredTests)
             } else {
                 Write-LogMessage -API $APIName -tenant $TenantFilter -message "Report template '$ReportId' not found" -sev Warning
                 $TestResultsData.TestResults = @()
             }
         } else {
-            $TotalTests = @($TestResultsData.TestResults).Count
+            $IdentityTotal = @($TestResultsData.TestResults | Where-Object { $_.TestType -eq 'Identity' }).Count
+            $DevicesTotal = @($TestResultsData.TestResults | Where-Object { $_.TestType -eq 'Devices' }).Count
         }
 
+        $IdentityResults = $TestResultsData.TestResults | Where-Object { $_.TestType -eq 'Identity' }
+        $DeviceResults = $TestResultsData.TestResults | Where-Object { $_.TestType -eq 'Devices' }
+
         $TestCounts = @{
-            Successful = @($TestResultsData.TestResults | Where-Object { $_.Result -eq 'Passed' }).Count
-            Failed     = @($TestResultsData.TestResults | Where-Object { $_.Result -eq 'Failed' }).Count
-            Skipped    = @($TestResultsData.TestResults | Where-Object { $_.Result -eq 'Skipped' }).Count
-            Total      = $TotalTests
+            Identity = @{
+                Passed      = @($IdentityResults | Where-Object { $_.Status -eq 'Passed' }).Count
+                Failed      = @($IdentityResults | Where-Object { $_.Status -eq 'Failed' }).Count
+                Investigate = @($IdentityResults | Where-Object { $_.Status -eq 'Investigate' }).Count
+                Skipped     = @($IdentityResults | Where-Object { $_.Status -eq 'Skipped' }).Count
+                Total       = $IdentityTotal
+            }
+            Devices  = @{
+                Passed      = @($DeviceResults | Where-Object { $_.Status -eq 'Passed' }).Count
+                Failed      = @($DeviceResults | Where-Object { $_.Status -eq 'Failed' }).Count
+                Investigate = @($DeviceResults | Where-Object { $_.Status -eq 'Investigate' }).Count
+                Skipped     = @($DeviceResults | Where-Object { $_.Status -eq 'Skipped' }).Count
+                Total       = $DevicesTotal
+            }
         }
 
         $TestResultsData | Add-Member -NotePropertyName 'TestCounts' -NotePropertyValue $TestCounts -Force
 
+        $SecureScoreData = New-CIPPDbRequest -TenantFilter $TenantFilter -Type 'SecureScore'
+        if ($SecureScoreData) {
+            $TestResultsData | Add-Member -NotePropertyName 'SecureScore' -NotePropertyValue $SecureScoreData -Force
+        }
+
         $StatusCode = [HttpStatusCode]::OK
         $Body = $TestResultsData