updates to cippstandardscomparefield for new planning.

Author: KelvinTegelaar

Modules/CIPPCore/Public/Functions/Test-CIPPStandardLicense.ps1

@@ -46,7 +46,7 @@ function Test-CIPPStandardLicense {
         if ($Capabilities.Count -le 0) {
             if (!$SkipLog.IsPresent) {
                 Write-LogMessage -API 'Standards' -tenant $TenantFilter -message "Tenant does not have the required capability to run standard $StandardName`: The tenant needs one of the following service plans: $($RequiredCapabilities -join ',')" -sev Info
-                Set-CIPPStandardsCompareField -FieldName "standards.$StandardName" -FieldValue "License Missing: This tenant is not licensed for the following capabilities: $($RequiredCapabilities -join ',')" -Tenant $TenantFilter
+                Set-CIPPStandardsCompareField -FieldName "standards.$StandardName" -LicenseAvailable $false -FieldValue "License Missing: This tenant is not licensed for the following capabilities: $($RequiredCapabilities -join ',')" -Tenant $TenantFilter
                 Write-Verbose "Tenant does not have the required capability to run standard $StandardName - $($RequiredCapabilities -join ','). Exiting"
             }
             return $false

Modules/CIPPCore/Public/Set-CIPPStandardsCompareField.ps1

@@ -2,15 +2,19 @@ function Set-CIPPStandardsCompareField {
     [CmdletBinding(SupportsShouldProcess = $true)]
     param (
         $FieldName,
-        $FieldValue,
+        $FieldValue, #FieldValue is here for backward compatibility.
+        $CurrentValue, #The latest actual value in raw json
+        $ExpectedValue, #The expected value - e.g. the settings object from our standard
         $TenantFilter,
         [Parameter()]
+        [bool]$LicenseAvailable = $true,
+        [Parameter()]
         [array]$BulkFields
     )
     $Table = Get-CippTable -tablename 'CippStandardsReports'
     $TenantName = Get-Tenants -TenantFilter $TenantFilter
 
-    # Helper function to normalize field values
+    # Helper function to normalize field values. This can go in a couple of releases tbh.
     function ConvertTo-NormalizedFieldValue {
         param($Value)
         if ($Value -is [System.Boolean]) {
@@ -34,20 +38,26 @@ function Set-CIPPStandardsCompareField {
 
         # 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
+                $Entity | Add-Member -NotePropertyName LicenseAvailable -NotePropertyValue ([bool]$Field.LicenseAvailable) -Force
+                $Entity | Add-Member -NotePropertyName CurrentValue -NotePropertyValue ([string]$Field.CurrentValue) -Force
+                $Entity | Add-Member -NotePropertyName ExpectedValue -NotePropertyValue ([string]$Field.ExpectedValue) -Force
             } else {
                 $Entity = [PSCustomObject]@{
-                    PartitionKey = [string]$TenantName.defaultDomainName
-                    RowKey       = [string]$Field.FieldName
-                    Value        = $NormalizedValue
-                    TemplateId   = [string]$script:CippStandardInfoStorage.Value.StandardTemplateId
+                    PartitionKey     = [string]$TenantName.defaultDomainName
+                    RowKey           = [string]$Field.FieldName
+                    Value            = $NormalizedValue
+                    TemplateId       = [string]$script:CippStandardInfoStorage.Value.StandardTemplateId
+                    LicenseAvailable = [bool]$Field.LicenseAvailable
+                    CurrentValue     = [string]$Field.CurrentValue
+                    ExpectedValue    = [string]$Field.ExpectedValue
                 }
             }
             $EntitiesToProcess.Add($Entity)
@@ -72,13 +82,19 @@ function Set-CIPPStandardsCompareField {
                 if ($Existing) {
                     $Existing.Value = $NormalizedValue
                     $Existing | Add-Member -NotePropertyName TemplateId -NotePropertyValue ([string]$script:CippStandardInfoStorage.Value.StandardTemplateId) -Force
+                    $Existing | Add-Member -NotePropertyName LicenseAvailable -NotePropertyValue ([bool]$LicenseAvailable) -Force
+                    $Existing | Add-Member -NotePropertyName CurrentValue -NotePropertyValue ([string]$CurrentValue) -Force
+                    $Existing | Add-Member -NotePropertyName ExpectedValue -NotePropertyValue ([string]$ExpectedValue) -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
+                        PartitionKey     = [string]$TenantName.defaultDomainName
+                        RowKey           = [string]$FieldName
+                        Value            = $NormalizedValue
+                        TemplateId       = [string]$script:CippStandardInfoStorage.Value.StandardTemplateId
+                        LicenseAvailable = [bool]$LicenseAvailable
+                        CurrentValue     = [string]$CurrentValue
+                        ExpectedValue    = [string]$ExpectedValue
                     }
                     Add-CIPPAzDataTableEntity @Table -Entity $Result -Force
                 }