Optimize group and role member caching with bulk requests

Refactored Set-CIPPDBCacheGroups and Set-CIPPDBCacheRoles to use Microsoft Graph bulk requests for fetching group and role members, improving performance and efficiency. Updated logic to attach member data to each group and role object before caching.

Author: JohnDuprey

Modules/CIPPCore/Public/Set-CIPPDBCacheGroups.ps1

@@ -16,11 +16,40 @@ function Set-CIPPDBCacheGroups {
         Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Caching groups' -sev Info
 
         $Groups = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/groups?$top=999&$select=id,displayName,groupTypes,mail,mailEnabled,securityEnabled,membershipRule,onPremisesSyncEnabled' -tenantid $TenantFilter
-        Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Groups' -Data $Groups
-        Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Groups' -Data $Groups -Count
-        $Groups = $null
 
-        Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Cached groups successfully' -sev Info
+        # Build bulk request for group members
+        $MemberRequests = $Groups | ForEach-Object {
+            if ($_.id) {
+                [PSCustomObject]@{
+                    id     = $_.id
+                    method = 'GET'
+                    url    = "/groups/$($_.id)/members?`$select=id,displayName,userPrincipalName"
+                }
+            }
+        }
+
+        if ($MemberRequests) {
+            Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Fetching group members' -sev Info
+            $MemberResults = New-GraphBulkRequest -Requests @($MemberRequests) -tenantid $TenantFilter
+
+            # Add members to each group object
+            $GroupsWithMembers = foreach ($Group in $Groups) {
+                $Members = ($MemberResults | Where-Object { $_.id -eq $Group.id }).body.value
+                $Group | Add-Member -NotePropertyName 'members' -NotePropertyValue $Members -Force
+                $Group
+            }
+
+            Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Groups' -Data $GroupsWithMembers
+            Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Groups' -Data $GroupsWithMembers -Count
+            $Groups = $null
+            $GroupsWithMembers = $null
+        } else {
+            Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Groups' -Data $Groups
+            Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Groups' -Data $Groups -Count
+            $Groups = $null
+        }
+
+        Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Cached groups with members successfully' -sev Info
 
     } catch {
         Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter `

Modules/CIPPCore/Public/Set-CIPPDBCacheRoles.ps1

@@ -17,36 +17,43 @@ function Set-CIPPDBCacheRoles {
 
         $Roles = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/directoryRoles' -tenantid $TenantFilter
 
-        $RolesWithMembers = foreach ($Role in $Roles) {
-            try {
-                $Members = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/directoryRoles/$($Role.id)/members?&`$select=id,displayName,userPrincipalName" -tenantid $TenantFilter
+        # Build bulk request for role members
+        $MemberRequests = $Roles | ForEach-Object {
+            if ($_.id) {
                 [PSCustomObject]@{
-                    id             = $Role.id
-                    displayName    = $Role.displayName
-                    description    = $Role.description
-                    roleTemplateId = $Role.roleTemplateId
-                    members        = $Members
-                    memberCount    = $Members.Count
+                    id     = $_.id
+                    method = 'GET'
+                    url    = "/directoryRoles/$($_.id)/members?`$select=id,displayName,userPrincipalName"
                 }
-            } catch {
-                Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message "Failed to get members for role $($Role.displayName): $($_.Exception.Message)" -sev Warning
+            }
+        }
+
+        if ($MemberRequests) {
+            Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Fetching role members' -sev Info
+            $MemberResults = New-GraphBulkRequest -Requests @($MemberRequests) -tenantid $TenantFilter
+
+            # Add members to each role object
+            $RolesWithMembers = foreach ($Role in $Roles) {
+                $Members = ($MemberResults | Where-Object { $_.id -eq $Role.id }).body.value
                 [PSCustomObject]@{
                     id             = $Role.id
                     displayName    = $Role.displayName
                     description    = $Role.description
                     roleTemplateId = $Role.roleTemplateId
-                    members        = @()
-                    memberCount    = 0
+                    members        = $Members
+                    memberCount    = ($Members | Measure-Object).Count
                 }
             }
-        }
 
-        Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Roles' -Data $RolesWithMembers
-
-        Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Roles' -Data $RolesWithMembers -Count
-
-        $Roles = $null
-        $RolesWithMembers = $null
+            Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Roles' -Data $RolesWithMembers
+            Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Roles' -Data $RolesWithMembers -Count
+            $Roles = $null
+            $RolesWithMembers = $null
+        } else {
+            Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Roles' -Data $Roles
+            Add-CIPPDbItem -TenantFilter $TenantFilter -Type 'Roles' -Data $Roles -Count
+            $Roles = $null
+        }
 
         Write-LogMessage -API 'CIPPDBCache' -tenant $TenantFilter -message 'Cached directory roles successfully' -sev Info