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

Work on better way to update objects. A lot of work! Also a lot of clean up.

Browse Source
This commit is contained in:
Scott Idem
2021-06-10 17:42:31 -04:00
parent 717db418f9
commit 4e6fedcffd
15 changed files with 253 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/account_cfg_models.py
View File

@@ -7,7 +7,7 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes
from app.models.common_field_schema import base_fields, default_num_bytes
class Account_Cfg_Base(BaseModel):

24
app/models/account_models.py
View File

@@ -7,7 +7,13 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes
from app.models.common_field_schema import base_fields, default_num_bytes
from app.models.account_cfg_models import Account_Cfg_Base
# from app.models.address_models import Address_Base
# from app.models.contact_models import Contact_Base
# from app.models.event_models import Event_Base
# from app.models.person_models import Person_Base
# from app.models.user_models import User_Base
class Account_Base(BaseModel):
@@ -36,6 +42,22 @@ class Account_Base(BaseModel):
created_on: Optional[datetime.datetime] = None
updated_on: Optional[datetime.datetime] = None
# Including other related objects
account_cfg: Optional[Account_Cfg_Base]
address_list: Optional[list] # Address_Base()
archive_list: Optional[list] # Archive_Base()
contact_list: Optional[list] # Contact_Base()
event_list: Optional[list] # Event_Base()
journal_list: Optional[list] # Journal_Base()
order_list: Optional[list] # Order_Base()
organization_list: Optional[list] # Organization_Base()
page: Optional[list] # Page_Base()
person: Optional[list] # Person_Base()
post: Optional[list] # Post_Base()
product: Optional[list] # Product_Base()
site: Optional[list] # Site_Base()
user: Optional[list] # User_Base()
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('account_id_random', always=True)

4
app/models/address_models.py
View File

@@ -7,8 +7,8 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
#from .account_models import Account_Base
from app.models.common_field_schema import base_fields, default_num_bytes
# from app.models.account_models import Account_Base
class Address_Base(BaseModel):

6
app/models/contact_models.py
View File

@@ -7,9 +7,9 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
#from .account_models import Account_Base
from .address_models import Address_Base
from app.models.common_field_schema import base_fields, default_num_bytes
# from app.models.account_models import Account_Base
from app.models.address_models import Address_Base
class Contact_Base(BaseModel):

13
app/models/event_models.py
View File

@@ -7,13 +7,12 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
from .address_models import Address_Base
from .contact_models import Contact_Base
from .event_person_models import Event_Person_Base
from .person_models import Person_Base
from .user_models import User_Base
from app.models.common_field_schema import base_fields, default_num_bytes
from app.models.address_models import Address_Base
from app.models.contact_models import Contact_Base
from app.models.event_person_models import Event_Person_Base
from app.models.person_models import Person_Base
from app.models.user_models import User_Base
class Event_Base(BaseModel):

15
app/models/event_person_models.py
View File

@@ -7,14 +7,13 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
#from .event_models import Event_Base
from .event_badge_models import Event_Badge_Base
#from .event_person_detail_models import Event_Person_Detail_Base
from .event_registration_models import Event_Registration_Base
from .person_models import Person_Base
from .user_models import User_Base, User_Out_Base
from app.models.common_field_schema import base_fields, default_num_bytes
# from app.models.event_models import Event_Base
from app.models.event_badge_models import Event_Badge_Base
# from app.models.event_person_detail_models import Event_Person_Detail_Base
from app.models.event_registration_models import Event_Registration_Base
from app.models.person_models import Person_Base
from app.models.user_models import User_Base, User_Out_Base
class Event_Person_Base(BaseModel):

13
app/models/event_presentation_models.py
View File

@@ -7,13 +7,12 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
#from .event_models import Event_Base
#from .event_abstract_models import Event_Abstract_Base # This creates an import loop
from .event_person_models import Event_Person_Base
from .event_session_models import Event_Session_Base
from .person_models import Person_Base
from app.models.common_field_schema import base_fields, default_num_bytes
# from app.models.event_models import Event_Base
# from app.models.event_abstract_models import Event_Abstract_Base # This creates an import loop
from app.models.event_person_models import Event_Person_Base
from app.models.event_session_models import Event_Session_Base
from app.models.person_models import Person_Base
class Event_Presentation_Base(BaseModel):

17
app/models/event_presenter_models.py
View File

@@ -7,15 +7,14 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
# from .event_models import Event_Base
from .event_abstract_models import Event_Abstract_Base
from .event_person_models import Event_Person_Base
from .event_presentation_models import Event_Presentation_Base
from .event_session_models import Event_Session_Base
# from .person_models import Person_Base
# from .user_models import User_Base
from app.models.common_field_schema import base_fields, default_num_bytes
# from app.models.event_models import Event_Base
from app.models.event_abstract_models import Event_Abstract_Base
from app.models.event_person_models import Event_Person_Base
from app.models.event_presentation_models import Event_Presentation_Base
from app.models.event_session_models import Event_Session_Base
# from app.models.person_models import Person_Base
# from app.models.user_models import User_Base
class Event_Presenter_Base(BaseModel):

2
app/models/event_registration_models.py
View File

@@ -7,7 +7,7 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes
from app.models.common_field_schema import base_fields, default_num_bytes
class Event_Registration_Base(BaseModel):

13
app/models/event_session_models.py
View File

@@ -7,13 +7,12 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
#from .event_models import Event_Base
from .event_location_models import Event_Location_Base
from .event_person_models import Event_Person_Base # NOTE: Using thi will probably create an import loop
from .event_track_models import Event_Track_Base
from .person_models import Person_Base
from app.models.common_field_schema import base_fields, default_num_bytes
# from app.models.event_models import Event_Base
from app.models.event_location_models import Event_Location_Base
from app.models.event_person_models import Event_Person_Base # NOTE: Using this will probably create an import loop
from app.models.event_track_models import Event_Track_Base
from app.models.person_models import Person_Base
class Event_Session_Base(BaseModel):

5
app/models/event_track_models.py
View File

@@ -7,9 +7,8 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
#from .event_models import Event_Base
from app.models.common_field_schema import base_fields, default_num_bytes
# from app.models.event_models import Event_Base
class Event_Track_Base(BaseModel):

15
app/models/organization_models.py
View File

@@ -7,22 +7,17 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.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 .person_models import Person_Base
#from .user_models import User_Base
from app.models.common_field_schema import base_fields, default_num_bytes
# from app.models.account_models import Account_Base
from app.models.contact_models import Contact_Base
# from app.models.person_models import Person_Base
# from app.models.user_models import User_Base
class Organization_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
#from .account_models import Account_Base
#from .contact_models import Contact_Base
#from .person_models import Person_Base
#from .user_models import User_Base
id_random: Optional[str] = Field(
**base_fields['organization_id_random'],
alias='organization_id_random',

10
app/models/person_models.py
View File

@@ -7,11 +7,11 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.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 .user_models import User_Base
from app.models.common_field_schema import base_fields, default_num_bytes
# from app.models.account_models import Account_Base
from app.models.contact_models import Contact_Base
from app.models.organization_models import Organization_Base
from app.models.user_models import User_Base
class Person_Base(BaseModel):

13
app/models/user_models.py
View File

@@ -7,13 +7,12 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging, secure_hash_string
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 # Causes circular import
from .user_role_models import User_Role_Base
from app.models.common_field_schema import base_fields, default_num_bytes
# from app.models.account_models import Account_Base
from app.models.contact_models import Contact_Base
from app.models.organization_models import Organization_Base
# from app.models.person_models import Person_Base # Causes circular import
from app.models.user_role_models import User_Role_Base
# ### BEGIN ### API User Models ### User_New_Base() ###