Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Scott Idem
2022-06-30 15:53:11 -04:00
parent c43e958859
commit f91b50a9e8
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/person_models.py
View File

@@ -1,4 +1,4 @@
import datetime, hashlib, logging, os, pytz, redis, secrets import datetime, pytz
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
@@ -26,7 +26,7 @@ class Person_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['person_id_random'], **base_fields['person_id_random'],
alias = 'person_id_random', alias = 'person_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 = 'person_id' alias = 'person_id'
@@ -212,5 +212,3 @@ class Person_Base(BaseModel):
allow_population_by_field_name = True allow_population_by_field_name = True
fields = base_fields fields = base_fields
# ### END ### API Person Models ### Person_Base() ### # ### END ### API Person Models ### Person_Base() ###
Person_Base.update_forward_refs()

10
app/models/user_models.py
View File

@@ -1,4 +1,5 @@
import datetime, hashlib, logging, os, pytz, redis, secrets import datetime, pytz, secrets
# 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
@@ -8,7 +9,6 @@ from app.lib_general import log, logging, secure_hash_string
from app.models.common_field_schema import base_fields, default_num_bytes from app.models.common_field_schema import base_fields, default_num_bytes
# from app.models.contact_models import Contact_Base # from app.models.contact_models import Contact_Base
# from app.models.membership_person_models import Membership_Person_Base
from app.models.organization_models import Organization_Base from app.models.organization_models import Organization_Base
# from app.models.person_models import Person_Base # Causes circular import # from app.models.person_models import Person_Base # Causes circular import
# from app.models.user_role_models import User_Role_Base # from app.models.user_role_models import User_Role_Base
@@ -22,7 +22,7 @@ class User_New_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['user_id_random'], **base_fields['user_id_random'],
alias = 'user_id_random', alias = 'user_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 = 'user_id' alias = 'user_id'
@@ -222,13 +222,13 @@ class User_Out_Base(BaseModel):
# ### BEGIN ### API User Models ### User_Base() ### # ### BEGIN ### API User Models ### User_Base() ###
class User_Base(BaseModel): class User_Base(BaseModel):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['user_id_random'], **base_fields['user_id_random'],
alias = 'user_id_random', alias = 'user_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 = 'user_id' alias = 'user_id'