Skip to content

additional data for type StopWatch in swagger api #12458

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

Merged

Conversation

no-go
Copy link
Contributor

@no-go no-go commented Aug 8, 2020

Fixes #12457

I test it with (Linux, go 1.14.5) make build and make test:

go test  -mod=vendor -tags='sqlite sqlite_unlock_notify' code.gitea.io/gitea code.gitea.io/gitea/cmd code.gitea.io/gitea/contrib/environment-to-ini code.gitea.io/gitea/contrib/fixtures code.gitea.io/gitea/contrib/pr code.gitea.io/gitea/models code.gitea.io/gitea/models/migrations code.gitea.io/gitea/modules/analyze code.gitea.io/gitea/modules/auth code.gitea.io/gitea/modules/auth/ldap code.gitea.io/gitea/modules/auth/oauth2 code.gitea.io/gitea/modules/auth/openid code.gitea.io/gitea/modules/auth/pam code.gitea.io/gitea/modules/auth/sso code.gitea.io/gitea/modules/avatar code.gitea.io/gitea/modules/base code.gitea.io/gitea/modules/cache code.gitea.io/gitea/modules/charset code.gitea.io/gitea/modules/context code.gitea.io/gitea/modules/convert code.gitea.io/gitea/modules/cron code.gitea.io/gitea/modules/emoji code.gitea.io/gitea/modules/eventsource code.gitea.io/gitea/modules/generate code.gitea.io/gitea/modules/git code.gitea.io/gitea/modules/git/pipeline code.gitea.io/gitea/modules/gitgraph code.gitea.io/gitea/modules/graceful code.gitea.io/gitea/modules/highlight code.gitea.io/gitea/modules/httplib code.gitea.io/gitea/modules/indexer/code code.gitea.io/gitea/modules/indexer/issues code.gitea.io/gitea/modules/indexer/stats code.gitea.io/gitea/modules/lfs code.gitea.io/gitea/modules/log code.gitea.io/gitea/modules/markup code.gitea.io/gitea/modules/markup/common code.gitea.io/gitea/modules/markup/csv code.gitea.io/gitea/modules/markup/external code.gitea.io/gitea/modules/markup/markdown code.gitea.io/gitea/modules/markup/mdstripper code.gitea.io/gitea/modules/markup/orgmode code.gitea.io/gitea/modules/metrics code.gitea.io/gitea/modules/migrations code.gitea.io/gitea/modules/migrations/base code.gitea.io/gitea/modules/notification code.gitea.io/gitea/modules/notification/action code.gitea.io/gitea/modules/notification/base code.gitea.io/gitea/modules/notification/indexer code.gitea.io/gitea/modules/notification/mail code.gitea.io/gitea/modules/notification/ui code.gitea.io/gitea/modules/notification/webhook code.gitea.io/gitea/modules/options code.gitea.io/gitea/modules/password code.gitea.io/gitea/modules/pprof code.gitea.io/gitea/modules/private code.gitea.io/gitea/modules/process code.gitea.io/gitea/modules/public code.gitea.io/gitea/modules/queue code.gitea.io/gitea/modules/recaptcha code.gitea.io/gitea/modules/references code.gitea.io/gitea/modules/repofiles code.gitea.io/gitea/modules/repository code.gitea.io/gitea/modules/secret code.gitea.io/gitea/modules/session code.gitea.io/gitea/modules/setting code.gitea.io/gitea/modules/ssh code.gitea.io/gitea/modules/structs code.gitea.io/gitea/modules/svg code.gitea.io/gitea/modules/sync code.gitea.io/gitea/modules/task code.gitea.io/gitea/modules/templates code.gitea.io/gitea/modules/test code.gitea.io/gitea/modules/timeutil code.gitea.io/gitea/modules/upload code.gitea.io/gitea/modules/user code.gitea.io/gitea/modules/util code.gitea.io/gitea/modules/validation code.gitea.io/gitea/modules/webhook code.gitea.io/gitea/routers code.gitea.io/gitea/routers/admin code.gitea.io/gitea/routers/api/v1 code.gitea.io/gitea/routers/api/v1/admin code.gitea.io/gitea/routers/api/v1/misc code.gitea.io/gitea/routers/api/v1/notify code.gitea.io/gitea/routers/api/v1/org code.gitea.io/gitea/routers/api/v1/repo code.gitea.io/gitea/routers/api/v1/settings code.gitea.io/gitea/routers/api/v1/swagger code.gitea.io/gitea/routers/api/v1/user code.gitea.io/gitea/routers/api/v1/utils code.gitea.io/gitea/routers/dev code.gitea.io/gitea/routers/events code.gitea.io/gitea/routers/org code.gitea.io/gitea/routers/private code.gitea.io/gitea/routers/repo code.gitea.io/gitea/routers/routes code.gitea.io/gitea/routers/user code.gitea.io/gitea/routers/user/setting code.gitea.io/gitea/routers/utils code.gitea.io/gitea/services/comments code.gitea.io/gitea/services/externalaccount code.gitea.io/gitea/services/gitdiff code.gitea.io/gitea/services/issue code.gitea.io/gitea/services/mailer code.gitea.io/gitea/services/mirror code.gitea.io/gitea/services/pull code.gitea.io/gitea/services/release code.gitea.io/gitea/services/repository code.gitea.io/gitea/services/wiki
# github.com/mattn/go-sqlite3
sqlite3-binding.c: In Funktion »sqlite3SelectNew«:
sqlite3-binding.c:125801:10: Warnung: Funktion liefert möglicherweise Adresse einer lokalen Variablen zurück [-Wreturn-local-addr]
125801 |   return pNew;
       |          ^~~~
sqlite3-binding.c:125761:10: Anmerkung: hier deklariert
125761 |   Select standin;
       |          ^~~~~~~
?   	code.gitea.io/gitea	[no test files]
ok  	code.gitea.io/gitea/cmd	0.277s
?   	code.gitea.io/gitea/contrib/environment-to-ini	[no test files]
?   	code.gitea.io/gitea/contrib/fixtures	[no test files]
?   	code.gitea.io/gitea/contrib/pr	[no test files]
ok  	code.gitea.io/gitea/models	66.305s
?   	code.gitea.io/gitea/models/migrations	[no test files]
?   	code.gitea.io/gitea/modules/analyze	[no test files]
ok  	code.gitea.io/gitea/modules/auth	0.187s
?   	code.gitea.io/gitea/modules/auth/ldap	[no test files]
?   	code.gitea.io/gitea/modules/auth/oauth2	[no test files]
ok  	code.gitea.io/gitea/modules/auth/openid	1.016s
?   	code.gitea.io/gitea/modules/auth/pam	[no test files]
?   	code.gitea.io/gitea/modules/auth/sso	[no test files]
ok  	code.gitea.io/gitea/modules/avatar	0.149s
ok  	code.gitea.io/gitea/modules/base	0.136s
?   	code.gitea.io/gitea/modules/cache	[no test files]
ok  	code.gitea.io/gitea/modules/charset	0.189s
ok  	code.gitea.io/gitea/modules/context	0.310s
ok  	code.gitea.io/gitea/modules/convert	0.829s
?   	code.gitea.io/gitea/modules/cron	[no test files]
ok  	code.gitea.io/gitea/modules/emoji	0.034s
ok  	code.gitea.io/gitea/modules/eventsource	0.239s
ok  	code.gitea.io/gitea/modules/generate	0.008s
ok  	code.gitea.io/gitea/modules/git	0.936s
?   	code.gitea.io/gitea/modules/git/pipeline	[no test files]
ok  	code.gitea.io/gitea/modules/gitgraph	0.122s
?   	code.gitea.io/gitea/modules/graceful	[no test files]
?   	code.gitea.io/gitea/modules/highlight	[no test files]
?   	code.gitea.io/gitea/modules/httplib	[no test files]
ok  	code.gitea.io/gitea/modules/indexer/code	1.157s
ok  	code.gitea.io/gitea/modules/indexer/issues	5.819s
ok  	code.gitea.io/gitea/modules/indexer/stats	5.485s
?   	code.gitea.io/gitea/modules/lfs	[no test files]
ok  	code.gitea.io/gitea/modules/log	0.251s
ok  	code.gitea.io/gitea/modules/markup	1.610s
?   	code.gitea.io/gitea/modules/markup/common	[no test files]
ok  	code.gitea.io/gitea/modules/markup/csv	0.169s
?   	code.gitea.io/gitea/modules/markup/external	[no test files]
ok  	code.gitea.io/gitea/modules/markup/markdown	0.261s
ok  	code.gitea.io/gitea/modules/markup/mdstripper	0.169s
ok  	code.gitea.io/gitea/modules/markup/orgmode	0.222s
?   	code.gitea.io/gitea/modules/metrics	[no test files]
ok  	code.gitea.io/gitea/modules/migrations	7.930s
?   	code.gitea.io/gitea/modules/migrations/base	[no test files]
?   	code.gitea.io/gitea/modules/notification	[no test files]
ok  	code.gitea.io/gitea/modules/notification/action	0.567s
?   	code.gitea.io/gitea/modules/notification/base	[no test files]
?   	code.gitea.io/gitea/modules/notification/indexer	[no test files]
?   	code.gitea.io/gitea/modules/notification/mail	[no test files]
?   	code.gitea.io/gitea/modules/notification/ui	[no test files]
?   	code.gitea.io/gitea/modules/notification/webhook	[no test files]
?   	code.gitea.io/gitea/modules/options	[no test files]
ok  	code.gitea.io/gitea/modules/password	0.301s
?   	code.gitea.io/gitea/modules/pprof	[no test files]
?   	code.gitea.io/gitea/modules/private	[no test files]
ok  	code.gitea.io/gitea/modules/process	0.247s
?   	code.gitea.io/gitea/modules/public	[no test files]
ok  	code.gitea.io/gitea/modules/queue	1.564s
?   	code.gitea.io/gitea/modules/recaptcha	[no test files]
ok  	code.gitea.io/gitea/modules/references	0.186s
ok  	code.gitea.io/gitea/modules/repofiles	6.069s
ok  	code.gitea.io/gitea/modules/repository	1.512s
ok  	code.gitea.io/gitea/modules/secret	0.009s
?   	code.gitea.io/gitea/modules/session	[no test files]
ok  	code.gitea.io/gitea/modules/setting	0.130s
?   	code.gitea.io/gitea/modules/ssh	[no test files]
?   	code.gitea.io/gitea/modules/structs	[no test files]
?   	code.gitea.io/gitea/modules/svg	[no test files]
ok  	code.gitea.io/gitea/modules/sync	0.009s
?   	code.gitea.io/gitea/modules/task	[no test files]
ok  	code.gitea.io/gitea/modules/templates	0.292s
?   	code.gitea.io/gitea/modules/test	[no test files]
ok  	code.gitea.io/gitea/modules/timeutil	0.155s
ok  	code.gitea.io/gitea/modules/upload	0.008s
ok  	code.gitea.io/gitea/modules/user	0.050s
ok  	code.gitea.io/gitea/modules/util	0.176s
ok  	code.gitea.io/gitea/modules/validation	0.127s
ok  	code.gitea.io/gitea/modules/webhook	0.744s
?   	code.gitea.io/gitea/routers	[no test files]
ok  	code.gitea.io/gitea/routers/admin	1.934s
?   	code.gitea.io/gitea/routers/api/v1	[no test files]
?   	code.gitea.io/gitea/routers/api/v1/admin	[no test files]
ok  	code.gitea.io/gitea/routers/api/v1/misc	0.255s
?   	code.gitea.io/gitea/routers/api/v1/notify	[no test files]
?   	code.gitea.io/gitea/routers/api/v1/org	[no test files]
ok  	code.gitea.io/gitea/routers/api/v1/repo	1.469s
?   	code.gitea.io/gitea/routers/api/v1/settings	[no test files]
?   	code.gitea.io/gitea/routers/api/v1/swagger	[no test files]
?   	code.gitea.io/gitea/routers/api/v1/user	[no test files]
?   	code.gitea.io/gitea/routers/api/v1/utils	[no test files]
?   	code.gitea.io/gitea/routers/dev	[no test files]
?   	code.gitea.io/gitea/routers/events	[no test files]
?   	code.gitea.io/gitea/routers/org	[no test files]
?   	code.gitea.io/gitea/routers/private	[no test files]
ok  	code.gitea.io/gitea/routers/repo	12.761s
?   	code.gitea.io/gitea/routers/routes	[no test files]
ok  	code.gitea.io/gitea/routers/user	0.936s
ok  	code.gitea.io/gitea/routers/user/setting	4.045s
ok  	code.gitea.io/gitea/routers/utils	0.006s
?   	code.gitea.io/gitea/services/comments	[no test files]
?   	code.gitea.io/gitea/services/externalaccount	[no test files]
ok  	code.gitea.io/gitea/services/gitdiff	1.326s
ok  	code.gitea.io/gitea/services/issue	1.279s
ok  	code.gitea.io/gitea/services/mailer	0.930s
ok  	code.gitea.io/gitea/services/mirror	1.376s
ok  	code.gitea.io/gitea/services/pull	0.943s
ok  	code.gitea.io/gitea/services/release	12.994s
ok  	code.gitea.io/gitea/services/repository	0.483s
ok  	code.gitea.io/gitea/services/wiki	1.622s

@lunny lunny added modifies/api This PR adds API routes or modifies them type/enhancement An improvement of existing functionality labels Aug 8, 2020
@no-go
Copy link
Contributor Author

no-go commented Aug 8, 2020

Please help! I did not know how to fix the "lint-backend swagger-check": it dislike changes on templates/swagger/v1_json.tmpl

I did not find a solution to "extend" the api with a new version. Should I only add a new v2_json.tmpl ?

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 8, 2020
@lunny
Copy link
Member

lunny commented Aug 8, 2020

Did you run make generate-swagger?

@zeripath
Copy link
Contributor

zeripath commented Aug 8, 2020

It's probably also sensible to cache the repo in the api.StopWatches level

@6543
Copy link
Member

6543 commented Sep 5, 2020

@zeripath this could be done when we move APIFormat() to the convert package and add a function to convert model.StopWatchList's ...

-> #12723

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Sep 5, 2020
@techknowlogick techknowlogick added this to the 1.13.0 milestone Sep 5, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Sep 5, 2020
@codecov-commenter
Copy link

Codecov Report

Merging #12458 into master will increase coverage by 0.01%.
The diff coverage is 71.42%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #12458      +/-   ##
==========================================
+ Coverage   43.41%   43.42%   +0.01%     
==========================================
  Files         647      647              
  Lines       71495    71500       +5     
==========================================
+ Hits        31041    31051      +10     
+ Misses      35433    35432       -1     
+ Partials     5021     5017       -4     
Impacted Files Coverage Δ
models/issue_stopwatch.go 70.54% <71.42%> (-0.43%) ⬇️
models/repo_mirror.go 2.38% <0.00%> (-11.91%) ⬇️
modules/cron/tasks_basic.go 87.35% <0.00%> (-3.45%) ⬇️
modules/git/utils.go 73.77% <0.00%> (-3.28%) ⬇️
modules/queue/unique_queue_disk_channel.go 53.84% <0.00%> (-1.54%) ⬇️
services/mirror/mirror.go 18.58% <0.00%> (-1.36%) ⬇️
modules/git/repo.go 49.23% <0.00%> (-0.51%) ⬇️
services/pull/pull.go 41.57% <0.00%> (-0.47%) ⬇️
models/issue_comment.go 53.75% <0.00%> (-0.16%) ⬇️
models/error.go 35.66% <0.00%> (+0.34%) ⬆️
... and 7 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dba5d82...217fa43. Read the comment docs.

@zeripath zeripath merged commit 385433d into go-gitea:master Sep 5, 2020
@6543
Copy link
Member

6543 commented Sep 5, 2020

as montioned the refactor: #12729

@no-go no-go deleted the feature_api_stopwatch_repoinfo_issue12457 branch October 1, 2020 21:32
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them type/enhancement An improvement of existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Proposal - api - add more details to "type StopWatch" [WIP]
7 participants