Moving stuff around to make it more easy to manage. Adding models, methods, and routes.

This commit is contained in:
Scott Idem
2021-06-11 14:07:10 -04:00
parent 9c679765e5
commit 03bb55e62a
12 changed files with 473 additions and 116 deletions

View File

@@ -8,6 +8,8 @@ from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from app.models.common_field_schema import base_fields, default_num_bytes
from app.models.fundraising_cfg_models import Fundraising_Cfg_Base
from app.models.membership_models import Membership_Cfg_Base
class Account_Cfg_Base(BaseModel):
@@ -87,6 +89,10 @@ class Account_Cfg_Base(BaseModel):
created_on: Optional[datetime.datetime] = None
updated_on: Optional[datetime.datetime] = None
# Including other related objects
fundraising_cfg: Optional[Fundraising_Cfg_Base] # Priority l2
membership_cfg: Optional[Membership_Cfg_Base] # Priority l2
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('account_cfg_id_random', always=True)

View File

@@ -47,7 +47,7 @@ class Archive_Content_Base(BaseModel):
file_extension: Optional[str]
original_datetime: Optional[datetime.datetime] = None
original_datetime_timezone: Optional[datetime.datetime] = None
original_datetime_timezone: Optional[str] = None
original_location: Optional[str] = None
original_address_id: Optional[int] = None

View File

@@ -36,7 +36,7 @@ class Archive_Base(BaseModel):
content_url_text: Optional[str]
original_datetime: Optional[datetime.datetime] = None
original_datetime_timezone: Optional[datetime.datetime] = None
original_datetime_timezone: Optional[str] = None
original_location: Optional[str] = None
original_address_id: Optional[int] = None
@@ -58,6 +58,9 @@ class Archive_Base(BaseModel):
created_on: Optional[datetime.datetime] = None
updated_on: Optional[datetime.datetime] = None
# Including other related objects
archive_content_list: Optional[list] # Archive_Content_Base()
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('archive_id_random', always=True)

View File

@@ -99,6 +99,9 @@ class Event_Base(BaseModel):
created_on: Optional[datetime.datetime] = None
updated_on: Optional[datetime.datetime] = None
# Including JSON data
event_session_proposal_questions: Optional[Json] # list of dicts (custom for client) for event_session proposals
# Including other related objects
address_location: Optional[Address_Base]
contact_1: Optional[Contact_Base]

View File

@@ -33,12 +33,14 @@ class Membership_Cfg_Base(BaseModel):
reject_message: Optional[str]
renew_message: Optional[str]
#extended_membership_profile: Optional[str] # list of dicts outlining extended (custom) membership profile fields for client
extended_membership_profile: Optional[Json] = '[]' # list of dicts outlining extended (custom) membership profile fields for client
default_no_reply_email: Optional[str]
default_no_reply_name: Optional[str]
confirm_email: Optional[str]
confirm_name: Optional[str]
# Including JSON data
# extended_membership_profile: Optional[str] # list of dicts outlining extended (custom) membership profile fields for client
# extended_membership_profile: Optional[Json] = '[]' # list of dicts outlining extended (custom) membership profile fields for client
extended_membership_profile: Optional[Json] # list of dicts outlining extended (custom) membership profile fields for client
Membership_Cfg_Base.update_forward_refs()