From 3ca779650e69c158b81bf072063a47d3f6d64be2 Mon Sep 17 00:00:00 2001
From: DrIOS <58635327+DrIOSX@users.noreply.github.com>
Date: Thu, 13 Jun 2024 10:34:37 -0500
Subject: [PATCH] docs: 6.1.2,6.1.3 refactored

---
 source/tests/Test-MailboxAuditingE3.ps1 | 3 ++-
 source/tests/Test-MailboxAuditingE5.ps1 | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/tests/Test-MailboxAuditingE3.ps1 b/source/tests/Test-MailboxAuditingE3.ps1
index 59ead24..8ae5b19 100644
--- a/source/tests/Test-MailboxAuditingE3.ps1
+++ b/source/tests/Test-MailboxAuditingE3.ps1
@@ -45,6 +45,7 @@ function Test-MailboxAuditingE3 {
     process {
         if ($null -ne $founde3Sku) {
             $allUsers = Get-MgUser -Filter "assignedLicenses/any(x:x/skuId eq $($founde3Sku.SkuId) )" -All
+            $mailboxes = Get-EXOMailbox -PropertySets Audit
             try {
                 foreach ($user in $allUsers) {
                     if ($processedUsers.ContainsKey($user.UserPrincipalName)) {
@@ -57,7 +58,7 @@ function Test-MailboxAuditingE3 {
                     #Write-Verbose "Evaluating user $($user.UserPrincipalName) for Office E3 license."
 
                     $userUPN = $user.UserPrincipalName
-                    $mailbox = Get-EXOMailbox -Identity $userUPN -PropertySets Audit
+                    $mailbox = $mailboxes | Where-Object { $_.UserPrincipalName -eq $user.UserPrincipalName }
 
                     $missingActions = @()
                     if ($mailbox.AuditEnabled) {
diff --git a/source/tests/Test-MailboxAuditingE5.ps1 b/source/tests/Test-MailboxAuditingE5.ps1
index 62ec0cb..e9e6852 100644
--- a/source/tests/Test-MailboxAuditingE5.ps1
+++ b/source/tests/Test-MailboxAuditingE5.ps1
@@ -42,6 +42,7 @@ function Test-MailboxAuditingE5 {
     process {
         if ($null -ne $founde5Sku) {
             $allUsers = Get-MgUser -Filter "assignedLicenses/any(x:x/skuId eq $($founde5Sku.SkuId) )" -All
+            $mailboxes = Get-EXOMailbox -PropertySets Audit
             try {
                 foreach ($user in $allUsers) {
                     if ($processedUsers.ContainsKey($user.UserPrincipalName)) {
@@ -52,9 +53,9 @@ function Test-MailboxAuditingE5 {
                     #$licenseDetails = Get-MgUserLicenseDetail -UserId $user.UserPrincipalName
                     #$hasOfficeE5 = ($licenseDetails | Where-Object { $_.SkuPartNumber -in $e5SkuPartNumbers }).Count -gt 0
                     #Write-Verbose "Evaluating user $($user.UserPrincipalName) for Office E5 license."
-
+                    $mailbox = $mailboxes | Where-Object { $_.UserPrincipalName -eq $user.UserPrincipalName }
                     $userUPN = $user.UserPrincipalName
-                    $mailbox = Get-EXOMailbox -Identity $userUPN -PropertySets Audit
+                    #$mailbox = Get-EXOMailbox -Identity $userUPN -PropertySets Audit
 
                     $missingActions = @()
                     if ($mailbox.AuditEnabled) {