add docs

http-api/routes/enrollments/__init__.py

@@ -1,15 +1,28 @@
 import json
-from typing import Literal
+from typing import TypedDict
 
 from aws_lambda_powertools.event_handler.api_gateway import Router
 from elasticsearch import Elasticsearch
-from pydantic import BaseModel
+from layercake.dynamodb import (
+    DynamoDBCollection,
+    DynamoDBPersistenceLayer,
+    SortKey,
+    TransactKey,
+)
+from pydantic import UUID4, BaseModel
 
 import elastic
-from settings import ELASTIC_CONN, ENROLLMENT_TABLE
+from boto3clients import dynamodb_client
+from middlewares.audit_log_middleware import AuditLogMiddleware
+from middlewares.authorizer_middleware import User
+from settings import ELASTIC_CONN, ENROLLMENT_TABLE, USER_TABLE
 
 router = Router()
 elastic_client = Elasticsearch(**ELASTIC_CONN)
+enrollment_layer = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
+user_layer = DynamoDBPersistenceLayer(USER_TABLE, dynamodb_client)
+enrollment_collect = DynamoDBCollection(enrollment_layer)
+user_collect = DynamoDBCollection(user_layer)
 
 
 @router.get('/', compress=True, tags=['Enrollment'])
@@ -28,16 +41,44 @@ def get_enrollments():
 
 @router.get('/<id>', compress=True, tags=['Enrollment'])
 def get_enrollment(id: str):
-    return {}
+    return enrollment_collect.get_items(
+        TransactKey(id)
+        + SortKey('0')
+        + SortKey('started_date')
+        + SortKey('finished_date')
+        + SortKey('failed_date')
+        + SortKey('canceled_date')
+        + SortKey('archived_date')
+        + SortKey('cancel_policy')
+        + SortKey('parent_vacancy')
+        + SortKey('lock', path_spec='hash')
+        + SortKey('author')
+        + SortKey('tenant')
+        + SortKey('cert')
+    )
 
 
-class CancelPayload(BaseModel):
-    status: Literal['CANCELED'] = 'CANCELED'
+class Course(TypedDict):
+    id: str
+    name: str
 
 
-@router.patch('/<id>', compress=True, tags=['Enrollment'])
-def cancel(id: str, payload: CancelPayload):
-    return {}
+class Cancel(BaseModel):
+    id: UUID4 | str
+    course: Course
+
+
+@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']
+    return payload
 
 
 @router.post('/', compress=True, tags=['Enrollment'])

http-api/routes/settings/__init__.py

@@ -22,11 +22,11 @@ LIMIT = 25
 @router.get('/', include_in_schema=False)
 def settings():
     user: User = router.context['user']
-    acls = user_collect.get_items(
+    acls = user_collect.query(
         KeyPair(user.id, PrefixKey('acls')),
         limit=LIMIT,
     )
-    tenants = user_collect.get_items(
+    tenants = user_collect.query(
         KeyPair(user.id, PrefixKey('orgs')),
         limit=LIMIT,
     )

http-api/routes/users/__init__.py

@@ -21,11 +21,12 @@ from layercake.dynamodb import (
 )
 from pydantic import UUID4, BaseModel, StringConstraints
 
+import cognito
 import elastic
-from boto3clients import dynamodb_client
+from boto3clients import dynamodb_client, idp_client
 from middlewares import AuditLogMiddleware
 from models import User
-from settings import ELASTIC_CONN, USER_TABLE
+from settings import ELASTIC_CONN, USER_POOOL_ID, USER_TABLE
 
 
 class BadRequestError(MissingError, PowertoolsBadRequestError): ...
@@ -37,12 +38,7 @@ user_collect = DynamoDBCollection(user_layer, exception_cls=BadRequestError)
 elastic_client = Elasticsearch(**ELASTIC_CONN)
 
 
-@router.get(
-    '/',
-    compress=True,
-    tags=['User'],
-    summary='Get users',
-)
+@router.get('/', compress=True, tags=['User'], summary='Get users')
 def get_users():
     event = router.current_event
     query = event.get_query_string_value('query', '{}')
@@ -67,29 +63,28 @@ def post_user(payload: User):
     return Response(status_code=HTTPStatus.CREATED)
 
 
-class NewPasswordPayload(BaseModel):
+class NewPassword(BaseModel):
     cognito_sub: UUID4
     new_password: Annotated[str, StringConstraints(min_length=6)]
 
 
 @router.patch('/<id>', compress=True, tags=['User'])
-def patch_reset(id: str, payload: NewPasswordPayload):
+def patch_newpassword(id: str, payload: NewPassword):
     return Response(status_code=HTTPStatus.OK)
 
 
-@router.get(
-    '/<id>',
-    compress=True,
-    tags=['User'],
-    summary='Get user',
-)
+@router.get('/<id>', compress=True, tags=['User'], summary='Get user')
 def get_user(id: str):
     return user_collect.get_item(KeyPair(id, '0'))
 
 
 @router.get('/<id>/idp', compress=True, include_in_schema=False)
 def get_idp(id: str):
-    return []
+    return cognito.admin_get_user(
+        sub=id,
+        user_pool_id=USER_POOOL_ID,
+        idp_client=idp_client,
+    )
 
 
 @router.get(
@@ -99,7 +94,7 @@ def get_idp(id: str):
     summary='Get user emails',
 )
 def get_emails(id: str):
-    return user_collect.get_items(
+    return user_collect.query(
         KeyPair(id, PrefixKey('emails')),
         start_key=router.current_event.get_query_string_value('start_key', None),
     )
@@ -112,7 +107,7 @@ def get_emails(id: str):
     summary='Get user logs',
 )
 def get_logs(id: str):
-    return user_collect.get_items(
+    return user_collect.query(
         # Post-migration: uncomment to enable PartitionKey with a composite key (id with `logs` prefix).
         # PartitionKey(ComposeKey(id, prefix='logs')),
         PartitionKey(ComposeKey(id, prefix='log', delimiter=':')),
@@ -127,7 +122,7 @@ def get_logs(id: str):
     summary='Get user orgs',
 )
 def get_orgs(id: str):
-    return user_collect.get_items(
+    return user_collect.query(
         KeyPair(id, PrefixKey('orgs')),
         start_key=router.current_event.get_query_string_value('start_key', None),
     )