Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

General clean up of everything.

Browse Source
This commit is contained in:
Scott Idem
2021-05-28 03:23:52 -04:00
parent 09c7b48223
commit 2167c7e897
31 changed files with 129 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/user_models.py
View File

@@ -5,13 +5,13 @@ from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from ..lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
#from .account_models import Account_Base
from .contact_models import Contact_Base
#from .organization_models import Organization_Base
#from .person_models import Person_Base
from .organization_models import Organization_Base
#from .person_models import Person_Base # Causes circular import
from .user_role_models import User_Role_Base
@@ -176,11 +176,11 @@ class User_Out_Base(BaseModel):
logged_in_on: Optional[datetime.datetime]
last_activity_on: Optional[datetime.datetime]
#account: Optional[Account_Base]# = Account_Base()
#contact: Optional[Contact_Base]# = Contact_Base()
#organization: Optional[Organization_Base]# = Organization_Base()
#person: Optional[Person_Base]# = Person_Base()
role_list: Optional[list] = []# = User_Role_Base()
#account: Optional[Account_Base]
contact: Optional[Contact_Base]
organization: Optional[Organization_Base]
#person: Optional[Person_Base]# Causes circular import
role_list: Optional[list] = []
notes: Optional[str]
created_on: Optional[datetime.datetime]