thor/jira
1
0
Fork 0
mirror of https://github.com/Threnklyn/jira.git synced 2026-05-19 04:33:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed append project to view

Browse Source
This commit is contained in:
colton riffel
2018-06-05 11:03:05 -07:00
committed by Cory Bennett
parent 9cbd9937be
commit 8a462152ea
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
issue.go
+17
View File
@@ -16,6 +16,7 @@ import (
type IssueQueryProvider interface { type IssueQueryProvider interface {
ProvideIssueQueryString() string ProvideIssueQueryString() string
ProvideDefaultProject() string
} }
type IssueOptions struct { type IssueOptions struct {
@@ -24,6 +25,11 @@ type IssueOptions struct {
Properties []string `json:"properties,omitempty" yaml:"properties,omitempty"` Properties []string `json:"properties,omitempty" yaml:"properties,omitempty"`
FieldsByKeys bool `json:"fieldsByKeys,omitempty" yaml:"fieldsByKeys,omitempty"` FieldsByKeys bool `json:"fieldsByKeys,omitempty" yaml:"fieldsByKeys,omitempty"`
UpdateHistory bool `json:"updateHistory,omitempty" yaml:"updateHistory,omitempty"` UpdateHistory bool `json:"updateHistory,omitempty" yaml:"updateHistory,omitempty"`
Project string `json:"project,omitempty" yaml:"project,omitempty"`
}
func (o *IssueOptions) ProvideDefaultProject() string {
return o.Project
} }
func (o *IssueOptions) ProvideIssueQueryString() string { func (o *IssueOptions) ProvideIssueQueryString() string {
@@ -49,6 +55,11 @@ func (o *IssueOptions) ProvideIssueQueryString() string {
return "" return ""
} }
func CaseInsensitiveContains(s, substr string) bool {
s, substr = strings.ToUpper(s), strings.ToUpper(substr)
return strings.Contains(s, substr)
}
// https://docs.atlassian.com/jira/REST/cloud/#api/2/issue-getIssue // https://docs.atlassian.com/jira/REST/cloud/#api/2/issue-getIssue
func (j *Jira) GetIssue(issue string, iqg IssueQueryProvider) (*jiradata.Issue, error) { func (j *Jira) GetIssue(issue string, iqg IssueQueryProvider) (*jiradata.Issue, error) {
return GetIssue(j.UA, j.Endpoint, issue, iqg) return GetIssue(j.UA, j.Endpoint, issue, iqg)
@@ -56,6 +67,7 @@ func (j *Jira) GetIssue(issue string, iqg IssueQueryProvider) (*jiradata.Issue,
func GetIssue(ua HttpClient, endpoint string, issue string, iqg IssueQueryProvider) (*jiradata.Issue, error) { func GetIssue(ua HttpClient, endpoint string, issue string, iqg IssueQueryProvider) (*jiradata.Issue, error) {
query := "" query := ""
pro := iqg.ProvideDefaultProject()
if iqg != nil { if iqg != nil {
query = iqg.ProvideIssueQueryString() query = iqg.ProvideIssueQueryString()
} }
@@ -71,6 +83,11 @@ func GetIssue(ua HttpClient, endpoint string, issue string, iqg IssueQueryProvid
results := &jiradata.Issue{} results := &jiradata.Issue{}
return results, json.NewDecoder(resp.Body).Decode(results) return results, json.NewDecoder(resp.Body).Decode(results)
} }
// Ticket not found, maybe try prepend Project value?
if ! CaseInsensitiveContains(issue,pro) {
issue = pro+"-"+issue
return GetIssue(ua, endpoint, issue, iqg)
}
return nil, responseError(resp) return nil, responseError(resp)
} }