update layercake version

http-api/app/routes/courses/__init__.py

@@ -22,8 +22,6 @@ router = Router()
 meili_client = Meilisearch(MEILISEARCH_HOST, MEILISEARCH_API_KEY)
 course_layer = DynamoDBPersistenceLayer(COURSE_TABLE, dynamodb_client)
 user_layer = DynamoDBPersistenceLayer(USER_TABLE, dynamodb_client)
-user_collect = DynamoDBCollection(user_layer)
-course_collect = DynamoDBCollection(course_layer)
 
 
 @router.get(
@@ -55,8 +53,8 @@ def get_courses():
     compress=True,
     tags=['Course'],
     middlewares=[
-        TenantMiddleware(user_collect),
-        AuditLogMiddleware('COURSE_ADD', user_collect, ('id', 'name')),
+        TenantMiddleware(user_layer.collection),
+        AuditLogMiddleware('COURSE_ADD', user_layer.collection, ('id', 'name')),
     ],
 )
 def post_course(payload: Course):
@@ -74,7 +72,7 @@ def post_course(payload: Course):
 
 @router.get('/<id>', compress=True, tags=['Course'])
 def get_course(id: str):
-    return course_collect.get_item(
+    return course_layer.collection.get_item(
         KeyPair(id, '0'),
         exc_cls=NotFoundError,
     )
@@ -85,8 +83,8 @@ def get_course(id: str):
     compress=True,
     tags=['Course'],
     middlewares=[
-        TenantMiddleware(user_collect),
-        AuditLogMiddleware('COURSE_UPDATE', user_collect, ('id', 'name')),
+        TenantMiddleware(user_layer.collection),
+        AuditLogMiddleware('COURSE_UPDATE', user_layer.collection, ('id', 'name')),
     ],
 )
 def put_course(id: str, payload: Course):

http-api/app/routes/enrollments/cancel.py

@@ -0,0 +1,55 @@
+from aws_lambda_powertools.event_handler.api_gateway import Router
+from elasticsearch import Elasticsearch
+from layercake.dynamodb import (
+    DynamoDBCollection,
+    DynamoDBPersistenceLayer,
+    KeyPair,
+)
+from pydantic import UUID4, BaseModel
+
+from boto3clients import dynamodb_client
+from config import ELASTIC_CONN, ENROLLMENT_TABLE, USER_TABLE
+from middlewares.audit_log_middleware import AuditLogMiddleware
+from middlewares.authentication_middleware import User
+from rules.enrollment import set_status_as_canceled
+
+from .vacancies import router as vacancies
+
+__all__ = ['vacancies']
+
+
+router = Router()
+elastic_client = Elasticsearch(**ELASTIC_CONN)
+enrollment_layer = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
+user_layer = DynamoDBPersistenceLayer(USER_TABLE, dynamodb_client)
+user_collect = DynamoDBCollection(user_layer)
+
+
+class Cancel(BaseModel):
+    id: UUID4 | str
+    lock_hash: str
+    course: dict = {}
+    vacancy: dict = {}
+
+
+@router.patch(
+    '/<id>/cancel',
+    compress=True,
+    tags=['Enrollment'],
+    middlewares=[
+        AuditLogMiddleware('ENROLLMENT_CANCEL', user_collect, ('id', 'course'))
+    ],
+)
+def cancel(id: str, payload: Cancel):
+    user: User = router.context['user']
+
+    set_status_as_canceled(
+        id,
+        lock_hash=payload.lock_hash,
+        author=user.model_dump(),  # type: ignore
+        course=payload.course,  # type: ignore
+        vacancy_key=KeyPair.parse_obj(payload.vacancy),
+        persistence_layer=enrollment_layer,
+    )
+
+    return payload

http-api/app/routes/enrollments/enroll.py

@@ -0,0 +1,64 @@
+from datetime import datetime
+
+from aws_lambda_powertools.event_handler.api_gateway import Router
+from layercake.batch import BatchProcessor
+from layercake.dynamodb import (
+    DynamoDBCollection,
+    DynamoDBPersistenceLayer,
+)
+from pydantic import BaseModel
+
+from boto3clients import dynamodb_client
+from config import (
+    ENROLLMENT_TABLE,
+    USER_TABLE,
+)
+from middlewares import Tenant, TenantMiddleware
+from models import Course, User
+
+router = Router()
+
+enrollment_layer = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
+user_layer = DynamoDBPersistenceLayer(USER_TABLE, dynamodb_client)
+user_collect = DynamoDBCollection(user_layer)
+enrollment_collect = DynamoDBCollection(enrollment_layer)
+processor = BatchProcessor()
+
+
+class Item(BaseModel):
+    user: User
+    course: Course
+    schedule_date: datetime | None = None
+
+
+class Payload(BaseModel):
+    items: tuple[Item, ...]
+
+
+@router.post(
+    '/',
+    compress=True,
+    tags=['Enrollment'],
+    middlewares=[
+        TenantMiddleware(user_collect),
+    ],
+)
+def enroll_(payload: Payload):
+    context = {'tenant': router.context['tenant']}
+
+    with processor(payload.items, handler, context):
+        processor.process()
+
+    return {}
+
+
+def handler(record: Item, context: dict):
+    tenant: Tenant = context['tenant']
+    # enroll(
+    #     enrollment=Enrollment(user=[])
+    #     tenant={
+    #         'id': str(tenant.id),
+    #         'name': tenant.name,
+    #     },
+    #     persistence_layer=enrollment_layer,
+    # )

http-api/app/routes/settings/__init__.py

@@ -1,6 +1,5 @@
 from aws_lambda_powertools.event_handler.api_gateway import Router
 from layercake.dynamodb import (
-    DynamoDBCollection,
     DynamoDBPersistenceLayer,
     KeyPair,
     PrefixKey,
@@ -13,7 +12,6 @@ from middlewares import User
 
 router = Router()
 user_layer = DynamoDBPersistenceLayer(USER_TABLE, dynamodb_client)
-user_collect = DynamoDBCollection(user_layer)
 
 
 LIMIT = 25
@@ -22,11 +20,11 @@ LIMIT = 25
 @router.get('/', include_in_schema=False)
 def settings():
     user: User = router.context['user']
-    acls = user_collect.query(
+    acls = user_layer.collection.query(
         KeyPair(user.id, PrefixKey('acls')),
         limit=LIMIT,
     )
-    tenants = user_collect.query(
+    tenants = user_layer.collection.query(
         KeyPair(user.id, PrefixKey('orgs')),
         limit=LIMIT,
     )

http-api/app/routes/users/orgs.py

@@ -5,7 +5,6 @@ from aws_lambda_powertools.event_handler.exceptions import (
     BadRequestError as PowertoolsBadRequestError,
 )
 from layercake.dynamodb import (
-    DynamoDBCollection,
     DynamoDBPersistenceLayer,
     KeyPair,
     MissingError,
@@ -26,7 +25,6 @@ class BadRequestError(MissingError, PowertoolsBadRequestError): ...
 
 router = Router()
 user_layer = DynamoDBPersistenceLayer(USER_TABLE, dynamodb_client)
-user_collect = DynamoDBCollection(user_layer, exc_cls=BadRequestError)
 
 
 @router.get(
@@ -36,7 +34,7 @@ user_collect = DynamoDBCollection(user_layer, exc_cls=BadRequestError)
     summary='Get user orgs',
 )
 def get_orgs(id: str):
-    return user_collect.query(
+    return user_layer.collection.query(
         KeyPair(id, PrefixKey('orgs')),
         start_key=router.current_event.get_query_string_value('start_key', None),
     )
@@ -54,7 +52,9 @@ class Unassign(BaseModel):
     tags=['User'],
     summary='Delete user org',
     middlewares=[
-        AuditLogMiddleware('UNASSIGN_ORG', user_collect, ('id', 'name', 'cnpj'))
+        AuditLogMiddleware(
+            'UNASSIGN_ORG', user_layer.collection, ('id', 'name', 'cnpj')
+        )
     ],
 )
 def delete_org(id: str, payload: Unassign):