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

Working finally getting this to interact with the actual front end.

Browse Source
This commit is contained in:
Scott Idem
2021-03-13 02:17:24 -05:00
parent 46c562871f
commit 4ba34d594d
10 changed files with 353 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/order_methods.py
View File

@@ -5,8 +5,7 @@ from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..lib_general import *
from ..log import *
from .db_sql import sql_select
from ..db_sql import sql_select
from .order_model import Order_Base
#from .person_model import Person_Base
@@ -160,8 +159,8 @@ def save_order_obj(order_obj_new:Order_Base=None, repl_order_line_list:bool=Fals
# ### END ### API Order Model ### save_order_obj() ###
# ### BEGIN ### API Order Model ### get_order_obj() ###
def get_order_obj(order_id=None, inc_order_line_li=None, inc_order_cfg=None, inc_person_obj=None, inc_user_obj=None):
# ### BEGIN ### API Order Model ### load_order_obj() ###
def load_order_obj(order_id=None, inc_order_line_li=None, inc_order_cfg=None, inc_person_obj=None, inc_user_obj=None):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -205,4 +204,4 @@ def get_order_obj(order_id=None, inc_order_line_li=None, inc_order_cfg=None, inc
log.error(e.json())
return order_obj
# ### END ### API Order Model ### get_order_obj() ###
# ### END ### API Order Model ### load_order_obj() ###

5
app/models/site_domain_model.py
View File

@@ -8,6 +8,7 @@ from ..lib_general import *
from ..log import *
from .common_field_schema import base_fields, default_num_bytes
#from .site_model import Site_Base as Site_Base_2
class Site_Domain_Base(BaseModel):
@@ -30,13 +31,15 @@ class Site_Domain_Base(BaseModel):
# restrict_access: Optional[bool]
access_key: Optional[str]
required_referrer: Optional[bool]
required_referrer: Optional[str]
valid_for: Optional[int] # number of hours
created_on: Optional[datetime.datetime] = None
updated_on: Optional[datetime.datetime] = None
#site: Optional[Site_Base_2] = Site_Base_2()
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('site_domain_id_random', always=True)

19
app/models/site_model.py
View File

@@ -8,6 +8,7 @@ from ..lib_general import *
from ..log import *
from .common_field_schema import base_fields, default_num_bytes
from .site_domain_model import Site_Domain_Base as Site_Domain_Base_2
class Site_Base(BaseModel):
@@ -50,14 +51,14 @@ class Site_Base(BaseModel):
background_bg_color: Optional[str]
path_html_menu: Optional[str]
title: Optional[str]
html_menu: Optional[str]
html_header: Optional[str]
html_header_h1: Optional[str]
html_header_h2: Optional[str]
html_banner: Optional[str]
html_root_body: Optional[str]
html_tagline: Optional[str]
title: Optional[str] = None
html_menu: Optional[str] = None
html_header: Optional[str] = None
html_header_h1: Optional[str] = None
html_header_h2: Optional[str] = None
html_banner: Optional[str] = None
html_root_body: Optional[str] = None
html_tagline: Optional[str] = None
logo_filename: Optional[str]
banner_image_filename: Optional[str]
@@ -78,6 +79,8 @@ class Site_Base(BaseModel):
created_on: Optional[datetime.datetime] = None
updated_on: Optional[datetime.datetime] = None
site_domain: Optional[Site_Domain_Base_2] = Site_Domain_Base_2()
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('site_id_random', always=True)