ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-02-07 05:27:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change the way user preferences are stored (JSON instead of plain dict)

Browse Source
This commit is contained in:
allegroai 2020-01-02 15:23:47 +02:00
parent 153ed6a7b7
commit f778837d4b
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/database/model/user.py
View File

@ -1,7 +1,6 @@
from mongoengine import Document, StringField from mongoengine import Document, StringField, DynamicField
from database import Database, strict from database import Database, strict
from database.fields import SafeDictField
from database.model import DbModelMixin from database.model import DbModelMixin
from database.model.company import Company from database.model.company import Company
@ -18,4 +17,4 @@ class User(DbModelMixin, Document):
family_name = StringField(user_set_allowed=True) family_name = StringField(user_set_allowed=True)
given_name = StringField(user_set_allowed=True) given_name = StringField(user_set_allowed=True)
avatar = StringField() avatar = StringField()
preferences = SafeDictField(default=dict, exclude_by_default=True) preferences = DynamicField(default="", exclude_by_default=True)

23
server/services/users.py
View File

@ -7,10 +7,7 @@ from mongoengine import Q
from apierrors import errors from apierrors import errors
from apimodels.base import UpdateResponse from apimodels.base import UpdateResponse
from apimodels.users import ( from apimodels.users import CreateRequest, SetPreferencesRequest
CreateRequest,
SetPreferencesRequest,
)
from bll.user import UserBLL from bll.user import UserBLL
from config import config from config import config
from database.errors import translate_errors_context from database.errors import translate_errors_context
@ -19,6 +16,7 @@ from database.model.company import Company
from database.model.user import User from database.model.user import User
from database.utils import parse_from_call from database.utils import parse_from_call
from service_repo import APICall, endpoint from service_repo import APICall, endpoint
from utilities.json import loads, dumps
log = config.logger(__file__) log = config.logger(__file__)
get_all_query_options = User.QueryParameterOptions(list_fields=("id",)) get_all_query_options = User.QueryParameterOptions(list_fields=("id",))
@ -160,7 +158,10 @@ def update(call, company_id, _):
def get_user_preferences(call): def get_user_preferences(call):
user_id = call.identity.user user_id = call.identity.user
return get_user(call, user_id, ["preferences"]).get("preferences", {}) preferences = get_user(call, user_id, ["preferences"]).get("preferences")
if preferences and isinstance(preferences, str):
preferences = loads(preferences)
return preferences or {}
@endpoint("users.get_preferences") @endpoint("users.get_preferences")
@ -169,9 +170,7 @@ def get_preferences(call):
return {"preferences": get_user_preferences(call)} return {"preferences": get_user_preferences(call)}
@endpoint( @endpoint("users.set_preferences", request_data_model=SetPreferencesRequest)
"users.set_preferences", request_data_model=SetPreferencesRequest
)
def set_preferences(call, company_id, req_model): def set_preferences(call, company_id, req_model):
# type: (APICall, str, SetPreferencesRequest) -> Dict # type: (APICall, str, SetPreferencesRequest) -> Dict
assert isinstance(call, APICall) assert isinstance(call, APICall)
@ -205,9 +204,11 @@ def set_preferences(call, company_id, req_model):
updated, fields = 0, {} updated, fields = 0, {}
else: else:
with translate_errors_context("updating user preferences"): with translate_errors_context("updating user preferences"):
fields = dict(preferences=new_preferences)
updated = User.objects(id=call.identity.user, company=company_id).update( updated = User.objects(id=call.identity.user, company=company_id).update(
upsert=False, **fields upsert=False, preferences=dumps(new_preferences)
) )
return {"updated": updated, "fields": fields if updated else {}} return {
"updated": updated,
"fields": {"preferences": new_preferences} if updated else {},
}