Add bulk support for standards

Author: KelvinTegelaar

Modules/CIPPCore/Public/Set-CIPPStandardsCompareField.ps1

@@ -3,40 +3,89 @@ function Set-CIPPStandardsCompareField {
     param (
         $FieldName,
         $FieldValue,
-        $TenantFilter
+        $TenantFilter,
+        [Parameter()]
+        [array]$BulkFields
     )
     $Table = Get-CippTable -tablename 'CippStandardsReports'
     $TenantName = Get-Tenants -TenantFilter $TenantFilter
 
-    if ($FieldValue -is [System.Boolean]) {
-        $FieldValue = [bool]$FieldValue
-    } elseif ($FieldValue -is [string]) {
-        $FieldValue = [string]$FieldValue
-    } else {
-        $FieldValue = ConvertTo-Json -Compress -InputObject @($FieldValue) -Depth 10 | Out-String
-        $FieldValue = [string]$FieldValue
+    # Helper function to normalize field values
+    function ConvertTo-NormalizedFieldValue {
+        param($Value)
+        if ($Value -is [System.Boolean]) {
+            return [bool]$Value
+        } elseif ($Value -is [string]) {
+            return [string]$Value
+        } else {
+            $JsonValue = ConvertTo-Json -Compress -InputObject @($Value) -Depth 10 | Out-String
+            return [string]$JsonValue
+        }
     }
 
-    $Existing = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq '$($TenantName.defaultDomainName)' and RowKey eq '$($FieldName)'"
+    # Handle bulk operations
+    if ($BulkFields) {
+        # Get all existing entities for this tenant in one query
+        $ExistingEntities = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq '$($TenantName.defaultDomainName)'"
+        $ExistingHash = @{}
+        foreach ($Entity in $ExistingEntities) {
+            $ExistingHash[$Entity.RowKey] = $Entity
+        }
 
-    if ($PSCmdlet.ShouldProcess('CIPP Standards Compare', "Set field '$FieldName' to '$FieldValue' for tenant '$($TenantName.defaultDomainName)'")) {
-        try {
-            if ($Existing) {
-                $Existing.Value = $FieldValue
-                $Existing | Add-Member -NotePropertyName TemplateId -NotePropertyValue ([string]$script:CippStandardInfoStorage.Value.StandardTemplateId) -Force
-                Add-CIPPAzDataTableEntity @Table -Entity $Existing -Force
+        # Build array of entities to insert/update
+        $EntitiesToProcess = [System.Collections.Generic.List[object]]::new()
+        
+        foreach ($Field in $BulkFields) {
+            $NormalizedValue = ConvertTo-NormalizedFieldValue -Value $Field.FieldValue
+            
+            if ($ExistingHash.ContainsKey($Field.FieldName)) {
+                $Entity = $ExistingHash[$Field.FieldName]
+                $Entity.Value = $NormalizedValue
+                $Entity | Add-Member -NotePropertyName TemplateId -NotePropertyValue ([string]$script:CippStandardInfoStorage.Value.StandardTemplateId) -Force
             } else {
-                $Result = [PSCustomObject]@{
+                $Entity = [PSCustomObject]@{
                     PartitionKey = [string]$TenantName.defaultDomainName
-                    RowKey       = [string]$FieldName
-                    Value        = $FieldValue
+                    RowKey       = [string]$Field.FieldName
+                    Value        = $NormalizedValue
                     TemplateId   = [string]$script:CippStandardInfoStorage.Value.StandardTemplateId
                 }
-                Add-CIPPAzDataTableEntity @Table -Entity $Result -Force
             }
-            Write-Information "Adding $FieldName to StandardCompare for $Tenant. content is $FieldValue"
-        } catch {
-            Write-Warning "Failed to add $FieldName to StandardCompare for $Tenant. content is $FieldValue - $($_.Exception.Message)"
+            $EntitiesToProcess.Add($Entity)
+        }
+
+        if ($PSCmdlet.ShouldProcess('CIPP Standards Compare', "Set $($EntitiesToProcess.Count) fields for tenant '$($TenantName.defaultDomainName)'")) {
+            try {
+                # Single bulk insert/update operation
+                Add-CIPPAzDataTableEntity @Table -Entity $EntitiesToProcess -Force
+                Write-Information "Bulk added $($EntitiesToProcess.Count) fields to StandardCompare for $($TenantName.defaultDomainName)"
+            } catch {
+                Write-Warning "Failed to bulk add fields to StandardCompare for $($TenantName.defaultDomainName) - $($_.Exception.Message)"
+            }
+        }
+    } else {
+        # Original single field logic
+        $NormalizedValue = ConvertTo-NormalizedFieldValue -Value $FieldValue
+        $Existing = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq '$($TenantName.defaultDomainName)' and RowKey eq '$($FieldName)'"
+
+        if ($PSCmdlet.ShouldProcess('CIPP Standards Compare', "Set field '$FieldName' to '$NormalizedValue' for tenant '$($TenantName.defaultDomainName)'")) {
+            try {
+                if ($Existing) {
+                    $Existing.Value = $NormalizedValue
+                    $Existing | Add-Member -NotePropertyName TemplateId -NotePropertyValue ([string]$script:CippStandardInfoStorage.Value.StandardTemplateId) -Force
+                    Add-CIPPAzDataTableEntity @Table -Entity $Existing -Force
+                } else {
+                    $Result = [PSCustomObject]@{
+                        PartitionKey = [string]$TenantName.defaultDomainName
+                        RowKey       = [string]$FieldName
+                        Value        = $NormalizedValue
+                        TemplateId   = [string]$script:CippStandardInfoStorage.Value.StandardTemplateId
+                    }
+                    Add-CIPPAzDataTableEntity @Table -Entity $Result -Force
+                }
+                Write-Information "Adding $FieldName to StandardCompare for $($TenantName.defaultDomainName). content is $NormalizedValue"
+            } catch {
+                Write-Warning "Failed to add $FieldName to StandardCompare for $($TenantName.defaultDomainName). content is $NormalizedValue - $($_.Exception.Message)"
+            }
         }
     }
 }

Modules/CIPPCore/Public/Standards/Get-CIPPStandards.ps1

@@ -407,12 +407,21 @@ function Get-CIPPStandards {
                 $TestResult = Test-CIPPStandardLicense -StandardName 'IntuneTemplate_general' -TenantFilter $TenantName -RequiredCapabilities @('INTUNE_A', 'MDM_Services', 'EMS', 'SCCM', 'MICROSOFTINTUNEPLAN1')
                 if (-not $TestResult) {
                     $IntuneKeys = @($ComputedStandards.Keys | Where-Object { $_ -like '*IntuneTemplate*' })
+                    # Collect all fields for bulk insert
+                    $BulkFields = [System.Collections.Generic.List[object]]::new()
                     foreach ($Key in $IntuneKeys) {
                         $TemplateKey = ($Key -split '\|', 2)[1]
                         if ($TemplateKey) {
-                            Set-CIPPStandardsCompareField -FieldName "standards.IntuneTemplate.$TemplateKey" -FieldValue 'This tenant does not have the required license for this standard.' -Tenant $TenantName
+                            $BulkFields.Add([PSCustomObject]@{
+                                    FieldName  = "standards.IntuneTemplate.$TemplateKey"
+                                    FieldValue = 'This tenant does not have the required license for this standard.'
+                                })
                         }
                     }
+                    # Single bulk insert operation
+                    if ($BulkFields.Count -gt 0) {
+                        Set-CIPPStandardsCompareField -TenantFilter $TenantName -BulkFields $BulkFields
+                    }
                     Write-Host "We're removing Intune templates as the correct license is not present for this standard. We do this to not run unneeded cycles. If you're reading this don't touch."
                     foreach ($Key in $IntuneKeys) { [void]$ComputedStandards.Remove($Key) }
                 } else {