update layercake
This commit is contained in:
@@ -13,8 +13,8 @@ from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair
|
||||
from pydantic import UUID4, BaseModel
|
||||
|
||||
from api_gateway import JSONResponse
|
||||
from boto3clients import dynamodb_client
|
||||
from config import COURSE_TABLE
|
||||
from boto3clients import dynamodb_client, s3_client
|
||||
from config import BUCKET_NAME, COURSE_TABLE
|
||||
from form_data import parse
|
||||
|
||||
logger = Logger(__name__)
|
||||
@@ -32,21 +32,18 @@ def get_course(course_id: str):
|
||||
|
||||
class Cert(BaseModel):
|
||||
exp_interval: int | None = None
|
||||
rawfile: bytes | None = None
|
||||
s3_uri: str | None = None
|
||||
|
||||
def model_dump(self, **kwargs) -> dict[str, Any]:
|
||||
return super().model_dump(
|
||||
exclude={'rawfile'},
|
||||
exclude_none=True,
|
||||
**kwargs,
|
||||
)
|
||||
return super().model_dump(exclude_none=True, **kwargs)
|
||||
|
||||
|
||||
class Course(BaseModel):
|
||||
id: UUID4
|
||||
name: str
|
||||
access_period: int
|
||||
cert: Cert | None = None
|
||||
cert: Cert
|
||||
rawfile: bytes | None = None
|
||||
|
||||
|
||||
@router.put('/<course_id>')
|
||||
@@ -58,10 +55,21 @@ def edit_course(course_id: str):
|
||||
|
||||
body = BytesIO(event.decoded_body.encode())
|
||||
course = Course.model_validate(
|
||||
{'id': course_id} | parse(event.headers, body),
|
||||
{'id': course_id, 'cert': {}} | parse(event.headers, body),
|
||||
)
|
||||
now_ = now()
|
||||
|
||||
if course.rawfile:
|
||||
object_key = f'certs/{course_id}.html'
|
||||
course.cert.s3_uri = f's3://{BUCKET_NAME}/{object_key}'
|
||||
|
||||
s3_client.put_object(
|
||||
Bucket=BUCKET_NAME,
|
||||
Key=object_key,
|
||||
Body=course.rawfile,
|
||||
ContentType='text/html',
|
||||
)
|
||||
|
||||
with dyn.transact_writer() as transact:
|
||||
transact.update(
|
||||
key=KeyPair(str(course.id), '0'),
|
||||
@@ -72,7 +80,7 @@ def edit_course(course_id: str):
|
||||
},
|
||||
expr_attr_values={
|
||||
':name': course.name,
|
||||
':cert': course.cert.model_dump() if course.cert else None,
|
||||
':cert': course.cert.model_dump(),
|
||||
':access_period': course.access_period,
|
||||
':updated_at': now_,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user