fix compare for policies

Author: KelvinTegelaar

Modules/CIPPCore/Public/Set-CIPPIntunePolicy.ps1

@@ -12,7 +12,7 @@ function Set-CIPPIntunePolicy {
         $tenantFilter
     )
     $APINAME = 'Set-CIPPIntunePolicy'
-   
+
     $RawJSON = Get-CIPPTextReplacement -TenantFilter $tenantFilter -Text $RawJSON
 
     try {
@@ -65,8 +65,8 @@ function Set-CIPPIntunePolicy {
                     $ExistingID = $CheckExististing | Where-Object -Property displayName -EQ $displayname
                     $ExistingData = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/$PlatformType/$TemplateTypeURL('$($ExistingID.id)')/definitionValues" -tenantid $tenantFilter
                     $DeleteJson = $RawJSON | ConvertFrom-Json -Depth 10
-                    $DeleteJson.deletedIds = @($ExistingData.id)
-                    $DeleteJson.added = @()
+                    $DeleteJson | Add-Member -MemberType NoteProperty -Name 'deletedIds' -Value @($ExistingData.id) -Force
+                    $DeleteJson | Add-Member -MemberType NoteProperty -Name 'added' -Value @() -Force
                     $DeleteJson = ConvertTo-Json -Depth 10 -InputObject $DeleteJson
                     $DeleteRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/$PlatformType/$TemplateTypeURL('$($ExistingID.id)')/updateDefinitionValues" -tenantid $tenantFilter -type POST -body $DeleteJson
                     $CreateRequest = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/$PlatformType/$TemplateTypeURL('$($ExistingID.id)')/updateDefinitionValues" -tenantid $tenantFilter -type POST -body $RawJSON

Modules/CIPPCore/Public/Set-CIPPStandardsCompareField.ps1

@@ -4,7 +4,6 @@ function Set-CIPPStandardsCompareField {
         $FieldValue,
         $TenantFilter
     )
-    Write-Host "Shoehorn: Set-CIPPStandardsCompareField - $FieldName - $FieldValue - $TenantFilter"
     $Table = Get-CippTable -tablename 'CippStandardsReports'
     $TenantName = Get-Tenants | Where-Object -Property defaultDomainName -EQ $Tenant
     #if the fieldname does not contain standards. prepend it.

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneTemplate.ps1

@@ -37,7 +37,6 @@ function Invoke-CIPPStandardIntuneTemplate {
     $Request = @{body = $null }
 
     $CompareList = foreach ($Template in $Settings) {
-        Write-Host "working on template: $($Template | ConvertTo-Json)"
         $Request.body = (Get-CIPPAzDataTableEntity @Table -Filter $Filter | Where-Object -Property RowKey -Like "$($Template.TemplateList.value)*").JSON | ConvertFrom-Json -ErrorAction SilentlyContinue
         if ($Request.body -eq $null) {
             Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to find template $($Template.TemplateList.value). Has this Intune Template been deleted?" -sev 'Error'
@@ -84,13 +83,13 @@ function Invoke-CIPPStandardIntuneTemplate {
         }
     }
 
-    If ($Settings.remediate -eq $true) {
+    If ($true -in $Settings.remediate) {
         Write-Host 'starting template deploy'
-        foreach ($Template in $CompareList | Where-Object -Property remediate -EQ $true) {
-            Write-Host "working on template deploy: $($Template | ConvertTo-Json)"
+        foreach ($TemplateFile in $CompareList | Where-Object -Property remediate -EQ $true) {
+            Write-Host "working on template deploy: $($Template.displayname)"
             try {
-                $Template.customGroup ? ($Template.AssignTo = $Template.customGroup) : $null
-                Set-CIPPIntunePolicy -TemplateType $Template.body.Type -Description $description -DisplayName $displayname -RawJSON $RawJSON -AssignTo $Template.AssignTo -ExcludeGroup $Template.excludeGroup -tenantFilter $Tenant
+                $TemplateFile.customGroup ? ($TemplateFile.AssignTo = $TemplateFile.customGroup) : $null
+                Set-CIPPIntunePolicy -TemplateType $TemplateFile.body.Type -Description $TemplateFile.description -DisplayName $TemplateFile.displayname -RawJSON $templateFile.rawJSON -AssignTo $TemplateFile.AssignTo -ExcludeGroup $TemplateFile.excludeGroup -tenantFilter $Tenant
             } catch {
                 $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
                 Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to create or update Intune Template $PolicyName, Error: $ErrorMessage" -sev 'Error'