Merge pull request #667 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Add-CIPPScheduledTask.ps1

@@ -46,20 +46,12 @@ function Add-CIPPScheduledTask {
                 return "Could not run task: $ErrorMessage"
             }
         } else {
-            # Generate RowKey early to use in duplicate check
             if (!$Task.RowKey) {
                 $RowKey = (New-Guid).Guid
             } else {
                 $RowKey = $Task.RowKey
             }
 
-            # Check for duplicate RowKey (prevents race conditions)
-            $Filter = "PartitionKey eq 'ScheduledTask' and RowKey eq '$RowKey'"
-            $ExistingTaskByKey = (Get-CIPPAzDataTableEntity @Table -Filter $Filter)
-            if ($ExistingTaskByKey) {
-                return "Task with ID $RowKey already exists"
-            }
-
             if ($DisallowDuplicateName) {
                 $Filter = "PartitionKey eq 'ScheduledTask' and Name eq '$($Task.Name)'"
                 $ExistingTask = (Get-CIPPAzDataTableEntity @Table -Filter $Filter)
@@ -125,7 +117,6 @@ function Add-CIPPScheduledTask {
             $AdditionalProperties = ([PSCustomObject]$AdditionalProperties | ConvertTo-Json -Compress)
             if ($Parameters -eq 'null') { $Parameters = '' }
 
-            # RowKey already generated during duplicate check above
 
             $Recurrence = if ([string]::IsNullOrEmpty($task.Recurrence.value)) {
                 $task.Recurrence

Modules/CIPPCore/Public/Alerts/Get-CIPPAlertMXRecordChanged.ps1

@@ -18,8 +18,10 @@ function Get-CIPPAlertMXRecordChanged {
 
         $ChangedDomains = foreach ($Domain in $DomainData) {
             $PreviousDomain = $PreviousResults | Where-Object { $_.Domain -eq $Domain.Domain }
-            if ($PreviousDomain -and $PreviousDomain.ActualMXRecords -ne $Domain.ActualMXRecords) {
-                "$($Domain.Domain): MX records changed from [$($PreviousDomain.ActualMXRecords -join ', ')] to [$($Domain.ActualMXRecords -join ', ')]"
+            $PreviousRecords = $PreviousDomain.ActualMXRecords -split ',' | Sort-Object
+            $CurrentRecords = $Domain.ActualMXRecords.Hostname | Sort-Object
+            if ($PreviousDomain -and $PreviousRecords -ne $CurrentRecords) {
+                "$($Domain.Domain): MX records changed from [$($PreviousRecords -join ', ')] to [$($CurrentRecords -join ', ')]"
             }
         }
 
@@ -29,11 +31,12 @@ function Get-CIPPAlertMXRecordChanged {
 
         # Update cache with current data
         foreach ($Domain in $DomainData) {
+            $CurrentRecords = $Domain.ActualMXRecords.Hostname | Sort-Object
             $CacheEntity = @{
                 PartitionKey    = [string]$TenantFilter
                 RowKey          = [string]$Domain.Domain
                 Domain          = [string]$Domain.Domain
-                ActualMXRecords = [string]$Domain.ActualMXRecords
+                ActualMXRecords = [string]($CurrentRecords -join ',')
                 LastRefresh     = [string]$Domain.LastRefresh
                 MailProvider    = [string]$Domain.MailProvider
             }