Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for GetList Unmarshalling Issue #630

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions cloud/issuelinktype.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,19 @@ type IssueLinkTypeService service
// GetList gets all of the issue link types from Jira.
//
// Jira API docs: https://developer.atlassian.com/cloud/jira/platform/rest/v2/#api-rest-api-2-issueLinkType-get
//
// TODO Double check this method if this works as expected, is using the latest API and the response is complete
// This double check effort is done for v2 - Remove this two lines if this is completed.
func (s *IssueLinkTypeService) GetList(ctx context.Context) ([]IssueLinkType, *Response, error) {
apiEndpoint := "rest/api/2/issueLinkType"
req, err := s.client.NewRequest(ctx, http.MethodGet, apiEndpoint, nil)
if err != nil {
return nil, nil, err
}

linkTypeList := []IssueLinkType{}
var linkTypeList map[string]([]IssueLinkType)
resp, err := s.client.Do(req, &linkTypeList)
if err != nil {
return nil, resp, NewJiraError(resp, err)
}
return linkTypeList, resp, nil
return linkTypeList["issueLinkTypes"], resp, nil
}

// Get gets info of a specific issue link type from Jira.
Expand Down
7 changes: 2 additions & 5 deletions onpremise/issuelinktype.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,19 @@ type IssueLinkTypeService service
// GetList gets all of the issue link types from Jira.
//
// Jira API docs: https://developer.atlassian.com/cloud/jira/platform/rest/v2/#api-rest-api-2-issueLinkType-get
//
// TODO Double check this method if this works as expected, is using the latest API and the response is complete
// This double check effort is done for v2 - Remove this two lines if this is completed.
func (s *IssueLinkTypeService) GetList(ctx context.Context) ([]IssueLinkType, *Response, error) {
apiEndpoint := "rest/api/2/issueLinkType"
req, err := s.client.NewRequest(ctx, http.MethodGet, apiEndpoint, nil)
if err != nil {
return nil, nil, err
}

linkTypeList := []IssueLinkType{}
var linkTypeList map[string]([]IssueLinkType)
resp, err := s.client.Do(req, &linkTypeList)
if err != nil {
return nil, resp, NewJiraError(resp, err)
}
return linkTypeList, resp, nil
return linkTypeList["issueLinkTypes"], resp, nil
}

// Get gets info of a specific issue link type from Jira.
Expand Down
244 changes: 123 additions & 121 deletions testing/mock-data/all_issuelinktypes.json
Original file line number Diff line number Diff line change
@@ -1,121 +1,123 @@
[
{
"id": "12310361",
"name": "Blocked",
"inward": "Blocked",
"outward": "Blocked",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310361"
},
{
"id": "10032",
"name": "Blocker",
"inward": "is blocked by",
"outward": "blocks",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/10032"
},
{
"id": "12310460",
"name": "Child-Issue",
"inward": "is a child of",
"outward": "is a parent of",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310460"
},
{
"id": "10020",
"name": "Cloners",
"inward": "is cloned by",
"outward": "is a clone of",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/10020"
},
{
"id": "12310060",
"name": "Container",
"inward": "Is contained by",
"outward": "contains",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310060"
},
{
"id": "12310461",
"name": "Dependency",
"inward": "Dependency",
"outward": "Dependency",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310461"
},
{
"id": "12310360",
"name": "Dependent",
"inward": "Dependent",
"outward": "Dependent",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310360"
},
{
"id": "12310000",
"name": "Duplicate",
"inward": "is duplicated by",
"outward": "duplicates",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310000"
},
{
"id": "12310010",
"name": "Incorporates",
"inward": "is part of",
"outward": "incorporates",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310010"
},
{
"id": "12310462",
"name": "Parent Feature",
"inward": "Parent Feature",
"outward": "Parent Feature",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310462"
},
{
"id": "12310560",
"name": "Problem/Incident",
"inward": "is caused by",
"outward": "causes",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310560"
},
{
"id": "10030",
"name": "Reference",
"inward": "is related to",
"outward": "relates to",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/10030"
},
{
"id": "12310050",
"name": "Regression",
"inward": "is broken by",
"outward": "breaks",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310050"
},
{
"id": "12310260",
"name": "Related",
"inward": "is related to",
"outward": "relates to",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310260"
},
{
"id": "12310040",
"name": "Required",
"inward": "is required by",
"outward": "requires",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310040"
},
{
"id": "12310051",
"name": "Supercedes",
"inward": "is superceded by",
"outward": "supercedes",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310051"
},
{
"id": "10001",
"name": "dependent",
"inward": "is depended upon by",
"outward": "depends upon",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/10001"
}
]
{
"issueLinkTypes": [
{
"id": "12310361",
"name": "Blocked",
"inward": "Blocked",
"outward": "Blocked",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310361"
},
{
"id": "10032",
"name": "Blocker",
"inward": "is blocked by",
"outward": "blocks",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/10032"
},
{
"id": "12310460",
"name": "Child-Issue",
"inward": "is a child of",
"outward": "is a parent of",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310460"
},
{
"id": "10020",
"name": "Cloners",
"inward": "is cloned by",
"outward": "is a clone of",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/10020"
},
{
"id": "12310060",
"name": "Container",
"inward": "Is contained by",
"outward": "contains",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310060"
},
{
"id": "12310461",
"name": "Dependency",
"inward": "Dependency",
"outward": "Dependency",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310461"
},
{
"id": "12310360",
"name": "Dependent",
"inward": "Dependent",
"outward": "Dependent",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310360"
},
{
"id": "12310000",
"name": "Duplicate",
"inward": "is duplicated by",
"outward": "duplicates",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310000"
},
{
"id": "12310010",
"name": "Incorporates",
"inward": "is part of",
"outward": "incorporates",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310010"
},
{
"id": "12310462",
"name": "Parent Feature",
"inward": "Parent Feature",
"outward": "Parent Feature",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310462"
},
{
"id": "12310560",
"name": "Problem/Incident",
"inward": "is caused by",
"outward": "causes",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310560"
},
{
"id": "10030",
"name": "Reference",
"inward": "is related to",
"outward": "relates to",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/10030"
},
{
"id": "12310050",
"name": "Regression",
"inward": "is broken by",
"outward": "breaks",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310050"
},
{
"id": "12310260",
"name": "Related",
"inward": "is related to",
"outward": "relates to",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310260"
},
{
"id": "12310040",
"name": "Required",
"inward": "is required by",
"outward": "requires",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310040"
},
{
"id": "12310051",
"name": "Supercedes",
"inward": "is superceded by",
"outward": "supercedes",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/12310051"
},
{
"id": "10001",
"name": "dependent",
"inward": "is depended upon by",
"outward": "depends upon",
"self": "https://issues.apache.org/jira/rest/api/2/issueLinkType/10001"
}
]
}