update version

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

@@ -25,5 +25,7 @@ def get_enrollment(enrollment_id: str):
         + SortKey('0')
         + SortKey('ORG', rename_key='org')
         + SortKey('CANCEL_POLICY', rename_key='cancel_policy')
+        + SortKey('CREATED_BY', rename_key='created_by')
+        + SortKey('CANCELED_BY', rename_key='canceled_by')
         + SortKey('LOCK', rename_key='lock')
     )

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

@@ -37,7 +37,7 @@ def cancel(
     with dyn.transact_writer() as transact:
         transact.update(
             key=KeyPair(enrollment_id, '0'),
-            cond_expr='#status = pending',
+            cond_expr='#status = :pending',
             update_expr='SET #status = :canceled, \
                              canceled_at = :now, \
                              updated_at = :now',

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

@@ -119,6 +119,14 @@ def add_org(
                 'created_at': now_,
             }
         )
+        transact.put(
+            item={
+                'id': user.id,
+                'sk': f'SCOPE#{org_id}',
+                'scope': {'apps:admin'},
+                'created_at': now_,
+            }
+        )
         transact.put(
             item={
                 # Post-migration (users): rename `orgmembers#` to `MEMBER#ORG#`

api.saladeaula.digital/app/routes/orgs/admins.py

@@ -1,7 +1,13 @@
 from http import HTTPStatus
+from typing import Annotated
 
 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 layercake.dateutils import now
 from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair
+from layercake.extra_types import NameStr
+from pydantic import UUID4, BaseModel, EmailStr
 
 from api_gateway import JSONResponse
 from boto3clients import dynamodb_client
@@ -11,6 +17,12 @@ router = Router()
 dyn = DynamoDBPersistenceLayer(USER_TABLE, dynamodb_client)
 
 
+class OrgNotFoundError(NotFoundError): ...
+
+
+class MemberNotFoundError(NotFoundError): ...
+
+
 @router.get('/<org_id>/admins')
 def get_admins(org_id: str):
     return dyn.collection.query(
@@ -20,9 +32,60 @@ def get_admins(org_id: str):
     )
 
 
+class User(BaseModel):
+    id: str | UUID4
+    name: NameStr
+    email: EmailStr
+
+
 @router.post('/<org_id>/admins')
-def add(org_id: str):
-    return JSONResponse(HTTPStatus.CREATED)
+def add(org_id: str, user: Annotated[User, Body(embed=True)]):
+    now_ = now()
+    org = dyn.collection.get_item(
+        KeyPair(pk=org_id, sk='0'),
+        exc_cls=OrgNotFoundError,
+    )
+
+    with dyn.transact_writer() as transact:
+        transact.condition(
+            key=KeyPair(
+                # Post-migration (users): rename `orgmemebers#` to `MEMBER#ORG#`
+                pk=f'orgmembers#{org_id}',
+                sk=str(user.id),
+            ),
+            cond_expr='attribute_exists(sk)',
+            exc_cls=MemberNotFoundError,
+        )
+        transact.put(
+            item={
+                'id': user.id,
+                # Post-migration (users): rename `orgs#` to `ORG#`
+                'sk': f'orgs#{org_id}',
+                'name': org['name'],
+                'cnpj': org['cnpj'],
+                'created_at': now_,
+            }
+        )
+        transact.put(
+            item={
+                'id': user.id,
+                'sk': f'SCOPE#{org_id}',
+                'scope': {'apps:admin'},
+                'created_at': now_,
+            }
+        )
+        transact.put(
+            item={
+                'id': org_id,
+                # Post-migrations (users): rename `admins#` to `ADMIN#`
+                'sk': f'admins#{user.id}',
+                'name': user.name,
+                'email': user.email,
+                'created_at': now_,
+            },
+        )
+
+    return JSONResponse(HTTPStatus.NO_CONTENT)
 
 
 @router.delete('/<org_id>/admins/<user_id>')
@@ -32,5 +95,8 @@ def revoke(org_id: str, user_id: str):
             # Post-migration: rename `admins` to `ADMIN`
             key=KeyPair(org_id, f'admins#{user_id}'),
         )
+        transact.delete(
+            key=KeyPair(user_id, f'SCOPE#{org_id}'),
+        )
 
     return JSONResponse(HTTPStatus.NO_CONTENT)

api.saladeaula.digital/app/routes/orgs/users/__init__.py

@@ -79,6 +79,9 @@ def unlink(org_id: str, user_id: str):
             # Post-migration: uncomment the following line
             # key=KeyPair(org_id, f'ADMIN#{user_id}'),
         )
+        transact.delete(
+            key=KeyPair(user_id, f'SCOPE#{org_id}'),
+        )
         transact.delete(
             key=KeyPair(
                 pk=user_id,
@@ -90,6 +93,8 @@ def unlink(org_id: str, user_id: str):
         transact.update(
             key=KeyPair(user_id, '0'),
             update_expr='DELETE tenant_id :org_id',
+            # Post-migration: uncomment the following line
+            # update_expr='DELETE org_id :org_id',
             expr_attr_values={':org_id': {org_id}},
         )
 

api.saladeaula.digital/app/routes/orgs/users/batch_jobs.py

@@ -10,5 +10,5 @@ router = Router()
 dyn = DynamoDBPersistenceLayer(USER_TABLE, dynamodb_client)
 
 
-@router.post('/<org_id>/users/batch-jobs')
+@router.post('/<org_id>/users/batch')
 def batch_jobs(org_id: str): ...

api.saladeaula.digital/app/routes/users/emails.py

@@ -195,7 +195,7 @@ def primary(
     with dyn.transact_writer() as transact:
         # Set the old email as non-primary
         transact.update(
-            # Post-migration (users): rename `emails` to `EMAIL`
+            # Post-migration (users): rename `emails#` to `EMAIL#`
             key=KeyPair(user_id, f'emails#{old_email}'),
             update_expr=expr,
             expr_attr_values={
@@ -206,7 +206,7 @@ def primary(
         )
         # Set the new email as primary
         transact.update(
-            # Post-migration (users): rename `emails` to `EMAIL`
+            # Post-migration (users): rename `emails#` to `EMAIL#`
             key=KeyPair(user_id, f'emails#{new_email}'),
             update_expr=expr,
             expr_attr_values={
@@ -243,7 +243,7 @@ def remove(
             key=KeyPair('email', email),
         )
         transact.delete(
-            # Post-migration (users): rename `emails` to `EMAIL`
+            # Post-migration (users): rename `emails#` to `EMAIL#`
             key=KeyPair(user_id, f'emails#{email}'),
             # Delete any email except the primary email
             cond_expr='email_primary <> :email_primary',

api.saladeaula.digital/app/routes/users/orgs.py

@@ -18,7 +18,7 @@ def get_orgs(
     limit: Annotated[int, Query(ge=25)] = 25,
 ):
     return dyn.collection.query(
-        # Post-migration (users): rename `orgs` to `ORG`
+        # Post-migration (users): rename `orgs#` to `ORG#`
         key=KeyPair(user_id, 'orgs#'),
         start_key=start_key,
         limit=limit,