phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify code

Browse Source
This commit is contained in:
Kuroshini 2020-01-29 22:49:36 +03:00
parent f3ca4a8de9
commit 62c25ac737
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/account/models.py
View File

@ -13,6 +13,7 @@ from django.utils.http import urlsafe_base64_encode
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from rest_framework.authtoken.models import Token from rest_framework.authtoken.models import Token
from collections import Counter from collections import Counter
from typing import List
from authorization.models import Application from authorization.models import Application
from establishment.models import Establishment, EstablishmentSubType from establishment.models import Establishment, EstablishmentSubType
@ -435,7 +436,7 @@ class User(AbstractUser):
result.append(item.id) result.append(item.id)
return set(result) return set(result)
def set_roles(self, ids: set): def set_roles(self, ids: List(int)):
""" """
Set user roles Set user roles
:param ids: list of role ids :param ids: list of role ids

5
apps/account/serializers/back.py
View File

@ -133,10 +133,7 @@ class BackDetailUserSerializer(BackUserSerializer):
subscriptions_list = validated_data.pop('subscription_types') subscriptions_list = validated_data.pop('subscription_types')
if 'roles' in validated_data: if 'roles' in validated_data:
roles_ids = filter( roles_ids = [role['id'] for role in validated_data.pop('roles') if 'id' in role]
lambda filter_role: False if not filter_role else True,
map(lambda role: role["id"] if "id" in role else None, validated_data.pop("roles"))
)
instance.set_roles(roles_ids) instance.set_roles(roles_ids)
instance = super().update(instance, validated_data) instance = super().update(instance, validated_data)