Merge pull request KelvinTegelaar#1338 from Ren-Roros-Digital/fixgroup

fix: fix group deployment

Author: JohnDuprey

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

@@ -47,15 +47,17 @@ function Invoke-CIPPStandardGroupTemplate {
                     'mailNickname'     = $groupobj.username
                     mailEnabled        = [bool]$false
                     securityEnabled    = [bool]$true
-                    isAssignableToRole = [bool]($groupobj | Where-Object -Property groupType -EQ 'AzureRole')
-
+                }
+                if ($groupobj.groupType -eq 'AzureRole') {
+                    $BodyToship | Add-Member -NotePropertyName 'isAssignableToRole' -NotePropertyValue $true
                 }
                 if ($groupobj.membershipRules) {
                     $BodyToship | Add-Member -NotePropertyName 'membershipRule' -NotePropertyValue ($groupobj.membershipRules)
                     $BodyToship | Add-Member -NotePropertyName 'groupTypes' -NotePropertyValue @('DynamicMembership')
                     $BodyToship | Add-Member -NotePropertyName 'membershipRuleProcessingState' -NotePropertyValue 'On'
                 }
                 if (!$CheckExististing) {
+                    $ActionType = 'create'
                     if ($groupobj.groupType -in 'Generic', 'azurerole', 'dynamic') {
                         $GraphRequest = New-GraphPostRequest -uri 'https://graph.microsoft.com/beta/groups' -tenantid $tenant -type POST -body (ConvertTo-Json -InputObject $BodyToship -Depth 10) -verbose
                     } else {
@@ -80,6 +82,7 @@ function Invoke-CIPPStandardGroupTemplate {
                     }
                     Write-LogMessage -API 'Standards' -tenant $tenant -message "Created group $($groupobj.displayname) with id $($GraphRequest.id) " -Sev 'Info'
                 } else {
+                    $ActionType = 'update'
                     if ($groupobj.groupType -in 'Generic', 'azurerole', 'dynamic') {
                         $GraphRequest = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/groups/$($CheckExististing.id)" -tenantid $tenant -type PATCH -body (ConvertTo-Json -InputObject $BodyToship -Depth 10) -verbose
                     } else {
@@ -107,10 +110,8 @@ function Invoke-CIPPStandardGroupTemplate {
                 }
             } catch {
                 $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-                Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to create group: $ErrorMessage" -sev 'Error'
+                Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to $ActionType group $($groupobj.displayname). Error: $ErrorMessage" -sev 'Error'
             }
         }
-
-
     }
 }