More again again. Moving ID random generation to the SQL db instead. General clean up.

This commit is contained in:
Scott Idem
2022-06-30 16:14:28 -04:00
parent f91b50a9e8
commit 8a77f0c892
4 changed files with 13 additions and 11 deletions

View File

@@ -1,5 +1,4 @@
from __future__ import annotations import datetime, pytz
import datetime, hashlib, logging, os, pytz, redis, secrets
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
@@ -11,6 +10,7 @@ from app.models.common_field_schema import base_fields, default_num_bytes
from app.models.product_models import Product_Base from app.models.product_models import Product_Base
# ### BEGIN ### API Cont Edu Cert Models ### Cont_Edu_Cert_Base() ###
class Cont_Edu_Cert_Base(BaseModel): class Cont_Edu_Cert_Base(BaseModel):
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -18,7 +18,7 @@ class Cont_Edu_Cert_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['cont_edu_cert_id_random'], **base_fields['cont_edu_cert_id_random'],
alias = 'cont_edu_cert_id_random', alias = 'cont_edu_cert_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes), # default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
) )
id: Optional[int] = Field( id: Optional[int] = Field(
alias = 'cont_edu_cert_id' alias = 'cont_edu_cert_id'
@@ -85,3 +85,4 @@ class Cont_Edu_Cert_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True allow_population_by_field_name = True
fields = base_fields fields = base_fields
# ### END ### API Cont Edu Cert Models ### Cont_Edu_Cert_Base() ###

View File

@@ -1,5 +1,4 @@
from __future__ import annotations import datetime, pytz
import datetime, hashlib, logging, os, pytz, redis, secrets
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
@@ -13,6 +12,7 @@ from app.models.person_models import Person_Base
from app.models.user_models import User_Base from app.models.user_models import User_Base
# ### BEGIN ### API Cont Edu Cert Person Models ### Cont_Edu_Cert_Person_Base() ###
class Cont_Edu_Cert_Person_Base(BaseModel): class Cont_Edu_Cert_Person_Base(BaseModel):
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -135,3 +135,4 @@ class Cont_Edu_Cert_Person_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True allow_population_by_field_name = True
fields = base_fields fields = base_fields
# ### END ### API Cont Edu Cert Person Models ### Cont_Edu_Cert_Person_Base() ###

View File

@@ -1,5 +1,4 @@
from __future__ import annotations import datetime, pytz
import datetime, hashlib, logging, os, pytz, redis, secrets
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
@@ -19,6 +18,7 @@ from app.models.product_models import Product_Base
# from app.models.user_models import User_Base # from app.models.user_models import User_Base
# ### BEGIN ### API Membership Person Models ### Membership_Person_Base() ###
class Membership_Person_Base(BaseModel): class Membership_Person_Base(BaseModel):
log.setLevel(logging.INFO) log.setLevel(logging.INFO)
log.debug(locals()) log.debug(locals())
@@ -26,7 +26,6 @@ class Membership_Person_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['membership_person_id_random'], **base_fields['membership_person_id_random'],
alias = 'membership_person_id_random', alias = 'membership_person_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
) )
id: Optional[int] = Field( id: Optional[int] = Field(
alias = 'membership_person_id' alias = 'membership_person_id'
@@ -259,3 +258,4 @@ class Membership_Person_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True allow_population_by_field_name = True
fields = base_fields fields = base_fields
# ### END ### API Membership Person Models ### Membership_Person_Base() ###

View File

@@ -1,5 +1,4 @@
from __future__ import annotations import datetime, pytz
import datetime, hashlib, logging, os, pytz, redis, secrets
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
@@ -13,6 +12,7 @@ from app.models.membership_type_models import Membership_Type_Base
from app.models.product_models import Product_Base from app.models.product_models import Product_Base
# ### BEGIN ### API Membership Person Type Models ### Membership_Person_Type_Base() ###
class Membership_Person_Type_Base(BaseModel): class Membership_Person_Type_Base(BaseModel):
log.setLevel(logging.INFO) log.setLevel(logging.INFO)
log.debug(locals()) log.debug(locals())
@@ -20,7 +20,6 @@ class Membership_Person_Type_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['membership_person_type_id_random'], **base_fields['membership_person_type_id_random'],
alias = 'membership_person_type_id_random', alias = 'membership_person_type_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
) )
id: Optional[int] = Field( id: Optional[int] = Field(
alias = 'membership_person_type_id' alias = 'membership_person_type_id'
@@ -133,3 +132,4 @@ class Membership_Person_Type_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True allow_population_by_field_name = True
fields = base_fields fields = base_fields
# ### END ### API Membership Person Type Models ### Membership_Person_Type_Base() ###