A lot of unplanned clean up and created some new/missing methods and routes. Mainly working on order and order_cart related stuff.
This commit is contained in:
Scott Idem
@@ -5,136 +5,45 @@ 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 .common_field_schema import base_fields, default_num_bytes
|
||||
from .order_line_models import Order_Line_Base
|
||||
from .person_models import Person_Base
|
||||
from .user_models import User_Base
|
||||
|
||||
|
||||
class Order_Cfg_Base(BaseModel):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
account_name: Optional[str]
|
||||
|
||||
default_no_reply_email: Optional[str]
|
||||
default_no_reply_name: Optional[str]
|
||||
confirm_email: Optional[str]
|
||||
confirm_name: Optional[str]
|
||||
|
||||
order_header: Optional[str]
|
||||
order_thanks: Optional[str]
|
||||
order_message: Optional[str]
|
||||
order_footer: Optional[str]
|
||||
order_fundraising_thanks: Optional[str]
|
||||
order_fundraising_message: Optional[str]
|
||||
|
||||
|
||||
# class Order_Line_Base(BaseModel):
|
||||
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.debug(locals())
|
||||
|
||||
# id_random: Optional[str] = Field(
|
||||
# **base_fields['order_line_id_random'],
|
||||
# alias = 'order_line_id_random',
|
||||
# default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
|
||||
# )
|
||||
# id: Optional[int] = Field(
|
||||
# #alias = 'order_line_id'
|
||||
# )
|
||||
# #order_line_id_random: Optional[str]
|
||||
# order_id_random: Optional[str]
|
||||
# order_id: Optional[int]
|
||||
# product_id_random: str
|
||||
# product_id: Optional[int]
|
||||
# product_type_id: Optional[int]
|
||||
# product_type: Optional[str]
|
||||
# name: Optional[str]
|
||||
# description: Optional[str]
|
||||
# quantity: int = Field(0, ge=0, lt=150)
|
||||
# amount: int = Field(0, ge=0, lt=1500000)
|
||||
# recurring: Optional[bool] = False
|
||||
# message: Optional[str]
|
||||
# notes: Optional[str]
|
||||
# created_on: Optional[datetime.datetime] = None
|
||||
# updated_on: Optional[datetime.datetime] = None
|
||||
|
||||
# _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
|
||||
|
||||
# #@validator('order_line_id_random', always=True)
|
||||
# def order_line_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 order_line_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='order_line')
|
||||
# return None
|
||||
|
||||
# @validator('order_id', always=True)
|
||||
# def order_id_lookup(cls, v, values, **kwargs):
|
||||
# log.setLevel(logging.WARNING)
|
||||
# log.debug(locals())
|
||||
|
||||
# if values['order_id_random']:
|
||||
# return redis_lookup_id_random(record_id_random=values['order_id_random'], table_name='order')
|
||||
# return None
|
||||
|
||||
# @validator('product_id', always=True)
|
||||
# def product_id_lookup(cls, v, values, **kwargs):
|
||||
# log.setLevel(logging.WARNING)
|
||||
# log.debug(locals())
|
||||
|
||||
# if values['product_id_random']:
|
||||
# return redis_lookup_id_random(record_id_random=values['product_id_random'], table_name='product')
|
||||
# return None
|
||||
|
||||
# class Config:
|
||||
# underscore_attrs_are_private = True
|
||||
# fields = base_fields
|
||||
from app.models.common_field_schema import base_fields, default_num_bytes
|
||||
from app.models.order_cfg_models import Order_Cfg_Base
|
||||
from app.models.order_line_models import Order_Line_Base
|
||||
from app.models.person_models import Person_Base
|
||||
from app.models.user_models import User_Base
|
||||
|
||||
|
||||
class Order_Base(BaseModel):
|
||||
log.setLevel(logging.WARNING)
|
||||
log.debug(locals())
|
||||
|
||||
# from .person_models import Person_Base
|
||||
# from .user_models import User_Base
|
||||
|
||||
id_random: Optional[str] = Field(
|
||||
**base_fields['order_id_random'],
|
||||
alias = 'order_id_random',
|
||||
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
|
||||
)
|
||||
id: Optional[int] = Field(
|
||||
#alias = 'order_id'
|
||||
alias = 'order_id'
|
||||
)
|
||||
#order_id_random: Optional[str]
|
||||
#order_id: Optional[int]
|
||||
|
||||
account_id_random: Optional[str]
|
||||
account_id: Optional[int] # NOTE: This is not really optional
|
||||
|
||||
person_id_random: Optional[str]
|
||||
person_id: Optional[int]
|
||||
|
||||
user_id_random: Optional[str]
|
||||
user_id: Optional[int]
|
||||
|
||||
total_quantity: Optional[int] = Field(0, ge=0, lt=150)
|
||||
total_bill: Optional[int] = Field(0, ge=0, lt=1500000) # NOTE: This is total_amount in the order_cart
|
||||
total_paid: Optional[int] = Field(0, ge=0, lt=1500000)
|
||||
balance: Optional[int] = Field(0, ge=-1500000, lt=1500000) # Balance needs to be calculated
|
||||
status: Optional[str]
|
||||
|
||||
notes: Optional[str]
|
||||
|
||||
created_on: Optional[datetime.datetime] = None
|
||||
updated_on: Optional[datetime.datetime] = None
|
||||
|
||||
|
||||
Reference in New Issue
Block a user