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

A LOT of code clean up. More changes to membership tables, views, routes, methods, and models renamed.

Browse Source
This commit is contained in:
Scott Idem
2022-01-11 19:45:55 -05:00
parent 6e764b21e1
commit 55063d0f94
8 changed files with 328 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/journal_entry_models.py
View File

@@ -11,7 +11,7 @@ from app.models.common_field_schema import base_fields, default_num_bytes
class Journal_Entry_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
id_random: Optional[str] = Field(
@@ -73,6 +73,7 @@ class Journal_Entry_Base(BaseModel):
class Config:
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
Journal_Entry_Base.update_forward_refs()

5
app/models/journal_models.py
View File

@@ -8,10 +8,11 @@ from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from app.models.common_field_schema import base_fields, default_num_bytes
from app.models.journal_entry_models import Journal_Entry_Base
class Journal_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
id_random: Optional[str] = Field(
@@ -53,7 +54,7 @@ class Journal_Base(BaseModel):
updated_on: Optional[datetime.datetime] = None
# Including other related objects
journal_entry_list: Optional[list] # Journal_Entry_Base()
journal_entry_list: Optional[list[Journal_Entry_Base]] # Journal_Entry_Base()
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)

3
app/models/person_models.py
View File

@@ -10,6 +10,7 @@ from app.lib_general import log, logging
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.journal_models import Journal_Base
from app.models.membership_group_models import Membership_Group_Base
from app.models.membership_person_models import Membership_Person_Base
from app.models.membership_type_models import Membership_Type_Base
@@ -120,7 +121,7 @@ class Person_Base(BaseModel):
# archive_list: Optional[list] # Archive_Base()
event_list: Optional[list] # Event_Base() # Priority l1
hosted_file_list: Optional[list] # Hosted_File_Base() # Priority l2
journal_list: Optional[list] # Journal_Base() # Priority l3
journal_list: Optional[list[Journal_Base]] # Journal_Base() # Priority l3
contact: Optional[Union[Contact_Base, None]]
membership_person: Optional[Membership_Person_Base]