diff --git a/app/models/journal_entry_models.py b/app/models/journal_entry_models.py index 2c4de42..20cd4d4 100644 --- a/app/models/journal_entry_models.py +++ b/app/models/journal_entry_models.py @@ -73,7 +73,7 @@ class Journal_Entry_Base(BaseModel): parent_id: Optional[str] = Field(None, **base_fields['journal_entry_id_random']) # parent_id_random: Optional[str] - + related_entry_id_random: Optional[List[str]] related_entry_id_li: Optional[List[int]] = Field(None, exclude=True) @@ -102,6 +102,7 @@ class Journal_Entry_Base(BaseModel): notes: Optional[str] created_on: Optional[datetime.datetime] = None updated_on: Optional[datetime.datetime] = None + default_qry_str: Optional[str] = None # Default query string used for searching and filtering journal entries # Including other related objects # This is only for convenience. Probably going to keep unless it causes a problem. @@ -119,21 +120,21 @@ class Journal_Entry_Base(BaseModel): if rid := values.get('id_random') or values.get('journal_entry_id_random'): values['id'] = rid values['journal_entry_id'] = rid - + if j_rid := values.get('journal_id_random'): values['journal_id'] = j_rid - + if a_rid := values.get('account_id_random'): values['account_id'] = a_rid - + if p_rid := values.get('parent_id_random'): values['parent_id'] = p_rid - + # 2. Prevent "Collision Population" for k in ['id', 'journal_entry_id', 'journal_id', 'account_id', 'parent_id']: if k in values and not isinstance(values[k], str): del values[k] - + return values # Fields that are part of the model (for reading) but should not be saved to the DB table