admin/dog_training
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat: Companies and User permissions added.

Browse Source
This commit is contained in:
Teddy Middleton-Smith
2025-08-04 20:44:05 +01:00
parent d3813e987f
commit 3d2b753b79
113 changed files with 3906 additions and 1269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
business_objects/dog/command_modality.py
View File

@@ -40,31 +40,31 @@ class Command_Modality(SQLAlchemy_ABC, Base):
@classmethod
def from_db_command_modality(cls, query_row):
_m = f'{cls.__qualname__}.from_db_command_modality'
category = cls()
category.id_command_modality = query_row[0]
category.code = query_row[1]
category.name = query_row[2]
category.active = av.input_bool(query_row[3], 'active', _m)
# command.created_on = query_row[7]
return category
command_modality = cls()
command_modality.id_command_modality = query_row[0]
command_modality.code = query_row[1]
command_modality.name = query_row[2]
command_modality.active = av.input_bool(query_row[3], 'active', _m)
# command_modality.created_on = query_row[7]
return command_modality
@classmethod
def from_db_distraction(cls, query_row):
_m = f'{cls.__qualname__}.from_db_distraction'
level = cls()
level.id_command_modality = query_row[2]
level.name = query_row[3]
level.active = True
return level
command_modality = cls()
command_modality.id_command_modality = query_row[2]
command_modality.name = query_row[3]
command_modality.active = True
return command_modality
@classmethod
def from_db_assessment_command_modality_link(cls, query_row):
_m = f'{cls.__qualname__}.from_db_assessment_command_modality_link'
level = cls()
level.id_command_modality = query_row[7]
level.name = query_row[8]
level.active = True
return level
command_modality = cls()
command_modality.id_command_modality = query_row[7]
command_modality.name = query_row[8]
command_modality.active = True
return command_modality
@classmethod
def from_json(cls, json):

183
business_objects/dog/company.py Normal file
View File

@@ -0,0 +1,183 @@
"""
Project: PARTS Website
Author: Edward Middleton-Smith
Precision And Research Technology Systems Limited
Technology: Business Objects
Feature: Company Business Object
"""
# internal
from business_objects.base import Base
from business_objects.db_base import SQLAlchemy_ABC, Get_Many_Parameters_Base
import lib.argument_validation as av
from extensions import db
from helpers.helper_app import Helper_App
# external
from dataclasses import dataclass
from typing import ClassVar
class Company(SQLAlchemy_ABC, Base):
ATTR_ID_COMPANY: ClassVar[str] = 'id_company'
FLAG_COMPANY: ClassVar[str] = 'company'
NAME_ATTR_OPTION_VALUE: ClassVar[str] = ATTR_ID_COMPANY
NAME_ATTR_OPTION_TEXT: ClassVar[str] = Base.FLAG_NAME
__tablename__ = 'DOG_Company'
__table_args__ = { 'extend_existing': True }
id_company = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(250))
website = db.Column(db.String(1000))
active = db.Column(db.Boolean)
def __init__(self):
self.id_company = 0
self.is_new = False
super().__init__()
@classmethod
def from_db_company(cls, query_row):
_m = f'{cls.__qualname__}.from_db_company'
company = cls()
company.id_company = query_row[0]
company.name = query_row[1]
company.website = query_row[2]
company.active = av.input_bool(query_row[3], 'active', _m)
# company.created_on = query_row[7]
return company
@classmethod
def from_db_user(cls, query_row):
_m = f'{cls.__qualname__}.from_db_user'
company = cls()
company.id_company = query_row[6]
company.name = query_row[7]
company.website = query_row[8]
company.active = True
return company
@classmethod
def from_json(cls, json):
_m = 'Company.from_json'
company = cls()
if json is None: return company
company.id_company = json.get(cls.ATTR_ID_COMPANY, -1)
company.name = json[cls.FLAG_NAME]
company.website = json[cls.FLAG_WEBSITE]
company.active = av.input_bool(json[cls.FLAG_ACTIVE], cls.FLAG_ACTIVE, _m)
return company
def to_json(self):
as_json = {
**self.get_shared_json_attributes(self)
, self.ATTR_ID_COMPANY: self.id_company
, self.FLAG_NAME: self.name
, self.FLAG_WEBSITE: self.website
, self.FLAG_ACTIVE: self.active
}
return as_json
def __repr__(self):
return f'''
{self.__class__.__name__}(
{self.FLAG_COMPANY}: {self.id_company}
{self.FLAG_NAME}: {self.name}
{self.FLAG_WEBSITE}: {self.website}
{self.FLAG_ACTIVE}: {self.active}
)
'''
class Company_Temp(db.Model, Base):
__tablename__ = 'DOG_Company_Temp'
__table_args__ = { 'extend_existing': True }
id_temp = db.Column(db.Integer, primary_key=True)
id_company = db.Column(db.Integer)
name = db.Column(db.String(250))
website = db.Column(db.String(1000))
active = db.Column(db.Boolean)
guid: str = db.Column(db.String(36))
def __init__(self):
super().__init__()
@classmethod
def from_company(cls, company):
_m = 'Company_Temp.from_Company'
temp = cls()
temp.id_company = company.id_company
temp.name = company.name
temp.website = company.website
temp.active = company.active
return temp
class Parameters_Company(Get_Many_Parameters_Base):
get_all_company: bool
get_inactive_company: bool
ids_company: str
names_company: str
websites_company: str
require_all_id_search_filters_met: bool
require_any_id_search_filters_met: bool
require_all_non_id_search_filters_met: bool
require_any_non_id_search_filters_met: bool
@classmethod
def get_default(cls):
return cls(
get_all_company = True
, get_inactive_company = False
, ids_company = ''
, names_company = ''
, websites_company = ''
, require_all_id_search_filters_met = True
, require_any_id_search_filters_met = True
, require_all_non_id_search_filters_met = False
, require_any_non_id_search_filters_met = True
)
@classmethod
def from_json(cls, json):
return cls(
get_all_company = json.get('a_get_all_company', False)
, get_inactive_company = json.get('a_get_inactive_company', False)
, ids_company = json.get('a_ids_company', '')
, names_company = json.get('a_names_company', '')
, websites_company = json.get('a_websites_company', '')
, require_all_id_search_filters_met = json.get('a_require_all_id_search_filters_met', True)
, require_any_id_search_filters_met = json.get('a_require_any_id_search_filters_met', True)
, require_all_non_id_search_filters_met = json.get('a_require_all_non_id_search_filters_met', False)
, require_any_non_id_search_filters_met = json.get('a_require_any_non_id_search_filters_met', True)
)
"""
@classmethod
def from_form_filters_company(cls, form):
av.val_instance(form, 'form', 'Parameters_Company.from_form_filters_company', Filters_Company)
has_filter_search_text = not (form.search.data == '' or form.search.data is None)
active_only = av.input_bool(form.active_only.data, "active", "Parameters_Company.from_form_filters_company")
filters = cls.get_default()
filters.get_all_company = True
filters.get_inactive_company = not active_only
filters.ids_company = ''
filters.names_company = form.search.data if has_filter_search_text else ''
filters.notes_company = form.search.data if has_filter_search_text else ''
return filters
"""
def to_json(self):
return {
'a_get_all_company': self.get_all_company
, 'a_get_inactive_company': self.get_inactive_company
, 'a_ids_company': self.ids_company
, 'a_names_company': self.names_company
, 'a_websites_company': self.websites_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
}

124
business_objects/dog/user.py
View File

@@ -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}
'''
"""