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

Work on hosted files and archive content and related bug fixes.

Browse Source
This commit is contained in:
Scott Idem
2021-08-08 15:47:32 -04:00
parent 4ea30cef62
commit 1dba813d4b
5 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/models/archive_content_models.py
View File

@@ -15,19 +15,22 @@ class Archive_Content_Base(BaseModel):
log.debug(locals()) log.debug(locals())
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['archive_id_random'], **base_fields['archive_content_id_random'],
alias = 'archive_id_random', alias = 'archive_content_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 = 'archive_id' alias = 'archive_content_id'
) )
account_id_random: Optional[str] # Is this field really needed? account_id_random: Optional[str] # Is this field really needed?
account_id: Optional[int] # Is this field really needed? account_id: Optional[int] # Is this field really needed?
archive_id_random: Optional[str] archive_id_random: Optional[str]
archive_id: Optional[int] archive_id: Optional[int]
archive_content_type_id: Optional[int] archive_content_type_id: Optional[int]
archive_content_type: Optional[str] archive_content_type: Optional[str]
lu_media_type_id: Optional[int] lu_media_type_id: Optional[int]
lu_media_type: Optional[str] lu_media_type: Optional[str]
@@ -46,11 +49,10 @@ class Archive_Content_Base(BaseModel):
filename: Optional[str] filename: Optional[str]
file_extension: Optional[str] file_extension: Optional[str]
original_datetime: Optional[datetime.datetime] = None original_datetime: Optional[datetime.datetime]
original_datetime_timezone: Optional[str] = None original_datetime_timezone: Optional[str]
original_location: Optional[str] = None original_location: Optional[str]
original_address_id: Optional[int] = None original_address_id: Optional[int]
original_url: Optional[str] original_url: Optional[str]
original_url_text: Optional[str] original_url_text: Optional[str]
@@ -58,16 +60,16 @@ class Archive_Content_Base(BaseModel):
access_key: Optional[str] access_key: Optional[str]
enable: Optional[bool] enable: Optional[bool]
enable_from: Optional[datetime.datetime] = None enable_from: Optional[datetime.datetime]
enable_to: Optional[datetime.datetime] = None enable_to: Optional[datetime.datetime]
priority: Optional[bool] priority: Optional[bool]
sort: Optional[int] sort: Optional[int]
group: Optional[str] group: Optional[str]
notes: Optional[str] notes: Optional[str]
created_on: Optional[datetime.datetime] = None created_on: Optional[datetime.datetime]
updated_on: Optional[datetime.datetime] = None updated_on: Optional[datetime.datetime]
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
@@ -110,6 +112,7 @@ class Archive_Content_Base(BaseModel):
class Config: class Config:
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields fields = base_fields
#Archive_Content_Base.update_forward_refs() #Archive_Content_Base.update_forward_refs()

3
app/models/archive_models.py
View File

@@ -20,7 +20,7 @@ class Archive_Base(BaseModel):
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 = 'archive_id' alias = 'archive_id'
) )
account_id_random: Optional[str] account_id_random: Optional[str]
account_id: Optional[int] account_id: Optional[int]
@@ -93,6 +93,7 @@ class Archive_Base(BaseModel):
class Config: class Config:
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields fields = base_fields
#Archive_Base.update_forward_refs() #Archive_Base.update_forward_refs()

1
app/models/common_field_schema.py
View File

@@ -26,6 +26,7 @@ base_fields['account_id_random'] = xxx_id_random_field_schema
base_fields['account_cfg_id_random'] = xxx_id_random_field_schema base_fields['account_cfg_id_random'] = xxx_id_random_field_schema
base_fields['address_id_random'] = xxx_id_random_field_schema base_fields['address_id_random'] = xxx_id_random_field_schema
base_fields['archive_id_random'] = xxx_id_random_field_schema base_fields['archive_id_random'] = xxx_id_random_field_schema
base_fields['archive_content_id_random'] = xxx_id_random_field_schema
base_fields['contact_id_random'] = xxx_id_random_field_schema base_fields['contact_id_random'] = xxx_id_random_field_schema
base_fields['cont_edu_cert_id_random'] = xxx_id_random_field_schema base_fields['cont_edu_cert_id_random'] = xxx_id_random_field_schema
base_fields['cont_edu_cert_person_id_random'] = xxx_id_random_field_schema base_fields['cont_edu_cert_person_id_random'] = xxx_id_random_field_schema

2
app/routers/archive_content.py
View File

@@ -97,7 +97,7 @@ async def get_archive_content_obj(
by_alias: Optional[bool] = True, by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
obj_type = 'archive_content' obj_type = 'archive_content'

2
app/routers/hosted_file.py
View File

@@ -38,7 +38,7 @@ async def upload_files(
by_alias: bool = True, by_alias: bool = True,
exclude_unset: bool = True, exclude_unset: bool = True,
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
account_id_random = account_id # This is for the account random str ID account_id_random = account_id # This is for the account random str ID