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

update

Browse Source
This commit is contained in:
Sérgio Rafael Siqueira
2025-07-02 21:20:21 -03:00
parent 238c215f76
commit 3bea74c420
3 changed files with 97 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
http-api/app/rules/course.py
View File

@@ -11,11 +11,12 @@ def create_course(
persistence_layer: DynamoDBPersistenceLayer,
):
now_ = now()
with persistence_layer.transact_writer() as transact:
transact.put(
item={
'sk': '0',
'metadata__tenant_id': org.id,
'tenant': org.id,
'create_date': now_,
**course.model_dump(),
}
@@ -24,7 +25,7 @@ def create_course(
item={
'id': course.id,
'sk': 'metadata#tenant',
'tenant_id': f'ORG#{org.id}',
'org_id': org.id,
'name': org.name,
'create_date': now_,
}

83
http-api/app/rules/enrollment.py
View File

@@ -16,15 +16,15 @@ Author = TypedDict('Author', {'id': str, 'name': str})
DeduplicationWindow = TypedDict('DeduplicationWindow', {'offset_days': int})
class RelatedId(str):
def __new__(cls, id: str, kind: str) -> Self:
return super().__new__(cls, '#'.join([kind.upper(), id]))
class LinkedEntity(str):
def __new__(cls, id: str, type: str) -> Self:
return super().__new__(cls, '#'.join([type.upper(), id]))
def __init__(self, id: str, kind: str) -> None:
def __init__(self, id: str, type: str) -> None:
# __init__ is used to store the parameters for later reference.
# For immutable types like str, __init__ cannot change the instance's value.
self.id = id
self.kind = kind
self.type = type
@dataclass(frozen=True)
@@ -33,9 +33,9 @@ class Vacancy:
sk: str
@property
def order_id(self) -> RelatedId:
def order_id(self) -> LinkedEntity:
idx, _ = self.sk.split('#')
return RelatedId(idx, 'order')
return LinkedEntity(idx, 'order')
class LifecycleEvents(str, Enum):
@@ -71,7 +71,7 @@ def enroll(
tenant: Tenant,
vacancy: Vacancy | None = None,
author: Author | None = None,
related_ids: frozenset[RelatedId] = frozenset(),
linked_entities: frozenset[LinkedEntity] = frozenset(),
deduplication_window: DeduplicationWindow | None = None,
persistence_layer: DynamoDBPersistenceLayer,
) -> bool:
@@ -84,39 +84,35 @@ def enroll(
with persistence_layer.transact_writer() as transact:
if vacancy:
related_ids = frozenset({vacancy.order_id}) | related_ids
linked_entities = frozenset({vacancy.order_id}) | linked_entities
transact.put(
item={
'sk': '0',
'create_date': now_,
'metadata__tenant_id': tenant_id,
'metadata__related_ids': {
RelatedId(tenant_id, 'org'),
RelatedId(user.id, 'user'), # type: ignore
}
| related_ids,
'tenant': tenant_id,
**enrollment.model_dump(),
},
)
transact.put(
item={
'id': enrollment.id,
'sk': 'metadata#tenant',
'tenant_id': f'ORG#{tenant_id}',
'sk': 'tenant',
'org_id': tenant_id,
'name': tenant['name'],
'create_date': now_,
'created_at': now_,
},
)
transact.put(
item={
'id': enrollment.id,
# Post-migration: uncomment the following line
# 'sk': LifecycleEvents.REMINDER_NO_ACCESS_3_DAYS,
'sk': LifecycleEvents.DOES_NOT_ACCESS,
'name': user.name,
'email': user.email,
'course': course.name,
'create_date': now_,
'created_at': now_,
'ttl': ttl(days=3, start_dt=now_),
},
)
@@ -127,35 +123,37 @@ def enroll(
item={
'id': enrollment.id,
'sk': LifecycleEvents.EXPIRATION,
# Post-migration: uncomment the following line
# 'sk': LifecycleEvents.COURSE_EXPIRED,
'name': user.name,
'email': user.email,
'course': course.name,
'create_date': now_,
'created_at': now_,
'ttl': ttl(start_dt=now_ + timedelta(days=course.access_period)),
},
)
transact.put(
item={
'id': enrollment.id,
# Post-migration: uncomment the following line
# 'sk': LifecycleEvents.ACCESS_PERIOD_REMINDER_30_DAYS,
'sk': LifecycleEvents.ACCESS_PERIOD_ENDS,
'name': user.name,
'email': user.email,
'course': course.name,
'create_date': now_,
'created_at': now_,
'ttl': ttl(start_dt=now_ + timedelta(days=course.access_period - 30)),
},
)
for related_id in related_ids:
kind = related_id.kind.lower()
for entity in linked_entities:
type = entity.type.lower()
transact.put(
item={
'id': enrollment.id,
'sk': f'related_ids#{kind}',
'create_date': now_,
f'{kind}_id': related_id.id,
'sk': f'linked_entities#{type}',
'created_at': now_,
f'{type}_id': entity.id,
}
)
@@ -163,9 +161,11 @@ def enroll(
transact.put(
item={
'id': enrollment.id,
# Post-migration: uncomment the following line
# 'sk': 'metadata#parent_slot',
'sk': 'parent_vacancy',
'vacancy': asdict(vacancy),
'create_date': now_,
'created_at': now_,
}
)
@@ -181,8 +181,8 @@ def enroll(
transact.put(
item={
'id': enrollment.id,
'sk': 'metadata#cancel_policy',
'create_date': now_,
'sk': 'cancel_policy',
'created_at': now_,
}
)
@@ -190,10 +190,10 @@ def enroll(
transact.put(
item={
'id': enrollment.id,
'sk': 'metadata#author',
'sk': 'author',
'user_id': author['id'],
'name': author['name'],
'create_date': now_,
'created_at': now_,
},
)
@@ -213,7 +213,7 @@ def enroll(
'id': 'lock',
'sk': lock_hash,
'enrollment_id': enrollment.id,
'create_date': now_,
'created_at': now_,
'ttl': ttl_expiration,
},
cond_expr='attribute_not_exists(sk)',
@@ -222,9 +222,9 @@ def enroll(
transact.put(
item={
'id': enrollment.id,
'sk': 'metadata#lock',
'sk': 'lock',
'hash': lock_hash,
'create_date': now_,
'created_at': now_,
'ttl': ttl_expiration,
},
)
@@ -234,7 +234,7 @@ def enroll(
'id': enrollment.id,
'sk': 'metadata#deduplication_window',
'offset_days': offset_days,
'create_date': now_,
'created_at': now_,
},
)
else:
@@ -263,7 +263,7 @@ def set_status_as_canceled(
with persistence_layer.transact_writer() as transact:
transact.update(
key=KeyPair(id, '0'),
update_expr='SET #status = :canceled, update_date = :update',
update_expr='SET #status = :canceled, updated_at = :update',
expr_attr_names={
'#status': 'status',
},
@@ -275,9 +275,9 @@ def set_status_as_canceled(
transact.put(
item={
'id': id,
'sk': 'canceled_date',
'sk': 'canceled',
'author': author,
'create_date': now_,
'canceled_at': now_,
},
)
transact.delete(
@@ -306,17 +306,20 @@ def set_status_as_canceled(
# Put the vacancy back and assign a new ID
transact.put(
item={
# Post-migration: uncomment the following line
# 'id': f'slots#org#{org_id}',
'id': f'vacancies#{org_id}',
'sk': f'{order_id}#{uuid4()}',
'course': course,
'create_date': now_,
'created_at': now_,
},
cond_expr='attribute_not_exists(sk)',
)
# Post-migration: rename `generated_items` to `slots`.
# Set the status of `generated_items` to `ROLLBACK` to know
# which slot is available for reuse
transact.update(
# Post-migration: uncomment the following line
# key=KeyPair(order_id, f'slots#enrollment#{enrollment_id}'),
key=KeyPair(order_id, f'generated_items#{enrollment_id}'),
update_expr='SET #status = :status, update_date = :update',
expr_attr_names={