Added better fundraising routes, methods, and models! I thought I already did this...

app/models/fundraising_cfg_models.py

@@ -4,61 +4,65 @@ from typing import Dict, List, Optional, Set, Union
 from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
 
 from app.db_sql import redis_lookup_id_random
-from app.lib_general import *
+from app.lib_general import log, logging
 
 from app.models.common_field_schema import base_fields, default_num_bytes
 
 
+# ### BEGIN ### API Fundraising Config Models ### Fundraising_Cfg_Base() ###
 class Fundraising_Cfg_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(
-        **base_fields['fundraising_cfg_id_random'],
-        alias = 'fundraising_cfg_id_random',
+        **base_fields['fundraising_id_random'],
+        alias = 'fundraising_id_random',
     )
     id: Optional[int] = Field(
-        #alias = 'fundraising_cfg_id'
+        #alias = 'fundraising_id'
     )
+
     account_id_random: Optional[str]
     account_id: Optional[int]
 
-    order_thanks: Optional[str]
-    order_message: Optional[str]
-    message: Optional[str]
+    header_html: Optional[str]
+    start_html: Optional[str]
+    message_html: Optional[str]
+    end_html: Optional[str]
+    footer_html: Optional[str]
+
+    order_thanks: Optional[str] # Is this needed here or at all?
+    order_message: Optional[str] # Is this needed here or at all?
+    message: Optional[str] # Is this needed here or at all?
+
+    enable: Optional[bool]
+
+    hide: Optional[bool]
+    priority: Optional[bool]
+    sort: Optional[int]
+    group: Optional[str] # Same or similar as file_purpose?
+
+    created_on: Optional[datetime.datetime] = None
+    updated_on: Optional[datetime.datetime] = None
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
-    #@validator('fundraising_cfg_id_random', always=True)
-    def fundraising_cfg_id_random_copy(cls, v, values, **kwargs):
-        log.setLevel(logging.WARNING)
-        log.debug(locals())
-
-        if values['id_random']:
-            return values['id_random']
-        return None
-
     @validator('id', always=True)
     def fundraising_cfg_id_lookup(cls, v, values, **kwargs):
-        log.setLevel(logging.WARNING)
-        log.debug(locals())
-
-        if values['id_random']:
-            log.debug(values['id_random'])
-            return redis_lookup_id_random(record_id_random=values['id_random'], table_name='fundraising_cfg')
+        if isinstance(v, int) and v > 0: return v
+        elif id_random := values.get('id_random'):
+            return redis_lookup_id_random(record_id_random=id_random, table_name='v_fundraising_cfg') # There is only a view 2022-11-18
         return None
 
     @validator('account_id', always=True)
     def account_id_lookup(cls, v, values, **kwargs):
-        log.setLevel(logging.WARNING)
-        log.debug(locals())
-
-        if values['account_id_random']:
-            return redis_lookup_id_random(record_id_random=values['account_id_random'], table_name='account')
+        if isinstance(v, int) and v > 0: return v
+        elif id_random := values.get('account_id_random'):
+            return redis_lookup_id_random(record_id_random=id_random, table_name='account')
         return None
 
     class Config:
         underscore_attrs_are_private = True
+        allow_population_by_field_name = True
         fields = base_fields
-
-#Fundraising_Cfg_Base.update_forward_refs()
+# ### END ### API Fundraising Config Models ### Fundraising_Cfg_Base() ###

app/models/fundraising_models.py

@@ -0,0 +1,81 @@
+import datetime, pytz
+
+from typing import Dict, List, Optional, Set, Union
+from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
+
+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.fundraising_cfg_models import Fundraising_Cfg_Base
+from app.models.product_models import Product_Base
+
+
+# ### BEGIN ### API Fundraising Models ### Fundraising_Base() ###
+class Fundraising_Base(BaseModel):
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    id_random: Optional[str] = Field(
+        **base_fields['fundraising_id_random'],
+        alias = 'fundraising_id_random',
+    )
+    id: Optional[int] = Field(
+        #alias = 'fundraising_id'
+    )
+
+    account_id_random: Optional[str]
+    account_id: Optional[int]
+
+    title: Optional[str]
+    summary: Optional[str]
+    description: Optional[str]
+
+    header_html: Optional[str]
+    start_html: Optional[str]
+    message_html: Optional[str]
+    end_html: Optional[str]
+    footer_html: Optional[str]
+
+    enable: Optional[bool]
+
+    hide: Optional[bool]
+    priority: Optional[bool]
+    sort: Optional[int]
+    group: Optional[str] # Same or similar as file_purpose?
+
+    notes: Optional[str]
+
+    created_on: Optional[datetime.datetime] = None
+    updated_on: Optional[datetime.datetime] = None
+
+    # Including convenience data
+    # This is only for convenience. Probably going to keep unless it causes a problem.
+    # header_html: Optional[str]
+    # start_html: Optional[str]
+
+    # Including other related objects
+    fundraising_cfg: Optional[Union[Fundraising_Cfg_Base, None]]
+    product_list: Optional[list[Product_Base]]
+
+    _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
+
+    @validator('id', always=True)
+    def fundraising_cfg_id_lookup(cls, v, values, **kwargs):
+        if isinstance(v, int) and v > 0: return v
+        elif id_random := values.get('id_random'):
+            return redis_lookup_id_random(record_id_random=id_random, table_name='v_fundraising_cfg') # There is only a view 2022-11-18
+        return None
+
+    @validator('account_id', always=True)
+    def account_id_lookup(cls, v, values, **kwargs):
+        if isinstance(v, int) and v > 0: return v
+        elif id_random := values.get('account_id_random'):
+            return redis_lookup_id_random(record_id_random=id_random, table_name='account')
+        return None
+
+    class Config:
+        underscore_attrs_are_private = True
+        allow_population_by_field_name = True
+        fields = base_fields
+# ### END ### API Fundraising Models ### Fundraising_Base() ###

app/models/user_role_models.py

@@ -6,8 +6,7 @@ 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 .user_models import User_Base
+from app.models.common_field_schema import base_fields, default_num_bytes
 
 
 # ### BEGIN ### API User Role Models ### User_Role_Base() ###