Merge branch 'main' into RossTestBranch

microsoft · Oct 7, 2024 · 90826f5 · 90826f5
2 parents 08c77c0 + 5d2c558
commit 90826f5
Show file tree

Hide file tree

Showing 36 changed files with 472 additions and 100 deletions.
diff --git a/Calendar/CalLogHelpers/CalLogCSVFunctions.ps1 b/Calendar/CalLogHelpers/CalLogCSVFunctions.ps1
@@ -131,7 +131,6 @@ function BuildCSV {
 
     Write-Host "Starting to Process Calendar Logs..."
     $GCDOResults = @()
-    $IsFromSharedCalendar = @()
     $LogType = @()
     $script:MailboxList = @{}
     Write-Host "Creating Map of Mailboxes to CNs..."
@@ -157,8 +156,6 @@ function BuildCSV {
             }
         }
 
-        $IsFromSharedCalendar = ($null -ne $CalLog.externalSharingMasterId -and $CalLog.externalSharingMasterId -ne "NotFound")
-
         # Record one row
         $GCDOResults += [PSCustomObject]@{
             'LogRow'                         = $Index
@@ -169,7 +166,7 @@ function BuildCSV {
             'LogClientInfoString'            = $CalLog.LogClientInfoString
             'TriggerAction'                  = $CalLog.CalendarLogTriggerAction
             'ItemClass'                      = $ItemType
-            'Seq:Exp:ItemVersion'            = $CalLog.AppointmentSequenceNumber.ToString() + ":" + $CalLog.AppointmentLastSequenceNumber.ToString() + ":" + $CalLog.ItemVersion.ToString()
+            'Seq:Exp:ItemVersion'            = CompressVersionInfo($CalLog)
             'Organizer'                      = $CalLog.From.FriendlyDisplayName
             'From'                           = GetBestFromAddress($CalLog.From)
             'FreeBusy'                       = $CalLog.FreeBusyStatus.ToString()
@@ -178,8 +175,6 @@ function BuildCSV {
             'LogFolder'                      = $CalLog.ParentDisplayName
             'OriginalLogFolder'              = $CalLog.OriginalParentDisplayName
             'SharedFolderName'               = MapSharedFolder($CalLog.ExternalSharingMasterId)
-            'IsFromSharedCalendar'           = $IsFromSharedCalendar
-            'ExternalSharingMasterId'        = $CalLog.ExternalSharingMasterId
             'ReceivedBy'                     = $CalLog.ReceivedBy.SmtpEmailAddress
             'ReceivedRepresenting'           = $CalLog.ReceivedRepresenting.SmtpEmailAddress
             'MeetingRequestType'             = $CalLog.MeetingRequestType.ToString()
@@ -193,7 +188,7 @@ function BuildCSV {
             'RecurrencePattern'              = $CalLog.RecurrencePattern
             'AppointmentAuxiliaryFlags'      = $CalLog.AppointmentAuxiliaryFlags.ToString()
             'DisplayAttendeesAll'            = $CalLog.DisplayAttendeesAll
-            'AttendeeCount'                  = ($CalLog.DisplayAttendeesAll -split ';').Count
+            'AttendeeCount'                  = GetAttendeeCount($CalLog.DisplayAttendeesAll)
             'AppointmentState'               = $CalLog.AppointmentState.ToString()
             'ResponseType'                   = $CalLog.ResponseType.ToString()
             'ClientIntent'                   = $CalLog.ClientIntent.ToString()
@@ -205,7 +200,6 @@ function BuildCSV {
             'SendMeetingMessagesDiagnostics' = $CalLog.SendMeetingMessagesDiagnostics
             'AttendeeCollection'             = MultiLineFormat($CalLog.AttendeeCollection)
             'CalendarLogRequestId'           = $CalLog.CalendarLogRequestId.ToString()    # Move to front.../ Format in groups???
-            'CleanGlobalObjectId'            = $CalLog.CleanGlobalObjectId
         }
     }
     $script:EnhancedCalLogs = $GCDOResults
@@ -225,3 +219,38 @@ function ConvertDateTime {
     }
     return [DateTime]$DateTime
 }
+
+function GetAttendeeCount {
+    param(
+        [string] $AttendeeCollection
+    )
+    if ($From.SmtpAddress -ne "NotFound") {
+        return ($AttendeeCollection -split ';').Count
+    } else {
+        return "-"
+    }
+}
+
+function CompressVersionInfo {
+    param(
+        $CalLog
+    )
+    [string] $CompressedString = ""
+    if ($CalLog.AppointmentSequenceNumber -eq "NotFound" -or [string]::IsNullOrEmpty($CalLog.AppointmentSequenceNumber)) {
+        $CompressedString = "-:"
+    } else {
+        $CompressedString = $CalLog.AppointmentSequenceNumber.ToString() + ":"
+    }
+    if ($CalLog.AppointmentLastSequenceNumber -eq "NotFound" -or [string]::IsNullOrEmpty($CalLog.AppointmentLastSequenceNumber)) {
+        $CompressedString += "-:"
+    } else {
+        $CompressedString += $CalLog.AppointmentLastSequenceNumber.ToString() + ":"
+    }
+    if ($CalLog.ItemVersion -eq "NotFound" -or [string]::IsNullOrEmpty($CalLog.ItemVersion)) {
+        $CompressedString += "-"
+    } else {
+        $CompressedString += $CalLog.ItemVersion.ToString()
+    }
+
+    return $CompressedString
+}
diff --git a/Calendar/CalLogHelpers/CalLogInfoFunctions.ps1 b/Calendar/CalLogHelpers/CalLogInfoFunctions.ps1
@@ -116,7 +116,7 @@ function SetLogType {
         $ShortClientName -eq "CalendarReplication" -or
         $CalendarItemTypes.($CalLog.ItemClass) -eq "SharingCFM" -or
         $CalendarItemTypes.($CalLog.ItemClass) -eq "SharingDelete") {
-        return "Sharing"
+        return "Sync"
     } elseif ($ShortClientName -eq "Other EBA" -or
         $ShortClientName -eq "Other TBA" -or
         $ShortClientName -eq "LocationProcessor" -or
@@ -129,6 +129,7 @@ function SetLogType {
         return "Exception"
     } elseif (($CalendarItemTypes.($CalLog.ItemClass) -like "*Resp*" -and $CalLog.CalendarLogTriggerAction -ne "Create" ) -or
         $CalendarItemTypes.($CalLog.ItemClass) -eq "AttendeeList" -or
+        ($CalendarItemTypes.($CalLog.ItemClass) -eq "Forward.Notification" -and ($CalLog.CalendarLogTriggerAction -eq "SoftDelete") -or $CalLog.CalendarLogTriggerAction -like "*move*") -or
         ($CalLog.ItemClass -eq "IPM.Schedule.Meeting.Request" -and $CalLog.CalendarLogTriggerAction -like "*move*" ) ) {
         return "Cleanup"
     } else {

diff --git a/Calendar/CalLogHelpers/CreateTimelineRow.ps1 b/Calendar/CalLogHelpers/CreateTimelineRow.ps1
@@ -97,13 +97,13 @@ function CreateTimelineRow {
                 } else {
                     switch ($CalLog.Client) {
                         ResourceBookingAssistant {
-                            [array] $Output = "ResourceBookingAssistant $($Action) a $($MeetingRespType) Meeting Response message."
+                            [array] $Output = "ResourceBookingAssistant $($Action) a $($MeetingRespType) Meeting Response message$($Extra)."
                         }
                         Transport {
-                            [array] $Output = "[$($CalLog.From)] $($Action) $($MeetingRespType) Meeting Response message."
+                            [array] $Output = "[$($CalLog.From)] $($Action) $($MeetingRespType) Meeting Response message$($Extra)."
                         }
                         default {
-                            [array] $Output = "[$($CalLog.ResponsibleUser)] $($Action) [$($CalLog.Organizer)]'s $($MeetingRespType) Meeting Response with $($CalLog.Client)."
+                            [array] $Output = "[$($CalLog.ResponsibleUser)] $($Action) [$($CalLog.Organizer)]'s $($MeetingRespType) Meeting Response with $($CalLog.Client)$($Extra)."
                         }
                     }
                 }
@@ -114,7 +114,7 @@ function CreateTimelineRow {
         }
         Exception {
             if ($CalLog.ResponsibleUser -ne "Calendar Assistant") {
-                [array] $Output = "[$($CalLog.ResponsibleUser)] $($CalLog.TriggerAction)d Exception to the meeting series with $($CalLog.Client)."
+                [array] $Output = "[$($CalLog.ResponsibleUser)] $($CalLog.TriggerAction)d Exception starting $($CalLog.StartTime) to the meeting series with $($CalLog.Client)."
             }
         }
         Ipm.Appointment {

diff --git a/Calendar/CalLogHelpers/ExcelModuleInstaller.ps1 b/Calendar/CalLogHelpers/ExcelModuleInstaller.ps1
@@ -34,7 +34,9 @@ function CheckExcelModuleInstalled {
                 # Install ImportExcel module
                 Install-Module -Name ImportExcel -Force -AllowClobber
 
-                Write-Host "Done. ImportExcel module is now installed."
+                Write-Host -ForegroundColor Green "Done. ImportExcel module is now installed."
+                Write-Host -ForegroundColor Yellow "Please rerun the Script to get your Calendar Logs."
+                exit
             }
         }
     }