Work on orders and order lines. Removing user_id related from order. Also general clean up.

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
 

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

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

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

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

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

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

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

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

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 = ''