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

This commit is contained in:
Scott Idem
2022-06-30 17:34:47 -04:00
parent 5066cd099d
commit 511f420555
12 changed files with 28 additions and 54 deletions

View File

@@ -1,5 +1,4 @@
from __future__ import annotations
import datetime, hashlib, logging, os, pytz, redis, secrets
import datetime, pytz
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
@@ -14,6 +13,7 @@ from app.models.contact_models import Contact_Base
# from app.models.user_models import User_Base
# ### BEGIN ### API Organization Models ### Organization_Base() ###
class Organization_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -21,7 +21,6 @@ class Organization_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['organization_id_random'],
alias = 'organization_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
#alias = 'organization_id'
@@ -125,8 +124,4 @@ class Organization_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
#if TYPE_CHECKING:
#from .supporting_core_models import Address_Base, Contact_Base, Person_Base, User_Base
Organization_Base.update_forward_refs()
# ### END ### API Organization Models ### Organization_Base() ###