realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

additional data for type StopWatch in swagger api (#12458)

Browse source 
* additional data for type StopWatch in swagger api

* fix lint-backend issue with gofmt

* fix format in v1_json with 'make generate-swagger'

* using issue.LoadRepo() instead of getRepositoryByID()

Co-authored-by: jochen@homeland <no-go@localhost>
Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
Jochen Peters 2020-09-05 13:58:33 +02:00 committed by GitHub
parent dba5d82f86
commit 385433d2f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
models/issue_stopwatch.go
View file

@ -201,9 +201,15 @@ func (sw *Stopwatch) APIFormat() (api.StopWatch, error) {
if err != nil { if err != nil {
return api.StopWatch{}, err return api.StopWatch{}, err
} }
if err := issue.LoadRepo(); err != nil {
return api.StopWatch{}, err
}
return api.StopWatch{ return api.StopWatch{
Created: sw.CreatedUnix.AsTime(), Created: sw.CreatedUnix.AsTime(),
IssueIndex: issue.Index, IssueIndex: issue.Index,
IssueTitle: issue.Title,
RepoOwnerName: issue.Repo.OwnerName,
RepoName: issue.Repo.Name,
}, nil }, nil
} }

7
modules/structs/issue_stopwatch.go
View file

@ -11,8 +11,11 @@ import (
// StopWatch represent a running stopwatch // StopWatch represent a running stopwatch
type StopWatch struct { type StopWatch struct {
// swagger:strfmt date-time // swagger:strfmt date-time
Created time.Time `json:"created"` Created time.Time `json:"created"`
IssueIndex int64 `json:"issue_index"` IssueIndex int64 `json:"issue_index"`
IssueTitle string `json:"issue_title"`
RepoOwnerName string `json:"repo_owner_name"`
RepoName string `json:"repo_name"`
} }
// StopWatches represent a list of stopwatches // StopWatches represent a list of stopwatches

12
templates/swagger/v1_json.tmpl
View file

@ -14698,6 +14698,18 @@
"type": "integer", "type": "integer",
"format": "int64", "format": "int64",
"x-go-name": "IssueIndex" "x-go-name": "IssueIndex"
},
"issue_title": {
"type": "string",
"x-go-name": "IssueTitle"
},
"repo_name": {
"type": "string",
"x-go-name": "RepoName"
},
"repo_owner_name": {
"type": "string",
"x-go-name": "RepoOwnerName"
} }
}, },
"x-go-package": "code.gitea.io/gitea/modules/structs" "x-go-package": "code.gitea.io/gitea/modules/structs"