mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-03 20:47:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Pass userId explicitly to UserPropsRepository methods

Browse source
This commit is contained in:
Deluan 2021-06-25 22:21:37 -04:00
parent a1551074bb
commit ee21f3957e
8 changed files with 42 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

31
persistence/user_props_repository.go
View file

@ -6,7 +6,6 @@ import (
. "github.com/Masterminds/squirrel"
"github.com/astaxie/beego/orm"
"github.com/navidrome/navidrome/model"
"github.com/navidrome/navidrome/model/request"
)
type userPropsRepository struct {
@ -21,12 +20,8 @@ func NewUserPropsRepository(ctx context.Context, o orm.Ormer) model.UserPropsRep
return r
}
func (r userPropsRepository) Put(key string, value string) error {
u, ok := request.UserFrom(r.ctx)
if !ok {
return model.ErrInvalidAuth
}
update := Update(r.tableName).Set("value", value).Where(And{Eq{"user_id": u.ID}, Eq{"key": key}})
func (r userPropsRepository) Put(userId, key string, value string) error {
update := Update(r.tableName).Set("value", value).Where(And{Eq{"user_id": userId}, Eq{"key": key}})
count, err := r.executeSQL(update)
if err != nil {
return nil
@ -34,17 +29,13 @@ func (r userPropsRepository) Put(key string, value string) error {
if count > 0 {
return nil
}
insert := Insert(r.tableName).Columns("user_id", "key", "value").Values(u.ID, key, value)
insert := Insert(r.tableName).Columns("user_id", "key", "value").Values(userId, key, value)
_, err = r.executeSQL(insert)
return err
}
func (r userPropsRepository) Get(key string) (string, error) {
u, ok := request.UserFrom(r.ctx)
if !ok {
return "", model.ErrInvalidAuth
}
sel := Select("value").From(r.tableName).Where(And{Eq{"user_id": u.ID}, Eq{"key": key}})
func (r userPropsRepository) Get(userId, key string) (string, error) {
sel := Select("value").From(r.tableName).Where(And{Eq{"user_id": userId}, Eq{"key": key}})
resp := struct {
Value string
}{}
@ -55,8 +46,8 @@ func (r userPropsRepository) Get(key string) (string, error) {
return resp.Value, nil
}
func (r userPropsRepository) DefaultGet(key string, defaultValue string) (string, error) {
value, err := r.Get(key)
func (r userPropsRepository) DefaultGet(userId, key string, defaultValue string) (string, error) {
value, err := r.Get(userId, key)
if err == model.ErrNotFound {
return defaultValue, nil
}
@ -66,10 +57,6 @@ func (r userPropsRepository) DefaultGet(key string, defaultValue string) (string
return value, nil
}
func (r userPropsRepository) Delete(key string) error {
u, ok := request.UserFrom(r.ctx)
if !ok {
return model.ErrInvalidAuth
}
return r.delete(And{Eq{"user_id": u.ID}, Eq{"key": key}})
func (r userPropsRepository) Delete(userId, key string) error {
return r.delete(And{Eq{"user_id": userId}, Eq{"key": key}})
}