-
-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Add admin API route for managing user's badges #23106
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
Merged
Changes from all commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
7a9d2b1
add admin api to modify user badges
techknowlogick 0cc7302
make generate-swagger
techknowlogick 41fb7d5
fix swagger
techknowlogick b8593e9
add pk to table
techknowlogick 07d9045
update migration session
techknowlogick 3731cb8
Merge branch 'main' into badge-api
techknowlogick fc95715
keep badge ID
techknowlogick 88eb680
fix variable
techknowlogick a9a415d
no new var
techknowlogick eb4b86b
add badge_id back into swagger model
techknowlogick 200f983
fix sql
techknowlogick cb0b1ff
GET endpoint
techknowlogick 9417f3f
Update user_badge.go
techknowlogick 3239ebb
Update models/user/badge.go
techknowlogick 2dce75b
fix missing import
techknowlogick 03462cf
add list route
techknowlogick bf8ae05
move to 1.22
techknowlogick 093150d
Merge remote-tracking branch 'upstream/main' into badge-api
techknowlogick 80e69d9
add tests
techknowlogick 4caef42
fix struct
techknowlogick 53dfaa8
add tests
techknowlogick d749ffa
Update v287.go
techknowlogick 3d0547a
Update user_badge.go
techknowlogick 56fd7e7
make generate-swagger
techknowlogick ae95b13
Merge branch 'main' into badge-api
GiteaBot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
// Copyright 2023 The Gitea Authors. All rights reserved. | ||
// SPDX-License-Identifier: MIT | ||
|
||
package v1_22 //nolint | ||
|
||
import ( | ||
"xorm.io/xorm" | ||
) | ||
|
||
type BadgeUnique struct { | ||
ID int64 `xorm:"pk autoincr"` | ||
Slug string `xorm:"UNIQUE"` | ||
} | ||
|
||
func (BadgeUnique) TableName() string { | ||
return "badge" | ||
} | ||
|
||
func UseSlugInsteadOfIDForBadges(x *xorm.Engine) error { | ||
type Badge struct { | ||
Slug string | ||
} | ||
|
||
err := x.Sync(new(Badge)) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
sess := x.NewSession() | ||
defer sess.Close() | ||
if err := sess.Begin(); err != nil { | ||
return err | ||
} | ||
|
||
_, err = sess.Exec("UPDATE `badge` SET `slug` = `id` Where `slug` IS NULL") | ||
if err != nil { | ||
return err | ||
} | ||
|
||
err = sess.Sync(new(BadgeUnique)) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
return sess.Commit() | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
// Copyright 2024 The Gitea Authors. All rights reserved. | ||
// SPDX-License-Identifier: MIT | ||
|
||
package v1_22 //nolint | ||
|
||
import ( | ||
"fmt" | ||
"testing" | ||
|
||
"code.gitea.io/gitea/models/migrations/base" | ||
|
||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func Test_UpdateBadgeColName(t *testing.T) { | ||
type Badge struct { | ||
ID int64 `xorm:"pk autoincr"` | ||
Description string | ||
ImageURL string | ||
} | ||
|
||
// Prepare and load the testing database | ||
x, deferable := base.PrepareTestEnv(t, 0, new(BadgeUnique), new(Badge)) | ||
defer deferable() | ||
if x == nil || t.Failed() { | ||
return | ||
} | ||
|
||
oldBadges := []Badge{ | ||
{ID: 1, Description: "Test Badge 1", ImageURL: "https://example.com/badge1.png"}, | ||
{ID: 2, Description: "Test Badge 2", ImageURL: "https://example.com/badge2.png"}, | ||
{ID: 3, Description: "Test Badge 3", ImageURL: "https://example.com/badge3.png"}, | ||
} | ||
|
||
for _, badge := range oldBadges { | ||
_, err := x.Insert(&badge) | ||
assert.NoError(t, err) | ||
} | ||
|
||
if err := UseSlugInsteadOfIDForBadges(x); err != nil { | ||
assert.NoError(t, err) | ||
return | ||
} | ||
|
||
got := []BadgeUnique{} | ||
if err := x.Table("badge").Asc("id").Find(&got); !assert.NoError(t, err) { | ||
return | ||
} | ||
|
||
for i, e := range oldBadges { | ||
got := got[i] | ||
assert.Equal(t, e.ID, got.ID) | ||
assert.Equal(t, fmt.Sprintf("%d", e.ID), got.Slug) | ||
} | ||
|
||
// TODO: check if badges have been updated | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,124 @@ | ||
// Copyright 2023 The Gitea Authors. All rights reserved. | ||
// SPDX-License-Identifier: MIT | ||
|
||
package admin | ||
|
||
import ( | ||
"net/http" | ||
|
||
user_model "code.gitea.io/gitea/models/user" | ||
api "code.gitea.io/gitea/modules/structs" | ||
"code.gitea.io/gitea/modules/web" | ||
"code.gitea.io/gitea/services/context" | ||
) | ||
|
||
// ListUserBadges lists all badges belonging to a user | ||
func ListUserBadges(ctx *context.APIContext) { | ||
// swagger:operation GET /admin/users/{username}/badges admin adminListUserBadges | ||
// --- | ||
// summary: List a user's badges | ||
// produces: | ||
// - application/json | ||
// parameters: | ||
// - name: username | ||
// in: path | ||
// description: username of user | ||
// type: string | ||
// required: true | ||
// responses: | ||
// "200": | ||
// "$ref": "#/responses/BadgeList" | ||
// "404": | ||
// "$ref": "#/responses/notFound" | ||
|
||
badges, maxResults, err := user_model.GetUserBadges(ctx, ctx.ContextUser) | ||
if err != nil { | ||
ctx.Error(http.StatusInternalServerError, "GetUserBadges", err) | ||
return | ||
} | ||
|
||
ctx.SetTotalCountHeader(maxResults) | ||
ctx.JSON(http.StatusOK, &badges) | ||
} | ||
|
||
// AddUserBadges add badges to a user | ||
func AddUserBadges(ctx *context.APIContext) { | ||
// swagger:operation POST /admin/users/{username}/badges admin adminAddUserBadges | ||
// --- | ||
// summary: Add a badge to a user | ||
// consumes: | ||
// - application/json | ||
// produces: | ||
// - application/json | ||
// parameters: | ||
// - name: username | ||
// in: path | ||
// description: username of user | ||
// type: string | ||
// required: true | ||
// - name: body | ||
// in: body | ||
// schema: | ||
// "$ref": "#/definitions/UserBadgeOption" | ||
// responses: | ||
// "204": | ||
// "$ref": "#/responses/empty" | ||
// "403": | ||
// "$ref": "#/responses/forbidden" | ||
|
||
form := web.GetForm(ctx).(*api.UserBadgeOption) | ||
badges := prepareBadgesForReplaceOrAdd(ctx, *form) | ||
|
||
if err := user_model.AddUserBadges(ctx, ctx.ContextUser, badges); err != nil { | ||
ctx.Error(http.StatusInternalServerError, "ReplaceUserBadges", err) | ||
return | ||
} | ||
|
||
ctx.Status(http.StatusNoContent) | ||
} | ||
|
||
// DeleteUserBadges delete a badge from a user | ||
func DeleteUserBadges(ctx *context.APIContext) { | ||
// swagger:operation DELETE /admin/users/{username}/badges admin adminDeleteUserBadges | ||
// --- | ||
// summary: Remove a badge from a user | ||
// produces: | ||
// - application/json | ||
// parameters: | ||
// - name: username | ||
// in: path | ||
// description: username of user | ||
// type: string | ||
// required: true | ||
// - name: body | ||
// in: body | ||
// schema: | ||
// "$ref": "#/definitions/UserBadgeOption" | ||
// responses: | ||
// "204": | ||
// "$ref": "#/responses/empty" | ||
// "403": | ||
// "$ref": "#/responses/forbidden" | ||
// "422": | ||
// "$ref": "#/responses/validationError" | ||
|
||
form := web.GetForm(ctx).(*api.UserBadgeOption) | ||
badges := prepareBadgesForReplaceOrAdd(ctx, *form) | ||
|
||
if err := user_model.RemoveUserBadges(ctx, ctx.ContextUser, badges); err != nil { | ||
ctx.Error(http.StatusInternalServerError, "ReplaceUserBadges", err) | ||
return | ||
} | ||
|
||
ctx.Status(http.StatusNoContent) | ||
} | ||
|
||
func prepareBadgesForReplaceOrAdd(ctx *context.APIContext, form api.UserBadgeOption) []*user_model.Badge { | ||
badges := make([]*user_model.Badge, len(form.BadgeSlugs)) | ||
for i, badge := range form.BadgeSlugs { | ||
badges[i] = &user_model.Badge{ | ||
Slug: badge, | ||
} | ||
} | ||
return badges | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.