Feat: Companies and User permissions added.
This commit is contained in:
@@ -10,6 +10,7 @@ Feature: User Business Object
|
||||
# internal
|
||||
from business_objects.base import Base
|
||||
from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
|
||||
from business_objects.dog.company import Company
|
||||
import lib.argument_validation as av
|
||||
from extensions import db
|
||||
from forms.base import Form_Filters_User
|
||||
@@ -20,6 +21,14 @@ from typing import ClassVar, Optional
|
||||
|
||||
|
||||
class User(SQLAlchemy_ABC, Base):
|
||||
ATTR_ID_USER_AUTH0: ClassVar[str] = 'id_user_auth0'
|
||||
FLAG_CAN_ADMIN_DOG: ClassVar[str] = 'can_admin_dog'
|
||||
FLAG_CAN_ADMIN_USER: ClassVar[str] = 'can_admin_user'
|
||||
FLAG_FIRSTNAME: ClassVar[str] = 'firstname'
|
||||
FLAG_IS_EMAIL_VERIFIED: ClassVar[str] = 'is_email_verified'
|
||||
FLAG_IS_SUPER_USER: ClassVar[str] = 'is_super_user'
|
||||
FLAG_PRIORITY_ACCESS_LEVEL: ClassVar[str] = 'priority_access_level'
|
||||
FLAG_SURNAME: ClassVar[str] = 'surname'
|
||||
NAME_ATTR_OPTION_VALUE: ClassVar[str] = Base.ATTR_ID_USER
|
||||
NAME_ATTR_OPTION_TEXT: ClassVar[str] = Base.FLAG_NAME
|
||||
|
||||
@@ -33,6 +42,9 @@ class User(SQLAlchemy_ABC, Base):
|
||||
email = db.Column(db.String(250))
|
||||
is_email_verified = db.Column(db.Boolean)
|
||||
is_super_user = db.Column(db.Boolean)
|
||||
priority_access_level = db.Column(db.Integer)
|
||||
can_admin_dog = db.Column(db.Boolean)
|
||||
can_admin_user = db.Column(db.Boolean)
|
||||
is_new = db.Column(db.Boolean)
|
||||
|
||||
def __init__(self):
|
||||
@@ -40,6 +52,8 @@ class User(SQLAlchemy_ABC, Base):
|
||||
self.is_new = False
|
||||
self.can_admin_dog = False
|
||||
self.can_admin_user = False
|
||||
self.id_company = None
|
||||
self.company = None
|
||||
super().__init__()
|
||||
|
||||
@classmethod
|
||||
@@ -51,11 +65,14 @@ class User(SQLAlchemy_ABC, Base):
|
||||
user.firstname = query_row[2]
|
||||
user.surname = query_row[3]
|
||||
user.email = query_row[4]
|
||||
user.is_email_verified = av.input_bool(query_row[5], 'is_email_verified', _m)
|
||||
user.is_super_user = av.input_bool(query_row[6], 'is_super_user', _m)
|
||||
user.can_admin_dog = av.input_bool(query_row[7], 'can_admin_dog', _m)
|
||||
user.can_admin_user = av.input_bool(query_row[8], 'can_admin_user', _m)
|
||||
user.is_email_verified = av.input_bool(query_row[5], cls.FLAG_IS_EMAIL_VERIFIED, _m)
|
||||
user.id_company = query_row[6]
|
||||
user.is_super_user = av.input_bool(query_row[9], cls.FLAG_IS_SUPER_USER, _m)
|
||||
user.priority_access_level = query_row[10]
|
||||
user.can_admin_dog = av.input_bool(query_row[11], cls.FLAG_CAN_ADMIN_DOG, _m)
|
||||
user.can_admin_user = av.input_bool(query_row[12], cls.FLAG_CAN_ADMIN_USER, _m)
|
||||
# user.is_new = av.input_bool(query_row[9], 'is_new', _m)
|
||||
user.company = Company.from_db_user(query_row)
|
||||
return user
|
||||
|
||||
@classmethod
|
||||
@@ -67,71 +84,84 @@ class User(SQLAlchemy_ABC, Base):
|
||||
user.surname = query_row[9]
|
||||
return user
|
||||
|
||||
@staticmethod
|
||||
def from_json(json):
|
||||
_m = 'User.from_json'
|
||||
user = User()
|
||||
@classmethod
|
||||
def from_json(cls, json):
|
||||
_m = f'{cls.__qualname__}.from_json'
|
||||
user = cls()
|
||||
if json is None: return user
|
||||
user.id_user = json['id_user']
|
||||
user.id_user_auth0 = json['id_user_auth0']
|
||||
user.firstname = json['firstname']
|
||||
user.surname = json['surname']
|
||||
user.email = json['email']
|
||||
user.is_email_verified = av.input_bool(json['is_email_verified'], 'is_email_verified', _m)
|
||||
user.is_super_user = av.input_bool(json['is_super_user'], 'is_super_user', _m)
|
||||
|
||||
user.can_admin_dog = user.is_super_user
|
||||
|
||||
|
||||
user.id_user = json[cls.ATTR_ID_USER]
|
||||
user.id_user_auth0 = json[cls.ATTR_ID_USER_AUTH0]
|
||||
user.firstname = json[cls.FLAG_FIRSTNAME]
|
||||
user.surname = json[cls.FLAG_SURNAME]
|
||||
user.email = json[cls.FLAG_EMAIL]
|
||||
user.is_email_verified = av.input_bool(json[cls.FLAG_IS_EMAIL_VERIFIED], cls.FLAG_IS_EMAIL_VERIFIED, _m)
|
||||
user.id_company = json[Company.ATTR_ID_COMPANY]
|
||||
user.is_super_user = av.input_bool(json[cls.FLAG_IS_SUPER_USER], cls.FLAG_IS_SUPER_USER, _m)
|
||||
user.can_admin_dog = user.is_super_user or json[cls.FLAG_CAN_ADMIN_DOG]
|
||||
user.can_admin_user = user.is_super_user or json[cls.FLAG_CAN_ADMIN_USER]
|
||||
user.company = Company.from_json(json[Company.FLAG_COMPANY])
|
||||
return user
|
||||
|
||||
@staticmethod
|
||||
def from_json_auth0(json):
|
||||
_m = 'User.from_json_auth0'
|
||||
user = User()
|
||||
@classmethod
|
||||
def from_json_auth0(cls, json):
|
||||
_m = f'{cls.__qualname__}.from_json_auth0'
|
||||
user = cls()
|
||||
if json is None: return user
|
||||
user_info = json['userinfo']
|
||||
user.id_user = None
|
||||
user.id_user_auth0 = user_info['sub']
|
||||
user.firstname = None
|
||||
user.surname = None
|
||||
user.email = user_info['email']
|
||||
user.is_email_verified = av.input_bool(user_info['email_verified'], 'is_email_verified', _m)
|
||||
user.email = user_info[cls.FLAG_EMAIL]
|
||||
user.is_email_verified = av.input_bool(user_info['email_verified'], cls.FLAG_IS_EMAIL_VERIFIED, _m)
|
||||
user.is_super_user = None
|
||||
|
||||
user.can_admin_dog = user.is_super_user
|
||||
user.can_admin_user = user.is_super_user
|
||||
|
||||
return user
|
||||
|
||||
def to_json(self):
|
||||
as_json = {
|
||||
**self.get_shared_json_attributes(self)
|
||||
, 'id_user': self.id_user
|
||||
, 'id_user_auth0': self.id_user_auth0
|
||||
, 'firstname': self.firstname
|
||||
, 'surname': self.surname
|
||||
, self.ATTR_ID_USER: self.id_user
|
||||
, self.ATTR_ID_USER_AUTH0: self.id_user_auth0
|
||||
, self.FLAG_FIRSTNAME: self.firstname
|
||||
, self.FLAG_SURNAME: self.surname
|
||||
, self.FLAG_NAME: self.get_name()
|
||||
, 'email': self.email
|
||||
, 'is_email_verified': self.is_email_verified
|
||||
, 'is_super_user': self.is_super_user
|
||||
, self.FLAG_EMAIL: self.email
|
||||
, self.FLAG_IS_EMAIL_VERIFIED: self.is_email_verified
|
||||
, self.FLAG_IS_SUPER_USER: self.is_super_user
|
||||
, self.FLAG_PRIORITY_ACCESS_LEVEL: self.priority_access_level
|
||||
, self.FLAG_CAN_ADMIN_DOG: self.can_admin_dog
|
||||
, self.FLAG_CAN_ADMIN_USER: self.can_admin_user
|
||||
, Company.ATTR_ID_COMPANY: self.id_company
|
||||
, Company.FLAG_COMPANY: self.company.to_json()
|
||||
}
|
||||
return as_json
|
||||
|
||||
def __repr__(self):
|
||||
return f'''
|
||||
id_user: {self.id_user}
|
||||
id_user_auth0: {self.id_user_auth0}
|
||||
firstname: {self.firstname}
|
||||
surname: {self.surname}
|
||||
email: {self.email}
|
||||
is_email_verified: {self.is_email_verified}
|
||||
is_super_user: {self.is_super_user}
|
||||
'''
|
||||
User (
|
||||
{self.ATTR_ID_USER}: {self.id_user}
|
||||
, {self.ATTR_ID_USER_AUTH0}: {self.id_user_auth0}
|
||||
, {self.FLAG_FIRSTNAME}: {self.firstname}
|
||||
, {self.FLAG_SURNAME}: {self.surname}
|
||||
, {self.FLAG_NAME}: {self.get_name()}
|
||||
, {self.FLAG_EMAIL}: {self.email}
|
||||
, {self.FLAG_IS_EMAIL_VERIFIED}: {self.is_email_verified}
|
||||
, {self.FLAG_IS_SUPER_USER}: {self.is_super_user}
|
||||
, {self.FLAG_PRIORITY_ACCESS_LEVEL}: {self.priority_access_level}
|
||||
, {self.FLAG_CAN_ADMIN_DOG}: {self.can_admin_dog}
|
||||
, {self.FLAG_CAN_ADMIN_USER}: {self.can_admin_user}
|
||||
) '''
|
||||
|
||||
def get_is_logged_in(self):
|
||||
return (self.id_user > 0 and self.id_user != Base.ID_USER_GUEST)
|
||||
|
||||
def get_name(self):
|
||||
return f'{self.firstname} {self.surname}'
|
||||
return f'{"" if self.firstname is None else self.firstname} {"" if self.surname is None else self.surname}'
|
||||
|
||||
class User_Temp(db.Model, Base):
|
||||
__tablename__ = 'DOG_User_Temp'
|
||||
@@ -162,6 +192,9 @@ class Parameters_User(Get_Many_Parameters_Base):
|
||||
ids_user_auth0: str
|
||||
names_user: str
|
||||
emails_user: str
|
||||
get_all_company: bool
|
||||
get_inactive_company: bool
|
||||
ids_company: str
|
||||
require_all_id_search_filters_met: bool
|
||||
require_any_id_search_filters_met: bool
|
||||
require_all_non_id_search_filters_met: bool
|
||||
@@ -192,8 +225,9 @@ class Parameters_User(Get_Many_Parameters_Base):
|
||||
filters.get_inactive_user = False
|
||||
filters.ids_user = '' if user.id_user is None else str(user.id_user)
|
||||
filters.ids_user_auth0 = user.id_user_auth0
|
||||
filters.names_user = f'{user.firstname} {user.surname}'
|
||||
filters.names_user = user.get_name()
|
||||
filters.emails_user = user.email
|
||||
filters.ids_company = f'{user.id_company if user.id_company is not None else ""}'
|
||||
return filters
|
||||
|
||||
@classmethod
|
||||
@@ -207,6 +241,9 @@ class Parameters_User(Get_Many_Parameters_Base):
|
||||
, ids_user_auth0 = ''
|
||||
, names_user = ''
|
||||
, emails_user = ''
|
||||
, get_all_company = True
|
||||
, get_inactive_company = False
|
||||
, ids_company = ''
|
||||
, require_all_id_search_filters_met = True
|
||||
, require_any_id_search_filters_met = True
|
||||
, require_all_non_id_search_filters_met = False
|
||||
@@ -226,12 +263,16 @@ class Parameters_User(Get_Many_Parameters_Base):
|
||||
, 'a_ids_user_auth0': self.ids_user_auth0
|
||||
, 'a_names_user': self.names_user
|
||||
, 'a_emails_user': self.emails_user
|
||||
, 'a_get_all_company': self.get_all_company
|
||||
, 'a_get_inactive_company': self.get_inactive_company
|
||||
, 'a_ids_company': self.ids_company
|
||||
, 'a_require_all_id_search_filters_met': self.require_all_id_search_filters_met
|
||||
, 'a_require_any_id_search_filters_met': self.require_any_id_search_filters_met
|
||||
, 'a_require_all_non_id_search_filters_met': self.require_all_non_id_search_filters_met
|
||||
, 'a_require_any_non_id_search_filters_met': self.require_any_non_id_search_filters_met
|
||||
}
|
||||
|
||||
"""
|
||||
class User_Permission_Evaluation(db.Model):
|
||||
__tablename__ = 'DOG_User_Permission_Evaluation'
|
||||
__table_args__ = { 'extend_existing': True }
|
||||
@@ -276,3 +317,4 @@ class User_Permission_Evaluation(db.Model):
|
||||
can_edit: {self.can_edit}
|
||||
can_admin: {self.can_admin}
|
||||
'''
|
||||
"""
|
||||
Reference in New Issue
Block a user