From 8d5b4c7fc04cf8eb898a50557046115b0f3b4aac Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Wed, 16 Mar 2022 16:52:03 -0400 Subject: [PATCH] Work on orders and order lines. Removing user_id related from order. Also general clean up. --- app/methods/order_cart_methods.py | 2 +- app/models/contact_models.py | 1 - app/models/order_cfg_models.py | 1 - app/models/order_line_models.py | 1 - app/models/order_line_models_v3.py | 1 - app/models/order_models.py | 37 +++++++++++++++--------------- app/models/order_models_v3.py | 19 ++++++++------- app/models/person_models.py | 1 - app/models/user_models.py | 1 - app/routers/order.py | 6 ++--- 10 files changed, 31 insertions(+), 39 deletions(-) diff --git a/app/methods/order_cart_methods.py b/app/methods/order_cart_methods.py index a30d129..7fe4fe4 100644 --- a/app/methods/order_cart_methods.py +++ b/app/methods/order_cart_methods.py @@ -120,7 +120,7 @@ def update_order_cart_obj( order_cart_obj_new['id'] = order_cart_id order_cart_obj_new['account_id_random'] = order_cart_obj.account_id_random order_cart_obj_new['person_id_random'] = order_cart_obj.person_id_random - order_cart_obj_new['user_id_random'] = order_cart_obj.user_id_random + # order_cart_obj_new['user_id_random'] = order_cart_obj.user_id_random order_cart_obj_new['order_id_random'] = order_cart_obj.order_id_random diff --git a/app/models/contact_models.py b/app/models/contact_models.py index c051c91..2062c81 100644 --- a/app/models/contact_models.py +++ b/app/models/contact_models.py @@ -1,4 +1,3 @@ -from __future__ import annotations import datetime, hashlib, logging, os, pytz, redis, secrets from typing import Dict, List, Optional, Set, Union diff --git a/app/models/order_cfg_models.py b/app/models/order_cfg_models.py index 3a425aa..43371d4 100644 --- a/app/models/order_cfg_models.py +++ b/app/models/order_cfg_models.py @@ -1,4 +1,3 @@ -from __future__ import annotations import datetime, hashlib, logging, os, pytz, redis, secrets from typing import Dict, List, Optional, Set, Union diff --git a/app/models/order_line_models.py b/app/models/order_line_models.py index e10a944..32ed26f 100644 --- a/app/models/order_line_models.py +++ b/app/models/order_line_models.py @@ -1,4 +1,3 @@ -from __future__ import annotations import datetime, hashlib, logging, os, pytz, redis, secrets from typing import Dict, List, Optional, Set, Union diff --git a/app/models/order_line_models_v3.py b/app/models/order_line_models_v3.py index 6ed8286..7e73653 100644 --- a/app/models/order_line_models_v3.py +++ b/app/models/order_line_models_v3.py @@ -1,4 +1,3 @@ -from __future__ import annotations import datetime, hashlib, logging, os, pytz, redis, secrets from typing import Dict, List, Optional, Set, Union diff --git a/app/models/order_models.py b/app/models/order_models.py index e717749..14e03ee 100644 --- a/app/models/order_models.py +++ b/app/models/order_models.py @@ -1,4 +1,3 @@ -from __future__ import annotations import datetime, hashlib, logging, os, pytz, redis, secrets from typing import Dict, List, Optional, Set, Union @@ -33,8 +32,8 @@ class Order_Base(BaseModel): person_id_random: Optional[str] person_id: Optional[int] - user_id_random: Optional[str] - user_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 @@ -103,14 +102,14 @@ class Order_Base(BaseModel): return redis_lookup_id_random(record_id_random=values['person_id_random'], table_name='person') return None - @validator('user_id', always=True) - def user_id_lookup(cls, v, values, **kwargs): - log.setLevel(logging.WARNING) - log.debug(locals()) + # @validator('user_id', always=True) + # def user_id_lookup(cls, v, values, **kwargs): + # log.setLevel(logging.WARNING) + # log.debug(locals()) - if values['user_id_random']: - return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user') - return None + # if values['user_id_random']: + # return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user') + # return None class Config: underscore_attrs_are_private = True @@ -127,8 +126,8 @@ class Order_DB_Base(BaseModel): person_id_random: Union[str, None] = None person_id: Union[int, None] = None - user_id_random: Union[str, None] = None - user_id: Union[int, None] = None + # user_id_random: Union[str, None] = None + # user_id: Union[int, None] = None 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 @@ -170,14 +169,14 @@ class Order_DB_Base(BaseModel): return redis_lookup_id_random(record_id_random=values['person_id_random'], table_name='person') return None - @validator('user_id', always=True) - def user_id_lookup(cls, v, values, **kwargs): - log.setLevel(logging.WARNING) - log.debug(locals()) + # @validator('user_id', always=True) + # def user_id_lookup(cls, v, values, **kwargs): + # log.setLevel(logging.WARNING) + # log.debug(locals()) - if values['user_id_random']: - return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user') - return None + # if values['user_id_random']: + # return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user') + # return None class Config: underscore_attrs_are_private = True diff --git a/app/models/order_models_v3.py b/app/models/order_models_v3.py index 0aab5e3..a15c173 100644 --- a/app/models/order_models_v3.py +++ b/app/models/order_models_v3.py @@ -95,7 +95,6 @@ class Order_Base(BaseModel): return get_id_random(v, table_name='account') return None - @validator('person_id', always=True) def person_id_lookup(cls, v, values, **kwargs): log.setLevel(logging.WARNING) @@ -123,8 +122,8 @@ class Order_DB_Base(BaseModel): person_id_random: Union[str, None] = None person_id: Union[int, None] = None - user_id_random: Union[str, None] = None - user_id: Union[int, None] = None + # user_id_random: Union[str, None] = None + # user_id: Union[int, None] = None 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 @@ -166,14 +165,14 @@ class Order_DB_Base(BaseModel): return redis_lookup_id_random(record_id_random=values['person_id_random'], table_name='person') return None - @validator('user_id', always=True) - def user_id_lookup(cls, v, values, **kwargs): - log.setLevel(logging.WARNING) - log.debug(locals()) + # @validator('user_id', always=True) + # def user_id_lookup(cls, v, values, **kwargs): + # log.setLevel(logging.WARNING) + # log.debug(locals()) - if values['user_id_random']: - return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user') - return None + # if values['user_id_random']: + # return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user') + # return None class Config: underscore_attrs_are_private = True diff --git a/app/models/person_models.py b/app/models/person_models.py index f0b7a0a..6e0bbaa 100644 --- a/app/models/person_models.py +++ b/app/models/person_models.py @@ -1,4 +1,3 @@ -from __future__ import annotations import datetime, hashlib, logging, os, pytz, redis, secrets from typing import Dict, List, Optional, Set, Union diff --git a/app/models/user_models.py b/app/models/user_models.py index 90d6e8f..8c4b159 100644 --- a/app/models/user_models.py +++ b/app/models/user_models.py @@ -1,4 +1,3 @@ -from __future__ import annotations import datetime, hashlib, logging, os, pytz, redis, secrets from typing import Dict, List, Optional, Set, Union diff --git a/app/routers/order.py b/app/routers/order.py index eb96497..a7ca19b 100644 --- a/app/routers/order.py +++ b/app/routers/order.py @@ -118,9 +118,9 @@ async def get_order_obj_li( elif for_obj_type == 'person' and for_obj_id: data['person_id'] = redis_lookup_id_random(record_id_random=for_obj_id, table_name='person') sql_account_person_user = f"""`order`.person_id = :person_id""" - elif for_obj_type == 'user' and for_obj_id: - data['user_id'] = redis_lookup_id_random(record_id_random=for_obj_id, table_name='user') - sql_account_person_user = f"""`order`.user_id = :user_id""" + # elif for_obj_type == 'user' and for_obj_id: + # data['user_id'] = redis_lookup_id_random(record_id_random=for_obj_id, table_name='user') + # sql_account_person_user = f"""`order`.user_id = :user_id""" else: sql_account_person_user = ''