Skip to content

Commit cfa118a

Browse files
authored
fix: update comment fields of struct type to be pointers to fix json marshal for addcomment method on issue service
2 parents ee10deb + 75d2ddc commit cfa118a

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

cloud/issue.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -472,15 +472,15 @@ type Comments struct {
472472

473473
// Comment represents a comment by a person to an issue in Jira.
474474
type Comment struct {
475-
ID string `json:"id,omitempty" structs:"id,omitempty"`
476-
Self string `json:"self,omitempty" structs:"self,omitempty"`
477-
Name string `json:"name,omitempty" structs:"name,omitempty"`
478-
Author User `json:"author,omitempty" structs:"author,omitempty"`
479-
Body string `json:"body,omitempty" structs:"body,omitempty"`
480-
UpdateAuthor User `json:"updateAuthor,omitempty" structs:"updateAuthor,omitempty"`
481-
Updated string `json:"updated,omitempty" structs:"updated,omitempty"`
482-
Created string `json:"created,omitempty" structs:"created,omitempty"`
483-
Visibility CommentVisibility `json:"visibility,omitempty" structs:"visibility,omitempty"`
475+
ID string `json:"id,omitempty" structs:"id,omitempty"`
476+
Self string `json:"self,omitempty" structs:"self,omitempty"`
477+
Name string `json:"name,omitempty" structs:"name,omitempty"`
478+
Author *User `json:"author,omitempty" structs:"author,omitempty"`
479+
Body string `json:"body,omitempty" structs:"body,omitempty"`
480+
UpdateAuthor *User `json:"updateAuthor,omitempty" structs:"updateAuthor,omitempty"`
481+
Updated string `json:"updated,omitempty" structs:"updated,omitempty"`
482+
Created string `json:"created,omitempty" structs:"created,omitempty"`
483+
Visibility *CommentVisibility `json:"visibility,omitempty" structs:"visibility,omitempty"`
484484

485485
// A list of comment properties. Optional on create and update.
486486
Properties []EntityProperty `json:"properties,omitempty" structs:"properties,omitempty"`

cloud/issue_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func TestIssueService_AddComment(t *testing.T) {
191191

192192
c := &Comment{
193193
Body: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eget venenatis elit. Duis eu justo eget augue iaculis fermentum. Sed semper quam laoreet nisi egestas at posuere augue semper.",
194-
Visibility: CommentVisibility{
194+
Visibility: &CommentVisibility{
195195
Type: "role",
196196
Value: "Administrators",
197197
},
@@ -219,7 +219,7 @@ func TestIssueService_UpdateComment(t *testing.T) {
219219
c := &Comment{
220220
ID: "10001",
221221
Body: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eget venenatis elit. Duis eu justo eget augue iaculis fermentum. Sed semper quam laoreet nisi egestas at posuere augue semper.",
222-
Visibility: CommentVisibility{
222+
Visibility: &CommentVisibility{
223223
Type: "role",
224224
Value: "Administrators",
225225
},
@@ -316,7 +316,7 @@ func TestIssueService_AddLink(t *testing.T) {
316316
},
317317
Comment: &Comment{
318318
Body: "Linked related issue!",
319-
Visibility: CommentVisibility{
319+
Visibility: &CommentVisibility{
320320
Type: "group",
321321
Value: "jira-software-users",
322322
},

onpremise/issue.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -471,15 +471,15 @@ type Comments struct {
471471

472472
// Comment represents a comment by a person to an issue in Jira.
473473
type Comment struct {
474-
ID string `json:"id,omitempty" structs:"id,omitempty"`
475-
Self string `json:"self,omitempty" structs:"self,omitempty"`
476-
Name string `json:"name,omitempty" structs:"name,omitempty"`
477-
Author User `json:"author,omitempty" structs:"author,omitempty"`
478-
Body string `json:"body,omitempty" structs:"body,omitempty"`
479-
UpdateAuthor User `json:"updateAuthor,omitempty" structs:"updateAuthor,omitempty"`
480-
Updated string `json:"updated,omitempty" structs:"updated,omitempty"`
481-
Created string `json:"created,omitempty" structs:"created,omitempty"`
482-
Visibility CommentVisibility `json:"visibility,omitempty" structs:"visibility,omitempty"`
474+
ID string `json:"id,omitempty" structs:"id,omitempty"`
475+
Self string `json:"self,omitempty" structs:"self,omitempty"`
476+
Name string `json:"name,omitempty" structs:"name,omitempty"`
477+
Author *User `json:"author,omitempty" structs:"author,omitempty"`
478+
Body string `json:"body,omitempty" structs:"body,omitempty"`
479+
UpdateAuthor *User `json:"updateAuthor,omitempty" structs:"updateAuthor,omitempty"`
480+
Updated string `json:"updated,omitempty" structs:"updated,omitempty"`
481+
Created string `json:"created,omitempty" structs:"created,omitempty"`
482+
Visibility *CommentVisibility `json:"visibility,omitempty" structs:"visibility,omitempty"`
483483

484484
// A list of comment properties. Optional on create and update.
485485
Properties []EntityProperty `json:"properties,omitempty" structs:"properties,omitempty"`

onpremise/issue_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func TestIssueService_AddComment(t *testing.T) {
191191

192192
c := &Comment{
193193
Body: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eget venenatis elit. Duis eu justo eget augue iaculis fermentum. Sed semper quam laoreet nisi egestas at posuere augue semper.",
194-
Visibility: CommentVisibility{
194+
Visibility: &CommentVisibility{
195195
Type: "role",
196196
Value: "Administrators",
197197
},
@@ -219,7 +219,7 @@ func TestIssueService_UpdateComment(t *testing.T) {
219219
c := &Comment{
220220
ID: "10001",
221221
Body: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eget venenatis elit. Duis eu justo eget augue iaculis fermentum. Sed semper quam laoreet nisi egestas at posuere augue semper.",
222-
Visibility: CommentVisibility{
222+
Visibility: &CommentVisibility{
223223
Type: "role",
224224
Value: "Administrators",
225225
},
@@ -316,7 +316,7 @@ func TestIssueService_AddLink(t *testing.T) {
316316
},
317317
Comment: &Comment{
318318
Body: "Linked related issue!",
319-
Visibility: CommentVisibility{
319+
Visibility: &CommentVisibility{
320320
Type: "group",
321321
Value: "jira-software-users",
322322
},

0 commit comments

Comments
 (0)