General code clean up.

This commit is contained in:
Scott Idem
2021-08-23 12:54:27 -04:00
parent 5606cdb12f
commit 683597e2bf
5 changed files with 19 additions and 17 deletions

View File

@@ -4,7 +4,7 @@ import datetime, hashlib, logging, os, pytz, redis, secrets
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, lookup_id_random
from app.db_sql import redis_lookup_id_random, get_id_random
from app.lib_general import log, logging
from app.models.common_field_schema import base_fields, default_num_bytes
@@ -139,7 +139,7 @@ class Event_File_Base(BaseModel):
log.debug(locals())
if values['for_id'] and values['for_type']:
return lookup_id_random(record_id=values['for_id'], table_name=values['for_type'])
return get_id_random(record_id=values['for_id'], table_name=values['for_type'])
return None
#Event_File_Base.update_forward_refs()

View File

@@ -4,7 +4,7 @@ import datetime, hashlib, logging, os, pytz, redis, secrets
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, lookup_id_random
from app.db_sql import redis_lookup_id_random, get_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
@@ -145,7 +145,7 @@ class Order_Line_Base(BaseModel):
log.debug(locals())
if values['curr_product_for_id'] and values['curr_product_for_type']:
return lookup_id_random(record_id=values['curr_product_for_id'], table_name=values['curr_product_for_type'])
return get_id_random(record_id=values['curr_product_for_id'], table_name=values['curr_product_for_type'])
return None
# @validator('curr_product_for_id', always=True)