sergio/saladeaula.digital
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finish seat

Browse Source
This commit is contained in:
Sérgio Rafael Siqueira
2026-01-25 04:52:44 -03:00
parent 5fac7888a8
commit 3719842ae9
31 changed files with 731 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orders-events/app/config.py
View File

@@ -1,5 +1,7 @@
import os
TZ = os.getenv('TZ', 'UTC')
USER_TABLE: str = os.getenv('USER_TABLE') # type: ignore
ORDER_TABLE: str = os.getenv('ORDER_TABLE') # type: ignore
COURSE_TABLE: str = os.getenv('COURSE_TABLE') # type: ignore
@@ -17,6 +19,8 @@ BUCKET_NAME: str = os.getenv('BUCKET_NAME') # type: ignore
EMAIL_SENDER = ('EDUSEG®', 'noreply@eduseg.com.br')
DEDUP_WINDOW_OFFSET_DAYS = 90
# Post-migration: Remove the following lines
if os.getenv('AWS_LAMBDA_FUNCTION_NAME'):
SQLITE_DATABASE = 'courses_export_2025-06-18_110214.db'

378
orders-events/app/events/start_fulfillment.py
View File

@@ -1,78 +1,372 @@
import pprint
from dataclasses import asdict, dataclass
from datetime import date, datetime, time, timedelta
from typing import Annotated, Sequence, TypedDict
from uuid import uuid4
import pytz
from aws_lambda_powertools import Logger
from aws_lambda_powertools.utilities.data_classes import (
EventBridgeEvent,
event_source,
)
from aws_lambda_powertools.utilities.typing import LambdaContext
from layercake.dynamodb import DynamoDBPersistenceLayer, KeyChain, KeyPair
from layercake.batch import BatchProcessor, Status
from layercake.dateutils import now, ttl
from layercake.dynamodb import (
DynamoDBPersistenceLayer,
KeyChain,
KeyPair,
SortKey,
TransactKey,
)
from layercake.strutils import md5_hash
from pydantic import UUID4, BaseModel, BeforeValidator, Field, FutureDate
from boto3clients import dynamodb_client
from config import ENROLLMENT_TABLE
from config import (
COURSE_TABLE,
DEDUP_WINDOW_OFFSET_DAYS,
ENROLLMENT_TABLE,
ORDER_TABLE,
TZ,
USER_TABLE,
)
logger = Logger(__name__)
dyn = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
dyn = DynamoDBPersistenceLayer(ORDER_TABLE, dynamodb_client)
processor = BatchProcessor()
class DeduplicationConflictError(Exception): ...
class EnrollmentConflictError(Exception): ...
class User(BaseModel):
id: str
name: str
email: str
cpf: str
class Course(BaseModel):
id: str
name: str
access_period: int
class Enrollment(BaseModel):
id: Annotated[
UUID4,
BeforeValidator(lambda s: s.removeprefix('ENROLLMENT#')),
] = Field(alias='sk')
user: User
course: Course
scheduled_for: FutureDate | None = None
class Org(BaseModel):
id: str | UUID4
name: str
@event_source(data_class=EventBridgeEvent)
@logger.inject_lambda_context
def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
new_image = event.detail['new_image']
now_ = now()
order_id = new_image['id']
enrollments = dyn.collection.query(
key=KeyPair(order_id, 'ENROLLMENT#'),
).get('items', [])
org_id = new_image['org_id']
order = dyn.collection.get_items(
TransactKey(order_id)
+ SortKey('ITEMS', rename_key='items')
+ SortKey('CREATED_BY', rename_key='created_by')
+ KeyPair(
pk=org_id,
sk='0',
rename_key='org',
table_name=USER_TABLE,
),
)
r = dyn.collection.query(KeyPair(order_id, 'ENROLLMENT#'))
enrollments = [Enrollment(**x) for x in r['items']]
if not enrollments:
items = dyn.collection.get_item(
KeyPair(order_id, 'ITEMS'),
raise_on_error=False,
default=[],
courses = _items_to_courses(order['items'])
_release_seats(courses, order_id=order_id, org_id=org_id)
else:
ctx = {
'order_id': order_id,
'org': Org(id=org_id, name=order['org']['name']),
'created_by': order['created_by'],
}
immediate = [e for e in enrollments if not e.scheduled_for]
later = [e for e in enrollments if e.scheduled_for]
with processor(immediate, _enroll_now, ctx) as batch:
now_out = batch.process()
with processor(later, _enroll_later, ctx) as batch:
later_out = batch.process()
# Release seats for enrollments that failed
failed = [x for x in now_out + later_out if x.status == Status.FAIL]
_release_seats(
courses=[x.input_record.course for x in failed],
order_id=order_id,
org_id=org_id,
)
pprint.pp(items)
# docx = {
# 'id': f'SEAT#ORG#{org_id}',
# 'sk': f'ORDER#{order_id}#ENROLLMENT#{uuid4()}',
# 'course': {},
# 'created_at': now_,
# }
pprint.pp(enrollments)
with dyn.transact_writer() as transact:
for x in failed:
reason = _friendly_reason(x.cause['type']) # type: ignore
transact.update(
key=KeyPair(order_id, f'ENROLLMENT#{x.input_record.id}'),
update_expr='SET #status = :rollback, \
rollback_at = :now, \
reason = :reason',
cond_expr='attribute_exists(sk) AND #status = :pending',
expr_attr_names={
'#status': 'status',
},
expr_attr_values={
':pending': 'PENDING',
':rollback': 'ROLLBACK',
':reason': reason,
':now': now_,
},
)
return True
return dyn.update_item(
key=KeyPair(order_id, new_image['sk']),
update_expr='SET #status = :completed, \
completed_at = :now',
expr_attr_names={
'#status': 'status',
},
expr_attr_values={
':completed': 'COMPLETED',
':now': now_,
},
)
# Se houver matriculas
# -> com: scheduled_for
# -> tenta agendar, se não joga para vagas
# -> tenta matriculas, se falhar, joga para vagas
# se não houver vagas, gera as vagas.
Item = TypedDict('Item', {'id': str, 'quantity': int})
@dataclass(frozen=True)
class Course:
id: str
name: str
access_period: int
def _release_seats(
courses: Sequence[Course],
*,
order_id: str,
org_id: str,
) -> None:
now_ = now()
with dyn.transact_writer(table_name=ORDER_TABLE) as transact:
for course in courses:
transact.put(
item={
'id': f'SEAT#ORG#{org_id}',
'sk': f'ORDER#{order_id}#ENROLLMENT#{uuid4()}',
'course': course.model_dump(),
'created_at': now_,
},
table_name=ORDER_TABLE,
)
def _get_courses(ids: set) -> tuple[Course, ...]:
pairs = tuple(KeyPair(idx, '0') for idx in ids)
def _items_to_courses(items: list[Item]) -> tuple[Course, ...]:
pairs = {x['id']: int(x['quantity']) for x in items}
courses = _get_courses(set(pairs.keys()))
return tuple(x for x in courses for _ in range(pairs.get(x.id, 0)))
def _get_courses(ids: set[str]) -> tuple[Course, ...]:
pairs = tuple(
KeyPair(
pk=idx,
sk='0',
table_name=COURSE_TABLE,
)
for idx in ids
)
r = dyn.collection.get_items(
KeyChain(pairs),
flatten_top=False,
)
courses = tuple(
Course(
id=idx,
name=obj['name'],
access_period=obj['access_period'],
)
for idx, obj in r.items()
return tuple(Course(id=idx, **attrs) for idx, attrs in r.items())
def _friendly_reason(reason: str) -> str:
if reason == 'DeduplicationConflictError':
return 'DEDUPLICATION'
return 'CONFLICT'
CreatedBy = TypedDict('CreatedBy', {'user_id': str, 'name': str})
Context = TypedDict(
'Context',
{
'order_id': str,
'org': Org,
'created_by': CreatedBy,
},
)
def _enroll_now(enrollment: Enrollment, context: Context) -> None:
now_ = now()
user = enrollment.user
course = enrollment.course
order_id = context['order_id']
org = context['org']
created_by = context['created_by']
access_expires_at = now_ + timedelta(days=course.access_period)
lock_hash = md5_hash(f'{user.id}{course.id}')
access_expires_at = now_ + timedelta(days=course.access_period)
offset_days = DEDUP_WINDOW_OFFSET_DAYS
dedup_lock_ttl = ttl(
start_dt=now_,
days=course.access_period - offset_days,
)
return courses
with dyn.transact_writer(table_name=ENROLLMENT_TABLE) as transact:
transact.put(
item={
'id': enrollment.id,
'sk': '0',
'score': None,
'progress': 0,
'status': 'PENDING',
'user': user.model_dump(),
'course': course.model_dump(),
'access_expires_at': access_expires_at,
'org_id': org.id,
'created_at': now_,
}
)
transact.put(
item={
'id': enrollment.id,
'sk': 'ORG',
'name': org.name,
'org_id': org.id,
'created_at': now_,
}
)
transact.put(
item={
'id': enrollment.id,
'sk': 'CANCEL_POLICY',
'created_at': now_,
'seat': {'order_id': order_id},
}
)
transact.update(
key=KeyPair(order_id, f'ENROLLMENT#{enrollment.id}'),
update_expr='SET #status = :executed, \
executed_at = :now',
cond_expr='attribute_exists(sk) AND #status = :pending',
expr_attr_names={
'#status': 'status',
},
expr_attr_values={
':pending': 'PENDING',
':executed': 'EXECUTED',
':now': now_,
},
table_name=ORDER_TABLE,
exc_cls=EnrollmentConflictError,
)
transact.put(
item={
'id': enrollment.id,
'sk': 'CREATED_BY',
'name': created_by['name'],
'user_id': created_by['user_id'],
'created_at': now_,
}
)
transact.put(
item={
'id': enrollment.id,
'sk': 'LOCK',
'hash': lock_hash,
'created_at': now_,
'ttl': dedup_lock_ttl,
},
)
transact.put(
item={
'id': 'LOCK',
'sk': lock_hash,
'enrollment_id': enrollment.id,
'created_at': now_,
'ttl': dedup_lock_ttl,
},
cond_expr='attribute_not_exists(sk)',
exc_cls=DeduplicationConflictError,
)
def _enroll_later(enrollment: Enrollment, context: Context) -> None:
now_ = now()
user = enrollment.user
course = enrollment.course
org = context['org']
created_by = context['created_by']
order_id = context['order_id']
scheduled_for = _date_to_midnight(enrollment.scheduled_for) # type: ignore
lock_hash = md5_hash(f'{user.id}{course.id}')
with dyn.transact_writer(table_name=ENROLLMENT_TABLE) as transact:
pk = f'SCHEDULED#ORG#{org.id}'
sk = f'{scheduled_for.isoformat()}#{lock_hash}'
transact.put(
item={
'id': pk,
'sk': sk,
'user': user.model_dump(),
'course': course.model_dump(),
'org_name': org.name,
'created_by': {
'id': created_by['user_id'],
'name': created_by['name'],
},
'seat': {'order_id': order_id},
'ttl': ttl(start_dt=scheduled_for),
'scheduled_at': now_,
},
)
transact.put(
item={
'id': order_id,
'sk': f'ENROLLMENT#{enrollment.id}',
'user': user.model_dump(),
'course': course.model_dump(),
'status': 'SCHEDULED',
'scheduled_at': now_,
'created_at': now_,
},
table_name=ORDER_TABLE,
)
transact.put(
item={
'id': 'LOCK#SCHEDULED',
'sk': lock_hash,
'scheduled': {
'id': pk,
'sk': sk,
},
'ttl': ttl(start_dt=scheduled_for),
'created_at': now_,
},
cond_expr='attribute_not_exists(sk)',
exc_cls=DeduplicationConflictError,
)
def _date_to_midnight(dt: date) -> datetime:
return datetime.combine(dt, time(0, 0)).replace(tzinfo=pytz.timezone(TZ))

2
orders-events/template.yaml
View File

@@ -261,6 +261,8 @@ Resources:
TableName: !Ref OrderTable
- DynamoDBCrudPolicy:
TableName: !Ref EnrollmentTable
- DynamoDBReadPolicy:
TableName: !Ref UserTable
- DynamoDBReadPolicy:
TableName: !Ref CourseTable
Events:

31
orders-events/tests/events/test_start_fulfillment.py
View File

@@ -1,5 +1,5 @@
from aws_lambda_powertools.utilities.typing import LambdaContext
from layercake.dynamodb import DynamoDBPersistenceLayer
from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair, PartitionKey
import events.start_fulfillment as app
@@ -9,12 +9,14 @@ def test_fulfillment_enrollments(
dynamodb_persistence_layer: DynamoDBPersistenceLayer,
lambda_context: LambdaContext,
):
order_id = '9b9441d2-4ae3-4b50-8cb6-71e872d4492a'
org_id = 'fee6f09b-e9fe-468d-b783-3dea5279d4dc'
event = {
'detail': {
'new_image': {
'id': '9b9441d2-4ae3-4b50-8cb6-71e872d4492a',
'id': order_id,
'sk': 'FULFILLMENT',
'org_id': 'cJtK9SsnJhKPyxESe7g3DG',
'org_id': org_id,
'status': 'IN_PROGRESS',
}
}
@@ -22,21 +24,42 @@ def test_fulfillment_enrollments(
assert app.lambda_handler(event, lambda_context) # type: ignore
r = dynamodb_persistence_layer.collection.query(
KeyPair(order_id, 'ENROLLMENT#'),
)
assert len(r['items']) == 3
seats = dynamodb_persistence_layer.collection.query(
PartitionKey(f'SEAT#ORG#{org_id}')
)
assert len(seats['items']) == 1
scheduled = dynamodb_persistence_layer.collection.query(
PartitionKey(f'SCHEDULED#ORG#{org_id}')
)
assert len(scheduled['items']) == 1
def test_fulfillment_items(
dynamodb_seeds,
dynamodb_persistence_layer: DynamoDBPersistenceLayer,
lambda_context: LambdaContext,
):
org_id = 'fee6f09b-e9fe-468d-b783-3dea5279d4dc'
event = {
'detail': {
'new_image': {
'id': '9f7fa055-7c0b-418a-b023-77477d1895b9',
'sk': 'FULFILLMENT',
'org_id': 'cJtK9SsnJhKPyxESe7g3DG',
'org_id': org_id,
'status': 'IN_PROGRESS',
}
}
}
assert app.lambda_handler(event, lambda_context) # type: ignore
seats = dynamodb_persistence_layer.collection.query(
PartitionKey(f'SEAT#ORG#{org_id}')
)
assert len(seats['items']) == 2

13
orders-events/tests/seeds.jsonl
View File

@@ -15,12 +15,21 @@
{"id": "2849f1d5-f4f1-411e-8497-ec3a40afc0ab", "sk": "ADDRESS", "city": "São José", "postcode": "88101001", "state": "SC", "created_at": "2026-01-07T19:09:54.193859-03:00", "address1": "Avenida Presidente Kennedy", "address2": "", "neighborhood": "Campinas"}
// Seeds for Order
// file: tests/events/test_start_fulfillment.py
// file: tests/events/test_start_fulfillment.py::test_fulfillment_enrollments
{"id": "9b9441d2-4ae3-4b50-8cb6-71e872d4492a", "sk": "0", "name": "EDUSEG", "org_id": "fee6f09b-e9fe-468d-b783-3dea5279d4dc"}
{"id": "9b9441d2-4ae3-4b50-8cb6-71e872d4492a", "sk": "ITEMS", "items": [ { "name": "Combate a Incêndio", "id": "4866c068-577a-45b0-b41a-41a7dc6b9ab7", "quantity": 2, "unit_price": 99 } ], "created_at": "2026-01-20T13:05:52.737256-03:00"}
{"id": "9b9441d2-4ae3-4b50-8cb6-71e872d4492a", "sk": "ENROLLMENT#7d3f5457-8533-4f27-a0a4-ffa209a93f7d", "course": { "name": "Combate a Incêndio", "id": "4866c068-577a-45b0-b41a-41a7dc6b9ab7", "access_period": 365 }, "user": { "name": "Maitê L Siqueira", "cpf": "02186829991", "id": "87606a7f-de56-4198-a91d-b6967499d382", "email": "osergiosiqueira+maite@gmail.com" }, "created_at": "2026-01-20T13:05:52.737256-03:00", "status": "PENDING"}
{"id": "9b9441d2-4ae3-4b50-8cb6-71e872d4492a", "sk": "ENROLLMENT#9576855e-b259-4f3e-8315-1612a5cb8c36", "user": { "name": "Sérgio Rafael de Siqueira", "cpf": "07879819908", "id": "5OxmMjL-ujoR5IMGegQz", "email": "sergio@somosbeta.com.br" }, "course": { "name": "Combate a Incêndio", "id": "4866c068-577a-45b0-b41a-41a7dc6b9ab7", "access_period": 365 }, "created_at": "2026-01-20T13:05:52.737256-03:00", "status": "PENDING"}
// Seeds for Order
{"id": "9b9441d2-4ae3-4b50-8cb6-71e872d4492a", "sk": "ENROLLMENT#792ac025-578c-48ab-95a8-5721fcf8fc64", "user": { "name": "Sérgio Rafael de Siqueira", "cpf": "07879819908", "id": "5OxmMjL-ujoR5IMGegQz", "email": "sergio@somosbeta.com.br" }, "course": { "name": "Combate a Incêndio", "id": "4866c068-577a-45b0-b41a-41a7dc6b9ab7", "access_period": 365 }, "created_at": "2026-01-20T13:05:52.737256-03:00", "status": "PENDING", "scheduled_for": "2030-01-02"}
{"id": "9b9441d2-4ae3-4b50-8cb6-71e872d4492a", "sk": "CREATED_BY", "user_id": "123", "name": "Avril Lavigne"}
{"id": "LOCK", "sk": "9b8beacfe6ff442ec389d30d3e0bc085"}
// Org
{"id": "fee6f09b-e9fe-468d-b783-3dea5279d4dc", "sk": "0", "name": "EDUSEG"}
// Course
{"id": "4866c068-577a-45b0-b41a-41a7dc6b9ab7", "sk": "0", "name": "Combate a Incêndio", "access_period": 365}
// file: tests/events/test_start_fulfillment.py::test_fulfillment_items
{"id": "9f7fa055-7c0b-418a-b023-77477d1895b9", "sk": "ITEMS", "items": [ { "name": "Combate a Incêndio", "id": "4866c068-577a-45b0-b41a-41a7dc6b9ab7", "quantity": 2, "unit_price": 99 } ], "created_at": "2026-01-20T13:05:52.737256-03:00"}
{"id": "9f7fa055-7c0b-418a-b023-77477d1895b9", "sk": "CREATED_BY", "user_id": "123", "name": "Avril Lavigne"}
// Seeds for Iugu

2
orders-events/uv.lock generated
View File

@@ -758,7 +758,7 @@ wheels = [
[[package]]
name = "layercake"
version = "0.13.1"
version = "0.13.4"
source = { directory = "../layercake" }
dependencies = [
{ name = "arnparse" },