Skip to content

Commit 6844eb7

Browse files
fix linting issues in webhook close issue handler
1 parent f4e9cb4 commit 6844eb7

1 file changed

Lines changed: 33 additions & 34 deletions

File tree

backend/plugins/webhook/api/issues.go

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,9 @@ func CloseIssue(input *plugin.ApiResourceInput) (*plugin.ApiResourceOutput, erro
236236

237237
// CloseIssueByBodyRequest is the body for the body-based close endpoint
238238
type CloseIssueByBodyRequest struct {
239-
IssueKey string `mapstructure:"issueKey" validate:"required,max=255"`
240-
ResolutionDate *time.Time `mapstructure:"resolutionDate"`
241-
OriginalStatus string `mapstructure:"originalStatus"`
239+
IssueKey string `mapstructure:"issueKey" validate:"required,max=255"`
240+
ResolutionDate *time.Time `mapstructure:"resolutionDate"`
241+
OriginalStatus string `mapstructure:"originalStatus"`
242242
}
243243

244244
// CloseIssueByBody
@@ -253,22 +253,21 @@ type CloseIssueByBodyRequest struct {
253253
// @Failure 500 {string} errcode.Error "Internal Error"
254254
// @Router /plugins/webhook/connections/{connectionId}/issue/close [POST]
255255
func CloseIssueByBody(input *plugin.ApiResourceInput) (*plugin.ApiResourceOutput, errors.Error) {
256-
connection := &models.WebhookConnection{}
257-
err := connectionHelper.First(connection, input.Params)
258-
if err != nil {
259-
return nil, err
260-
}
261-
request := &CloseIssueByBodyRequest{}
262-
if err2 := helper.DecodeMapStruct(input.Body, request, true); err2 != nil {
263-
return &plugin.ApiResourceOutput{Body: err2.Error(), Status: http.StatusBadRequest}, nil
264-
}
265-
vld = validator.New()
266-
if err2 := errors.Convert(vld.Struct(request)); err2 != nil {
267-
return &plugin.ApiResourceOutput{Body: err2.Error(), Status: http.StatusBadRequest}, nil
268-
}
269-
// Inject issueKey into input.Params so closeIssue() can read it
270-
input.Params["issueKey"] = request.IssueKey
271-
return closeIssue(input, err, connection)
256+
connection := &models.WebhookConnection{}
257+
err := connectionHelper.First(connection, input.Params)
258+
if err != nil {
259+
return nil, err
260+
}
261+
request := &CloseIssueByBodyRequest{}
262+
if err2 := helper.DecodeMapStruct(input.Body, request, true); err2 != nil {
263+
return &plugin.ApiResourceOutput{Body: err2.Error(), Status: http.StatusBadRequest}, nil
264+
}
265+
vld = validator.New()
266+
if err2 := errors.Convert(vld.Struct(request)); err2 != nil {
267+
return &plugin.ApiResourceOutput{Body: err2.Error(), Status: http.StatusBadRequest}, nil
268+
}
269+
input.Params["issueKey"] = request.IssueKey
270+
return closeIssue(input, err, connection)
272271
}
273272

274273
// CloseIssueByName
@@ -296,21 +295,21 @@ func CloseIssueByName(input *plugin.ApiResourceInput) (*plugin.ApiResourceOutput
296295
// @Failure 500 {string} errcode.Error "Internal Error"
297296
// @Router /plugins/webhook/connections/by-name/{connectionName}/issue/close [POST]
298297
func CloseIssueByBodyByName(input *plugin.ApiResourceInput) (*plugin.ApiResourceOutput, errors.Error) {
299-
connection := &models.WebhookConnection{}
300-
err := connectionHelper.FirstByName(connection, input.Params)
301-
if err != nil {
302-
return nil, err
303-
}
304-
request := &CloseIssueByBodyRequest{}
305-
if err2 := helper.DecodeMapStruct(input.Body, request, true); err2 != nil {
306-
return &plugin.ApiResourceOutput{Body: err2.Error(), Status: http.StatusBadRequest}, nil
307-
}
308-
vld = validator.New()
309-
if err2 := errors.Convert(vld.Struct(request)); err2 != nil {
310-
return &plugin.ApiResourceOutput{Body: err2.Error(), Status: http.StatusBadRequest}, nil
311-
}
312-
input.Params["issueKey"] = request.IssueKey
313-
return closeIssue(input, err, connection)
298+
connection := &models.WebhookConnection{}
299+
err := connectionHelper.FirstByName(connection, input.Params)
300+
if err != nil {
301+
return nil, err
302+
}
303+
request := &CloseIssueByBodyRequest{}
304+
if err2 := helper.DecodeMapStruct(input.Body, request, true); err2 != nil {
305+
return &plugin.ApiResourceOutput{Body: err2.Error(), Status: http.StatusBadRequest}, nil
306+
}
307+
vld = validator.New()
308+
if err2 := errors.Convert(vld.Struct(request)); err2 != nil {
309+
return &plugin.ApiResourceOutput{Body: err2.Error(), Status: http.StatusBadRequest}, nil
310+
}
311+
input.Params["issueKey"] = request.IssueKey
312+
return closeIssue(input, err, connection)
314313
}
315314

316315
func closeIssue(input *plugin.ApiResourceInput, err errors.Error, connection *models.WebhookConnection) (*plugin.ApiResourceOutput, errors.Error) {

0 commit comments

Comments
 (0)