sergio/saladeaula.digital
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update address

Browse Source
This commit is contained in:
Sérgio Rafael Siqueira
2025-07-15 16:00:41 -03:00
parent fcbfc3b97d
commit 5c80502715
12 changed files with 426 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
http-api/app/app.py
View File

@@ -63,6 +63,7 @@ app.include_router(users.logs, prefix='/users')
app.include_router(users.emails, prefix='/users')
app.include_router(users.orgs, prefix='/users')
app.include_router(orgs.policies, prefix='/orgs')
app.include_router(orgs.address, prefix='/orgs')
app.include_router(webhooks.router, prefix='/webhooks')
app.include_router(settings.router, prefix='/settings')
app.include_router(lookup.router, prefix='/lookup')

2
http-api/app/middlewares/audit_log_middleware.py
View File

@@ -83,7 +83,7 @@ class AuditLogMiddleware(BaseMiddlewareHandler):
self.collection.put_item(
key=KeyPair(
# Post-migration: remove `delimiter` and update prefix
# from `log` to `logs` in ComposeKey.
# from `log` to `logs#user` in ComposeKey.
pk=ComposeKey(user.id, prefix='log', delimiter=':'),
sk=now_.isoformat(),
),

3
http-api/app/routes/orgs/__init__.py
View File

@@ -1,3 +1,4 @@
from .address import router as address
from .policies import router as policies
__all__ = ['policies']
__all__ = ['policies', 'address']

51
http-api/app/routes/orgs/address.py Normal file
View File

@@ -0,0 +1,51 @@
from http import HTTPStatus
from aws_lambda_powertools.event_handler.api_gateway import Router
from layercake.dynamodb import (
DynamoDBPersistenceLayer,
KeyPair,
)
from pydantic import BaseModel
from api_gateway import JSONResponse
from boto3clients import dynamodb_client
from config import USER_TABLE
router = Router()
org_layer = DynamoDBPersistenceLayer(USER_TABLE, dynamodb_client)
@router.get(
'/<id>/address',
compress=True,
tags=['Organization'],
summary='Get organization address',
)
def get_address(id: str):
return org_layer.collection.get_item(
KeyPair(id, 'metadata#address'),
)
class Address(BaseModel):
postcode: str
address1: str
address2: str | None = None
neighborhood: str
city: str
state: str
@router.post('/<id>/address', compress=True, tags=['Organization'])
def post_address(id: str, payload: Address):
address = payload.model_dump()
org_layer.collection.put_item(
key=KeyPair(id, 'metadata#address'),
cond_expr='attribute_exists(sk)',
**address,
)
return JSONResponse(
body=payload,
status_code=HTTPStatus.OK,
)

16
http-api/app/routes/orgs/policies.py
View File

@@ -1,26 +1,21 @@
from http import HTTPStatus
from typing import Literal
from aws_lambda_powertools.event_handler import Response, content_types
from aws_lambda_powertools.event_handler.api_gateway import Router
from aws_lambda_powertools.event_handler.exceptions import (
BadRequestError,
)
from layercake.dynamodb import (
DynamoDBCollection,
DynamoDBPersistenceLayer,
SortKey,
TransactKey,
)
from pydantic.main import BaseModel
from pydantic import BaseModel
from api_gateway import JSONResponse
from boto3clients import dynamodb_client
from config import USER_TABLE
from rules.org import update_policies
router = Router()
org_layer = DynamoDBPersistenceLayer(USER_TABLE, dynamodb_client)
org_collect = DynamoDBCollection(org_layer, exc_cls=BadRequestError)
@router.get(
@@ -30,7 +25,7 @@ org_collect = DynamoDBCollection(org_layer, exc_cls=BadRequestError)
summary='Get organization policies',
)
def get_policies(id: str):
return org_collect.get_items(
return org_layer.collection.get_items(
TransactKey(id)
+ SortKey('metadata#billing_policy', remove_prefix='metadata#')
+ SortKey('metadata#payment_policy', remove_prefix='metadata#'),
@@ -40,7 +35,7 @@ def get_policies(id: str):
class BillingPolicy(BaseModel):
billing_day: int
payment_method: Literal['PIX', 'BANK_SLIP', 'MANUAL']
payment_method: Literal['BANK_SLIP', 'MANUAL']
class PaymentPolicy(BaseModel):
@@ -64,8 +59,7 @@ def put_policies(id: str, payload: Policies):
persistence_layer=org_layer,
)
return Response(
return JSONResponse(
body=payload,
content_type=content_types.APPLICATION_JSON,
status_code=HTTPStatus.OK,
)

17
http-api/app/routes/users/emails.py
View File

@@ -35,9 +35,11 @@ user_collect = DynamoDBCollection(user_layer, exc_cls=BadRequestError)
summary='Get user emails',
)
def get_emails(id: str):
start_key = router.current_event.get_query_string_value('start_key', None)
return user_collect.query(
KeyPair(id, PrefixKey('emails')),
start_key=router.current_event.get_query_string_value('start_key', None),
start_key=start_key,
)
@@ -54,6 +56,7 @@ class Email(BaseModel):
)
def post_email(id: str, payload: Email):
add_email(id, payload.email, persistence_layer=user_layer)
return JSONResponse(
body=payload,
status_code=HTTPStatus.CREATED,
@@ -90,7 +93,11 @@ def patch_email(id: str, payload: EmailAsPrimary):
email_verified=payload.email_verified,
persistence_layer=user_layer,
)
return JSONResponse(body=payload, status_code=HTTPStatus.OK)
return JSONResponse(
body=payload,
status_code=HTTPStatus.OK,
)
@router.delete(
@@ -101,5 +108,9 @@ def patch_email(id: str, payload: EmailAsPrimary):
middlewares=[AuditLogMiddleware('EMAIL_DEL', user_collect, ('email',))],
)
def delete_email(id: str, payload: Email):
del_email(id, payload.email, persistence_layer=user_layer)
del_email(
id,
payload.email,
persistence_layer=user_layer,
)
return payload

18
http-api/app/rules/org.py
View File

@@ -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

34
http-api/app/rules/user.py
View File

@@ -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