diff options
| author | sillyguodong <33891828+sillyguodong@users.noreply.github.com> | 2024-03-14 12:59:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-14 04:59:52 +0000 |
| commit | 2033eb7c1138a06ea052e6c6e6e5799187519e16 (patch) | |
| tree | 81e5111a94c282e3df6a232d8f42a566a0babdcf | |
| parent | eb8c34fc367f324226625d39d0487f945269cd73 (diff) | |
| download | gitea-2033eb7c1138a06ea052e6c6e6e5799187519e16.tar.gz gitea-2033eb7c1138a06ea052e6c6e6e5799187519e16.zip | |
Fix lint-swagger warning (#29787)
Caused by: #23106
Fix:
https://github.com/go-gitea/gitea/actions/runs/8274650046/job/22640335697
1. Delete `UserBadgeList` in `options.go`, because it wasn't used. (The
struct defined in `options.go` is the struct used to parse the request
body)
2. Move `BadgeList` struct under `routers/api/v1/swagger` folder which
response should be defined in.
| -rw-r--r-- | modules/structs/user.go | 7 | ||||
| -rw-r--r-- | routers/api/v1/swagger/options.go | 3 | ||||
| -rw-r--r-- | routers/api/v1/swagger/user.go | 7 | ||||
| -rw-r--r-- | templates/swagger/v1_json.tmpl | 17 |
4 files changed, 8 insertions, 26 deletions
diff --git a/modules/structs/user.go b/modules/structs/user.go index c43558be5d..21ecc1479e 100644 --- a/modules/structs/user.go +++ b/modules/structs/user.go @@ -132,10 +132,3 @@ type UserBadgeOption struct { // example: ["badge1","badge2"] BadgeSlugs []string `json:"badge_slugs" binding:"Required"` } - -// BadgeList -// swagger:response BadgeList -type BadgeList struct { - // in:body - Body []Badge `json:"body"` -} diff --git a/routers/api/v1/swagger/options.go b/routers/api/v1/swagger/options.go index e03862d7b9..471e7d9c4e 100644 --- a/routers/api/v1/swagger/options.go +++ b/routers/api/v1/swagger/options.go @@ -193,7 +193,4 @@ type swaggerParameterBodies struct { // in:body UserBadgeOption api.UserBadgeOption - - // in:body - UserBadgeList api.BadgeList } diff --git a/routers/api/v1/swagger/user.go b/routers/api/v1/swagger/user.go index fb6d185ee7..e2ad511d2b 100644 --- a/routers/api/v1/swagger/user.go +++ b/routers/api/v1/swagger/user.go @@ -48,3 +48,10 @@ type swaggerResponseUserSettings struct { // in:body Body []api.UserSettings `json:"body"` } + +// BadgeList +// swagger:response BadgeList +type swaggerResponseBadgeList struct { + // in:body + Body []api.Badge `json:"body"` +} diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 221b34b7f8..f835df084d 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -17413,21 +17413,6 @@ }, "x-go-package": "code.gitea.io/gitea/modules/structs" }, - "BadgeList": { - "description": "BadgeList", - "type": "object", - "properties": { - "body": { - "description": "in:body", - "type": "array", - "items": { - "$ref": "#/definitions/Badge" - }, - "x-go-name": "Body" - } - }, - "x-go-package": "code.gitea.io/gitea/modules/structs" - }, "Branch": { "description": "Branch represents a repository branch", "type": "object", @@ -24722,7 +24707,7 @@ "parameterBodies": { "description": "parameterBodies", "schema": { - "$ref": "#/definitions/BadgeList" + "$ref": "#/definitions/UserBadgeOption" } }, "redirect": { |