update address

http-api/app/rules/org.py

@@ -5,36 +5,38 @@ from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair
 def update_policies(
     id: str,
     /,
-    payment_policy: dict = {},
-    billing_policy: dict = {},
+    payment_policy: dict | None = None,
+    billing_policy: dict | None = None,
     *,
     persistence_layer: DynamoDBPersistenceLayer,
 ):
     now_ = now()
+    payment_sk = 'metadata#payment_policy'
+    billing_sk = 'metadata#billing_policy'
 
     with persistence_layer.transact_writer() as transact:
         if payment_policy:
             transact.put(
                 item={
                     'id': id,
-                    'sk': 'metadata#payment_policy',
-                    'create_date': now_,
+                    'sk': payment_sk,
+                    'created_at': now_,
                 }
                 | payment_policy
             )
         else:
-            transact.delete(key=KeyPair(id, 'metadata#payment_policy'))
+            transact.delete(key=KeyPair(id, payment_sk))
 
         if billing_policy:
             transact.put(
                 item={
                     'id': id,
-                    'sk': 'metadata#billing_policy',
-                    'create_date': now_,
+                    'sk': billing_sk,
+                    'created_at': now_,
                 }
                 | billing_policy
             )
         else:
-            transact.delete(key=KeyPair(id, 'metadata#billing_policy'))
+            transact.delete(key=KeyPair(id, billing_sk))
 
     return True

http-api/app/rules/user.py

@@ -7,7 +7,6 @@ from aws_lambda_powertools.event_handler.exceptions import (
 )
 from layercake.dateutils import now, ttl
 from layercake.dynamodb import (
-    ComposeKey,
     DynamoDBPersistenceLayer,
     KeyPair,
     SortKey,
@@ -35,14 +34,14 @@ def update_user(
     with persistence_layer.transact_writer() as transact:
         transact.update(
             key=KeyPair(user.id, '0'),
-            update_expr='SET #name = :name, cpf = :cpf, update_date = :update_date',
+            update_expr='SET #name = :name, cpf = :cpf, updated_at = :updated_at',
             expr_attr_names={
                 '#name': 'name',
             },
             expr_attr_values={
                 ':name': user.name,
                 ':cpf': user.cpf,
-                ':update_date': now_,
+                ':updated_at': now_,
             },
             cond_expr='attribute_exists(sk)',
         )
@@ -56,7 +55,7 @@ def update_user(
             item={
                 'id': user.id,
                 'sk': 'rate_limit#user_update',
-                'create_date': now_,
+                'created_at': now_,
                 'ttl': ttl(start_dt=now_ + timedelta(hours=24)),
             },
             exc_cls=RateLimitError,
@@ -73,7 +72,7 @@ def update_user(
                     'id': 'cpf',
                     'sk': user.cpf,
                     'user_id': user.id,
-                    'create_date': now_,
+                    'created_at': now_,
                 },
                 cond_expr='attribute_not_exists(sk)',
                 exc_cls=CPFConflictError,
@@ -107,7 +106,7 @@ def add_email(
         transact.put(
             item={
                 'id': id,
-                'sk': ComposeKey(email, prefix='emails'),
+                'sk': f'emails#{email}',
                 'email_primary': False,
                 'email_verified': False,
                 'create_date': now_,
@@ -145,7 +144,7 @@ def del_email(
     with persistence_layer.transact_writer() as transact:
         transact.delete(key=KeyPair('email', email))
         transact.delete(
-            key=KeyPair(id, ComposeKey(email, prefix='emails')),
+            key=KeyPair(id, f'emails#{email}'),
             cond_expr='email_primary <> :email_primary',
             expr_attr_values={
                 ':email_primary': True,
@@ -177,7 +176,7 @@ def set_email_as_primary(
     with persistence_layer.transact_writer() as transact:
         # Set the old email as non-primary
         transact.update(
-            key=KeyPair(id, ComposeKey(old_email, prefix='emails')),
+            key=KeyPair(id, f'emails#{old_email}'),
             update_expr=expr,
             expr_attr_values={
                 ':email_primary': False,
@@ -186,7 +185,7 @@ def set_email_as_primary(
         )
         # Set the new email as primary
         transact.update(
-            key=KeyPair(id, ComposeKey(new_email, 'emails')),
+            key=KeyPair(id, f'emails#{new_email}'),
             update_expr=expr,
             expr_attr_values={
                 ':email_primary': True,
@@ -214,19 +213,22 @@ def del_org_member(
     org_id: str,
     persistence_layer: DynamoDBPersistenceLayer,
 ) -> bool:
+    now_ = now()
     with persistence_layer.transact_writer() as transact:
         # Remove the user's relationship with the organization and their privileges
-        transact.delete(key=KeyPair(id, ComposeKey(org_id, prefix='acls')))
-        transact.delete(key=KeyPair(id, ComposeKey(org_id, prefix='orgs')))
+        transact.delete(key=KeyPair(id, f'acls#{org_id}'))
+        transact.delete(key=KeyPair(id, f'orgs#{org_id}'))
         transact.update(
             key=KeyPair(id, '0'),
-            update_expr='DELETE #tenant :org_id',
-            expr_attr_names={'#tenant': 'tenant__org_id'},
-            expr_attr_values={':org_id': {org_id}},
+            update_expr='DELETE tenant_id :tenant_id SET updated_at = :updated_at',
+            expr_attr_values={
+                ':tenant_id': {org_id},
+                ':updated_at': now_,
+            },
         )
 
         # Remove the user from the organization's admins and members list
-        transact.delete(key=KeyPair(org_id, ComposeKey(id, prefix='admins')))
-        transact.delete(key=KeyPair(ComposeKey(org_id, prefix='orgmembers'), id))
+        transact.delete(key=KeyPair(org_id, f'admins#{id}'))
+        transact.delete(key=KeyPair(f'orgmembers#{org_id}', id))
 
     return True