General code clean up and bug fixes. Still working on order and orders that are carts

app/methods/order_line_methods.py

@@ -8,7 +8,8 @@ from app.db_sql import redis_lookup_id_random, sql_delete, sql_enable_part, sql_
 from app.lib_general import log, logging, logger_reset
 
 from app.models.common_field_schema import default_num_bytes
-from app.models.order_line_models import Order_Line_Base, Order_Line_Full_Detail_Base
+# from app.models.order_line_models import Order_Line_Base, Order_Line_Full_Detail_Base
+from app.models.order_line_models_v3 import Order_Line_Base, Order_Line_Full_Detail_Base
 
 
 # ### BEGIN ### API Order Line Methods ### create_order_obj_line() ###

app/methods/order_methods.py

@@ -12,8 +12,10 @@ from app.methods.order_line_methods import check_order_obj_line_list, create_ord
 # from app.methods.person_methods import load_person_obj
 
 from app.models.common_field_schema import default_num_bytes
-from app.models.order_models import Order_Base
-from app.models.order_line_models import Order_Line_Base, Order_Line_DB_Base # This should go away later.
+# from app.models.order_models import Order_Base
+# from app.models.order_line_models import Order_Line_Base, Order_Line_DB_Base # This should go away later.
+from app.models.order_models_v3 import Order_Base
+from app.models.order_line_models_v3 import Order_Line_Base, Order_Line_DB_Base # This should go away later.
 # from app.models.person_models import Person_Base
 
 

app/models/order_line_models_v3.py

@@ -45,7 +45,7 @@ class Order_Line_Base(BaseModel):
     product_type_name: Optional[str] # Copied from product record; from look up
 
     product_name: Optional[str] # Copied from product record
-    product_description: Optional[str] # Copied from product record
+    # product_description: Optional[str] # Copied from product record
     product_unit_price: Optional[int] # Copied from product record
     product_recurring: Optional[bool] # Copied from product record
 
@@ -63,7 +63,7 @@ class Order_Line_Base(BaseModel):
     curr_product_type_name: Optional[str] # Dynamic from v_order_line
 
     curr_product_name: Optional[str] # Dynamic from v_order_line
-    curr_product_description: Optional[str] # Dynamic from v_order_line
+    # curr_product_description: Optional[str] # Dynamic from v_order_line
     curr_product_unit_price: Optional[int] # Dynamic from v_order_line
     curr_product_max_quantity: Optional[int] # Dynamic from v_order_line
     curr_product_recurring: Optional[bool] # Dynamic from v_order_line
@@ -91,7 +91,7 @@ class Order_Line_Base(BaseModel):
     # Including convenience data
     # This is only for convenience. Probably going to keep unless it causes a problem.
     dollar_amount: Optional[str] # From SQL view
-    dollar_total: int = Optional[str] # From SQL view
+    dollar_total: Optional[str] # From SQL view
 
     order_status: Optional[str]
     order_notes: Optional[str]

app/models/order_models_v3.py

@@ -58,8 +58,8 @@ class Order_Base(BaseModel):
     # Including convenience data
     # This is only for convenience. Probably going to keep unless it causes a problem.
     dollar_total_bill: Optional[str] # From SQL view
-    dollar_total_paid: int = Optional[str] # From SQL view
-    dollar_balance: int = Optional[str] # From SQL view
+    dollar_total_paid: Optional[str] # From SQL view
+    dollar_balance: Optional[str] # From SQL view
 
     # Including other related objects
     cfg: Optional[Order_Cfg_Base]

app/routers/person.py

@@ -181,7 +181,6 @@ async def person_obj_external_id(
         external_id: str = Query(..., min_length=5, max_length=75),
         inc_address: bool = False,
         inc_contact: bool = False,
-        # inc_person: bool = False,
         inc_user: bool = False,
         inc_user_role_list: bool = False,
         commons: Common_Route_Params = Depends(common_route_params),
@@ -190,7 +189,6 @@ async def person_obj_external_id(
     log.debug(locals())
 
     account_id = commons.x_account_id
-    # account_id = 99 # WARNING!!!! Get rid of 99!
 
     if person_data := get_person_rec_w_external_id(account_id=account_id, external_id=external_id): pass
     else: return mk_resp(data=None, status_code=404, response=commons.response)