finish user

api.saladeaula.digital/app/app.py

@@ -38,6 +38,7 @@ app.include_router(enrollments.cancel, prefix='/enrollments')
 app.include_router(enrollments.dedup_window, prefix='/enrollments')
 app.include_router(enrollments.download_cert, prefix='/enrollments')
 app.include_router(enrollments.enroll, prefix='/enrollments')
+app.include_router(enrollments.scorm, prefix='/enrollments')
 app.include_router(users.router, prefix='/users')
 app.include_router(users.emails, prefix='/users')
 app.include_router(users.orgs, prefix='/users')

api.saladeaula.digital/app/routes/enrollments/__init__.py

@@ -1,16 +1,7 @@
-from http import HTTPStatus
-from os import rename
-from typing import Annotated
-
 from aws_lambda_powertools import Logger
 from aws_lambda_powertools.event_handler.api_gateway import Router
-from aws_lambda_powertools.event_handler.exceptions import NotFoundError
-from aws_lambda_powertools.event_handler.openapi.params import Body
-from glom import T, glom
-from layercake.dateutils import now
-from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair, SortKey, TransactKey
+from layercake.dynamodb import DynamoDBPersistenceLayer, SortKey, TransactKey
 
-from api_gateway import JSONResponse
 from boto3clients import dynamodb_client
 from config import ENROLLMENT_TABLE
 
@@ -18,8 +9,9 @@ from .cancel import router as cancel
 from .dedup_window import router as dedup_window
 from .download_cert import router as download_cert
 from .enroll import router as enroll
+from .scorm import router as scorm
 
-__all__ = ['cancel', 'dedup_window', 'download_cert', 'enroll']
+__all__ = ['cancel', 'dedup_window', 'download_cert', 'enroll', 'scorm']
 
 logger = Logger(__name__)
 router = Router()
@@ -29,62 +21,5 @@ dyn = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
 @router.get('/<enrollment_id>')
 def get_enrollment(enrollment_id: str):
     return dyn.collection.get_items(
-        TransactKey(enrollment_id)
-        + SortKey('0')
-        + SortKey('ORG')
-        + SortKey('LOCK')
-        + SortKey('SCORM_COMMIT#LAST', rename_key='last_commit'),
+        TransactKey(enrollment_id) + SortKey('0') + SortKey('ORG') + SortKey('LOCK')
     )
-
-
-@router.get('/<enrollment_id>/scorm')
-def get_scorm(enrollment_id: str):
-    enrollment = dyn.collection.get_items(
-        TransactKey(enrollment_id) + SortKey('0') + SortKey('SCORM_COMMIT#LAST')
-    )
-
-    if not enrollment:
-        raise NotFoundError('Enrollment not found')
-
-    spec = {'id': 'course.id', 'scormset': 'course.scormset'}
-    course_id, scormset_id = glom(enrollment, spec).values()
-    scormset = dyn.collection.get_item(
-        KeyPair(course_id, f'SCORMSET#{scormset_id}'),
-        raise_on_error=False,
-        default={},
-    )
-
-    return enrollment | {'scormset': scormset}
-
-
-@router.post('/<enrollment_id>')
-def post_enrollment(
-    enrollment_id: str,
-    cmi: Annotated[dict, Body(embed=True)],
-):
-    now_ = now()
-
-    with dyn.transact_writer() as transact:
-        transact.condition(
-            key=KeyPair(enrollment_id, '0'),
-            cond_expr='attribute_exists(sk)',
-            exc_cls=NotFoundError,
-        )
-        transact.put(
-            item={
-                'id': enrollment_id,
-                'sk': 'SCORM_COMMIT#LAST',
-                'cmi': cmi,
-                'created_at': now_,
-            }
-        )
-        transact.put(
-            item={
-                'id': f'SCORM_COMMIT#{enrollment_id}',
-                'sk': now_.isoformat(),
-                'cmi': cmi,
-                'created_at': now_,
-            }
-        )
-
-    return JSONResponse(HTTPStatus.NO_CONTENT)

api.saladeaula.digital/app/routes/enrollments/scorm.py

@@ -0,0 +1,73 @@
+from http import HTTPStatus
+from typing import Annotated
+
+from aws_lambda_powertools import Logger
+from aws_lambda_powertools.event_handler.api_gateway import Router
+from aws_lambda_powertools.event_handler.exceptions import NotFoundError
+from aws_lambda_powertools.event_handler.openapi.params import Body
+from glom import glom
+from layercake.dateutils import now
+from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair, SortKey, TransactKey
+
+from api_gateway import JSONResponse
+from boto3clients import dynamodb_client
+from config import ENROLLMENT_TABLE
+
+logger = Logger(__name__)
+router = Router()
+dyn = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
+
+
+@router.get('/<enrollment_id>/scorm')
+def get_scorm(enrollment_id: str):
+    enrollment = dyn.collection.get_items(
+        TransactKey(enrollment_id)
+        + SortKey('0')
+        + SortKey('SCORM_COMMIT#LAST', rename_key='last_commit')
+    )
+
+    if not enrollment:
+        raise NotFoundError('Enrollment not found')
+
+    spec = {'id': 'course.id', 'scormset': 'course.scormset'}
+    course_id, scormset_id = glom(enrollment, spec).values()
+    scormset = dyn.collection.get_item(
+        KeyPair(course_id, f'SCORMSET#{scormset_id}'),
+        raise_on_error=False,
+        default={},
+    )
+
+    return enrollment | {'scormset': scormset}
+
+
+@router.post('/<enrollment_id>/scorm')
+def post_scorm(
+    enrollment_id: str,
+    cmi: Annotated[dict, Body(embed=True)],
+):
+    now_ = now()
+
+    with dyn.transact_writer() as transact:
+        transact.condition(
+            key=KeyPair(enrollment_id, '0'),
+            cond_expr='attribute_exists(sk)',
+            exc_cls=NotFoundError,
+        )
+        transact.put(
+            item={
+                'id': enrollment_id,
+                'sk': 'SCORM_COMMIT#LAST',
+                'cmi': cmi,
+                'created_at': now_,
+            }
+        )
+        transact.put(
+            item={
+                'id': f'SCORM_COMMIT#{enrollment_id}',
+                'sk': now_.isoformat(),
+                'cmi': cmi,
+                'created_at': now_,
+            }
+        )
+
+    return JSONResponse(HTTPStatus.NO_CONTENT)

api.saladeaula.digital/tests/routes/test_enrollments.py

@@ -82,7 +82,7 @@ def test_post_scormset(
 
     r = app.lambda_handler(
         http_api_proxy(
-            raw_path='/enrollments/578ec87f-94c7-4840-8780-bb4839cc7e64',
+            raw_path='/enrollments/578ec87f-94c7-4840-8780-bb4839cc7e64/scorm',
             method=HTTPMethod.POST,
             body=scormbody,
         ),