Allow fields to be filtered by id only

AtlassianPS · Jun 13, 2024 · 16604f3 · 16604f3
1 parent 845495f
commit 16604f3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/JiraPS/Public/Get-JiraField.ps1 b/JiraPS/Public/Get-JiraField.ps1
@@ -6,6 +6,14 @@ function Get-JiraField {
         [String[]]
         $Field,
 
+        [Parameter]
+        [Switch]
+        $filterByName,
+
+        [Parameter]
+        [Switch]
+        $filterById,
+
         [Parameter()]
         [System.Management.Automation.PSCredential]
         [System.Management.Automation.Credential()]
@@ -43,7 +51,21 @@ function Get-JiraField {
 
                     $allFields = Get-JiraField -Credential $Credential
 
-                    Write-Output ($allFields | Where-Object -FilterScript { ($_.Id -eq $_field) -or ($_.Name -like $_field) })
+                    Write-Output ($allFields | Where-Object -FilterScript {
+                            if (($filterByName -and $filterById) -or (-not $filterByName -and -not $filterById))
+                            {
+                                ($_.Id -eq $_field) -or ($_.Name -like $_field)
+
+                            }
+                            elseif ($filterByName)
+                            {
+                                ($_.Name -like $_field)
+                            }
+                            elseif ($filterById)
+                            {
+                                ($_.Id -eq $_field)
+                            }
+                        })
                 }
             }
         }

diff --git a/JiraPS/Public/Set-JiraIssue.ps1 b/JiraPS/Public/Set-JiraIssue.ps1
@@ -47,6 +47,10 @@ function Set-JiraIssue {
         [PSCustomObject]
         $Fields,
 
+        #this is to fix case when there are multiple fields of the same name
+        [PSCustomObject]
+        $filterFieldsById,
+
         [String]
         $AddComment,
 
@@ -162,7 +166,7 @@ function Set-JiraIssue {
                     $name = $_key
                     $value = $Fields.$_key
 
-                    $field = Get-JiraField -Field $name -Credential $Credential -ErrorAction Stop
+                    $field = Get-JiraField -Field $name -Credential $Credential -filterById:$filterFieldsById -ErrorAction Stop
 
                     # For some reason, this was coming through as a hashtable instead of a String,
                     # which was causing ConvertTo-Json to crash later.