-
-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Add user settings key/value DB table #16834
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 25 commits
Commits
Show all changes
72 commits
Select commit
Hold shift + click to select a range
515311b
add user settings k/v DB table
techknowlogick 40c45f4
resolve lint issues
techknowlogick 7a35bc3
Merge branch 'main' into user-settings
techknowlogick a0a1dac
add migration & tests
techknowlogick d6c169c
fix lint
techknowlogick 9614a3f
fix sql query
techknowlogick 147a52c
update per Lunny's feedback
techknowlogick 03f8bca
Merge branch 'main' into user-settings
techknowlogick 0f2bd2b
Merge branch 'main' into user-settings
techknowlogick 2132a96
Merge branch 'main' into user-settings
techknowlogick ebae68e
Update models/user_setting.go
techknowlogick 9f72e70
Rename v193.go to v196.go
techknowlogick a3a8271
Rename v196.go to v198.go
techknowlogick 10c4a7c
Merge remote-tracking branch 'upstream/main' into user-settings
techknowlogick caaf873
refactor PR from recent models/db refactor
techknowlogick f04598c
refactor PR from recent models/db refactor
techknowlogick d82b4de
use correct way to start new session
techknowlogick d48c711
fix tests
techknowlogick 7ea3b8a
Merge branch 'main' into user-settings
techknowlogick e67e72f
Merge branch 'main' into user-settings
techknowlogick 0314c56
Apply suggestions from code review
techknowlogick 2890b7b
Update models/migrations/v197.go
techknowlogick e7bce0c
Update models/error.go
techknowlogick 851eb3d
Update models/user_setting.go
techknowlogick 4c56f95
update per delvh feedback
techknowlogick ee8104c
rename to 198
techknowlogick 844fb46
Merge branch 'main' into user-settings
techknowlogick f5fe983
upsert & add const to test
techknowlogick 70df32f
rm dead code
techknowlogick d18b2f9
mk fmt
techknowlogick d2e9d1c
Rename v198.go to v199.go
techknowlogick ea98352
Merge branch 'main' into user-settings
techknowlogick 595abd0
temp move migration to a higher number to make merge conflict easier
techknowlogick 553b583
use correct migration number
techknowlogick 261fcbb
update per feedback
techknowlogick 1c1d85a
swap to map
techknowlogick 5d98572
return error when key not lower case
techknowlogick 7401b41
Merge branch 'main' into user-settings
wxiaoguang cbb145c
match migration struct to user setting struct
techknowlogick d8aeec7
mv files
techknowlogick d8e1c18
fix lint
techknowlogick 4489d39
change struct name
techknowlogick cb50d48
fix caps
techknowlogick 5f719fc
add comment to placate lint
techknowlogick e8b2f2c
Merge branch 'main' into user-settings
techknowlogick ba39900
pass tests
techknowlogick d6c4bb1
Merge branch 'main' into user-settings
techknowlogick 46ba3b7
Merge branch 'main' into user-settings
techknowlogick 4af49fd
Merge branch 'main' into user-settings
techknowlogick ee6ad18
Merge branch 'main' into user-settings
techknowlogick 09841e6
Update setting_test.go
techknowlogick 23b43b5
Merge branch 'main' into user-settings
techknowlogick c363283
Merge branch 'main' into user-settings
techknowlogick a28c975
Merge branch 'main' into user-settings
techknowlogick da22337
Merge branch 'main' into user-settings
techknowlogick d39f3c6
Merge branch 'main' into user-settings
techknowlogick c18f5c0
Merge branch 'main' into user-settings
techknowlogick 43b32d0
swap upsert logic
techknowlogick 00950c6
woops, only update key for specific user
techknowlogick cef5e77
update per lunny feedback
techknowlogick 374edb2
Merge branch 'main' into user-settings
techknowlogick 63f71fe
Update setting.go
wxiaoguang 83fa71e
Update setting_test.go
wxiaoguang c81f0b8
Update setting.go comments
wxiaoguang 84aac13
Update setting.go
wxiaoguang ee57a24
proper casing
techknowlogick 25fbcae
more casing changes
techknowlogick 73a869e
fix transaction session and unit test
wxiaoguang 5d28949
remove unnecessary SQL sorting
wxiaoguang 162bcbe
use WithTx instead of TxContext
wxiaoguang 8f004d1
Merge branch 'main' into user-settings
wxiaoguang d37c7c8
Merge branch 'main' into user-settings
lunny 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
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,25 @@ | ||
// Copyright 2021 The Gitea Authors. All rights reserved. | ||
// Use of this source code is governed by a MIT-style | ||
// license that can be found in the LICENSE file. | ||
|
||
package migrations | ||
|
||
import ( | ||
"fmt" | ||
|
||
"xorm.io/xorm" | ||
) | ||
|
||
func createUserSettingsTable(x *xorm.Engine) error { | ||
type UserSetting struct { | ||
ID int64 `xorm:"pk autoincr"` | ||
UserID int64 `xorm:"index unique(key_userid)"` // to load all of someone's settings | ||
Key string `xorm:"varchar(255) index unique(key_userid)"` // ensure key is always lowercase | ||
Value string `xorm:"text"` | ||
} | ||
if err := x.Sync2(new(UserSetting)); err != nil { | ||
return fmt.Errorf("sync2: %v", err) | ||
} | ||
return nil | ||
|
||
} |
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,120 @@ | ||
// Copyright 2021 The Gitea Authors. All rights reserved. | ||
// Use of this source code is governed by a MIT-style | ||
// license that can be found in the LICENSE file. | ||
|
||
package models | ||
|
||
import ( | ||
"strings" | ||
|
||
"code.gitea.io/gitea/models/db" | ||
|
||
"xorm.io/builder" | ||
) | ||
|
||
// UserSetting is a key value store of user settings | ||
type UserSetting struct { | ||
ID int64 `xorm:"pk autoincr"` | ||
UserID int64 `xorm:"index unique(key_userid)"` // to load all of someone's settings | ||
Key string `xorm:"varchar(255) index unique(key_userid)"` // ensure key is always lowercase | ||
Value string `xorm:"text"` | ||
} | ||
|
||
// BeforeInsert will be invoked by XORM before inserting a record | ||
func (setting *UserSetting) BeforeInsert() { | ||
techknowlogick marked this conversation as resolved.
Show resolved
Hide resolved
|
||
setting.Key = strings.ToLower(setting.Key) | ||
} | ||
|
||
// BeforeUpdate will be invoked by XORM before updating a record | ||
func (setting *UserSetting) BeforeUpdate() { | ||
techknowlogick marked this conversation as resolved.
Show resolved
Hide resolved
|
||
setting.Key = strings.ToLower(setting.Key) | ||
} | ||
|
||
// BeforeDelete will be invoked by XORM before updating a record | ||
func (setting *UserSetting) BeforeDelete() { | ||
setting.Key = strings.ToLower(setting.Key) | ||
} | ||
|
||
func init() { | ||
db.RegisterModel(new(UserSetting)) | ||
} | ||
|
||
// GetUserSetting returns specific settings from user | ||
func GetUserSetting(uid int64, keys []string) ([]*UserSetting, error) { | ||
wxiaoguang marked this conversation as resolved.
Show resolved
Hide resolved
|
||
settings := make([]*UserSetting, 0, len(keys)) | ||
if err := db.GetEngine(db.DefaultContext). | ||
Where("user_id=?", uid). | ||
And(builder.In("key", keys)). | ||
Asc("id"). | ||
techknowlogick marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Find(&settings); err != nil { | ||
return nil, err | ||
} | ||
return settings, nil | ||
} | ||
|
||
// GetAllUserSettings returns all settings from user | ||
func GetAllUserSettings(uid int64) ([]*UserSetting, error) { | ||
techknowlogick marked this conversation as resolved.
Show resolved
Hide resolved
|
||
settings := make([]*UserSetting, 0, 5) | ||
if err := db.GetEngine(db.DefaultContext). | ||
Where("user_id=?", uid). | ||
Asc("id"). | ||
Find(&settings); err != nil { | ||
return nil, err | ||
} | ||
return settings, nil | ||
} | ||
|
||
func addUserSetting(e db.Engine, setting *UserSetting) error { | ||
used, err := settingExists(e, setting.UserID, setting.Key) | ||
if err != nil { | ||
return err | ||
} else if used { | ||
return ErrUserSettingExists{setting} | ||
} | ||
_, err = e.Insert(setting) | ||
return err | ||
} | ||
|
||
func settingExists(e db.Engine, uid int64, key string) (bool, error) { | ||
if len(key) == 0 { | ||
return true, nil | ||
} | ||
|
||
return e.Table(&UserSetting{}).Exist(&UserSetting{UserID: uid, Key: strings.ToLower(key)}) | ||
} | ||
|
||
// DeleteUserSetting deletes a specific setting for a user | ||
func DeleteUserSetting(setting *UserSetting) error { | ||
sess := db.NewSession(db.DefaultContext) | ||
defer sess.Close() | ||
if err := sess.Begin(); err != nil { | ||
techknowlogick marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return err | ||
} | ||
|
||
if _, err := sess.Delete(setting); err != nil { | ||
return err | ||
} | ||
|
||
return sess.Commit() | ||
} | ||
|
||
// SetUserSetting updates a users' setting for a specific key | ||
func SetUserSetting(setting *UserSetting) error { | ||
err := addUserSetting(db.GetEngine(db.DefaultContext), setting) | ||
if err != nil && IsErrUserSettingExists(err) { | ||
return updateUserSettingValue(db.GetEngine(db.DefaultContext), setting) | ||
} | ||
return err | ||
} | ||
|
||
func updateUserSettingValue(e db.Engine, setting *UserSetting) error { | ||
used, err := settingExists(e, setting.UserID, setting.Key) | ||
if err != nil { | ||
return err | ||
techknowlogick marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} else if !used { | ||
return ErrUserSettingNotExists{setting} | ||
} | ||
|
||
_, err = e.ID(setting.ID).Cols("value").Update(setting) | ||
return err | ||
} |
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,44 @@ | ||
// Copyright 2021 The Gitea Authors. All rights reserved. | ||
// Use of this source code is governed by a MIT-style | ||
// license that can be found in the LICENSE file. | ||
|
||
package models | ||
|
||
import ( | ||
"testing" | ||
|
||
"code.gitea.io/gitea/models/db" | ||
|
||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func TestUserSettings(t *testing.T) { | ||
assert.NoError(t, db.PrepareTestDatabase()) | ||
|
||
newSetting := &UserSetting{UserID: 99, Key: "test_user_setting", Value: "Gitea User Setting Test"} | ||
techknowlogick marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
// create setting | ||
err := SetUserSetting(newSetting) | ||
assert.NoError(t, err) | ||
|
||
// get specific setting | ||
userSettings, err := GetUserSetting(99, []string{"test_user_setting"}) | ||
assert.NoError(t, err) | ||
assert.Len(t, userSettings, 1) | ||
assert.EqualValues(t, newSetting.Value, userSettings[0].Value) | ||
|
||
// updated setting | ||
updatedSetting := &UserSetting{UserID: 99, Key: "test_user_setting", Value: "Updated", ID: userSettings[0].ID} | ||
err = SetUserSetting(updatedSetting) | ||
assert.NoError(t, err) | ||
|
||
// get all settings | ||
userSettings, err = GetAllUserSettings(99) | ||
assert.NoError(t, err) | ||
assert.Len(t, userSettings, 1) | ||
assert.EqualValues(t, userSettings[0].Value, updatedSetting.Value) | ||
|
||
// delete setting | ||
err = DeleteUserSetting(updatedSetting) | ||
assert.NoError(t, err) | ||
} |
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.