From 0300b14c1b5fb48625dc6ec40dd70957cda5be90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Rafael=20Siqueira?= Date: Sun, 25 May 2025 12:02:28 -0300 Subject: [PATCH] add readme --- http-api/app/rules/enrollment.py | 2 +- http-api/template.yaml | 2 +- http-api/tests/seeds.jsonl | 4 ++-- http-api/uv.lock | 3 +-- order-management/README.md | 2 +- order-management/app/events/assign_tenant_cnpj.py | 2 +- order-management/template.yaml | 2 +- order-management/tests/events/test_assign_tenant.py | 2 ++ 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/http-api/app/rules/enrollment.py b/http-api/app/rules/enrollment.py index ef2b753..0a07fb6 100644 --- a/http-api/app/rules/enrollment.py +++ b/http-api/app/rules/enrollment.py @@ -71,7 +71,7 @@ def enroll( item={ 'sk': '0', 'create_date': now_, - 'tenant__org_id': tenant['id'], + 'metadata__tenant_id': tenant['id'], **enrollment.model_dump(), }, ) diff --git a/http-api/template.yaml b/http-api/template.yaml index 35840a7..a8d9dcc 100644 --- a/http-api/template.yaml +++ b/http-api/template.yaml @@ -23,7 +23,7 @@ Globals: Architectures: - x86_64 Layers: - - !Sub arn:aws:lambda:sa-east-1:336641857101:layer:layercake:59 + - !Sub arn:aws:lambda:sa-east-1:336641857101:layer:layercake:68 Environment: Variables: TZ: America/Sao_Paulo diff --git a/http-api/tests/seeds.jsonl b/http-api/tests/seeds.jsonl index d13868a..df105aa 100644 --- a/http-api/tests/seeds.jsonl +++ b/http-api/tests/seeds.jsonl @@ -9,8 +9,8 @@ {"id": {"S": "log:5OxmMjL-ujoR5IMGegQz"}, "sk": {"S": "2024-02-08T16:42:33.776409-03:00"}, "action": {"S": "OPEN_EMAIL"}} {"id": {"S": "log:5OxmMjL-ujoR5IMGegQz"}, "sk": {"S": "2019-03-25T00:00:00-03:00"}, "action": {"S": "CLICK_EMAIL"}} {"id": {"S": "cJtK9SsnJhKPyxESe7g3DG"}, "sk": {"S": "0"}, "name": {"S": "EDUSEG"}, "cnpj": {"S": "15608435000190"}, "email": {"S": "org+15608435000190@users.noreply.betaeducacao.com.br"}} -{"id": {"S": "cJtK9SsnJhKPyxESe7g3DG"}, "sk": {"S": "payment_policy"}, "due_days": {"N": "90"}} -{"id": {"S": "cJtK9SsnJhKPyxESe7g3DG"}, "sk": {"S": "billing_policy"}, "billing_day": {"N": "1"}, "payment_method": {"S": "PIX"}} +{"id": {"S": "cJtK9SsnJhKPyxESe7g3DG"}, "sk": {"S": "metadata#payment_policy"}, "due_days": {"N": "90"}} +{"id": {"S": "cJtK9SsnJhKPyxESe7g3DG"}, "sk": {"S": "metadata#billing_policy"}, "billing_day": {"N": "1"}, "payment_method": {"S": "PIX"}} {"id": {"S": "90d7f0d2-d9a4-4467-a31c-f9a7955964cf"}, "sk": {"S": "0"}, "access_period": {"N": "720"}, "create_date": {"S": "2024-12-30T00:00:33.088916-03:00"},"konviva__class_id": {"N": "266"},"name": {"S": "Reciclagem em NR-18 Básico"},"tenant__org_id": {"SS": ["cJtK9SsnJhKPyxESe7g3DG"]}} {"id": {"S": "43ea4475-c369-4f90-b576-135b7df5106b"}, "sk": {"S": "0"}, "course": {"M": {"id": {"S": "a6775b71-d68a-4263-8ab4-acb3a4f8a8b9"}, "name": {"S": "NR-18 PEMT PTA"}, "time_in_days": {"N": "365"}}}, "status": {"S": "PENDING"}} {"id": {"S": "43ea4475-c369-4f90-b576-135b7df5106b"}, "sk": {"S": "cancel_policy"}} diff --git a/http-api/uv.lock b/http-api/uv.lock index d11f135..318a57f 100644 --- a/http-api/uv.lock +++ b/http-api/uv.lock @@ -522,7 +522,7 @@ wheels = [ [[package]] name = "layercake" -version = "0.3.0" +version = "0.3.3" source = { directory = "../layercake" } dependencies = [ { name = "arnparse" }, @@ -568,7 +568,6 @@ dev = [ { name = "jsonlines", specifier = ">=4.0.0" }, { name = "pytest", specifier = ">=8.3.5" }, { name = "pytest-cov", specifier = ">=6.0.0" }, - { name = "pytest-env", specifier = ">=1.1.5" }, { name = "ruff", specifier = ">=0.11.1" }, ] diff --git a/order-management/README.md b/order-management/README.md index c5cbe54..daea4f4 100644 --- a/order-management/README.md +++ b/order-management/README.md @@ -1,6 +1,6 @@ ### Relacionamentos -Toda compra feita é relacionada com a empresa responsável, que é definida como o `tenant` do registro. Essa relação é estabelecida com base no CNPJ presente na compra. +Toda compra feita é relacionada com a empresa responsável, que é definida como o `tenant` da compra. Essa relação é estabelecida com base no CNPJ presente na compra. O gestor responsável pela ação também é relacionado à compra. diff --git a/order-management/app/events/assign_tenant_cnpj.py b/order-management/app/events/assign_tenant_cnpj.py index 91a31b7..df54ecd 100644 --- a/order-management/app/events/assign_tenant_cnpj.py +++ b/order-management/app/events/assign_tenant_cnpj.py @@ -68,7 +68,7 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool: transact.put( item={ 'id': new_image['id'], - 'sk': 'related_ids#%s' % k.removesuffix('_id'), + 'sk': 'related_ids#%s' % k.removesuffix('_id'), # e.g. related_ids#user 'create_date': now_, k: v, } diff --git a/order-management/template.yaml b/order-management/template.yaml index 6a908cb..eaa82d6 100644 --- a/order-management/template.yaml +++ b/order-management/template.yaml @@ -20,7 +20,7 @@ Globals: Architectures: - x86_64 Layers: - - !Sub arn:aws:lambda:sa-east-1:336641857101:layer:layercake:67 + - !Sub arn:aws:lambda:sa-east-1:336641857101:layer:layercake:68 Environment: Variables: TZ: America/Sao_Paulo diff --git a/order-management/tests/events/test_assign_tenant.py b/order-management/tests/events/test_assign_tenant.py index 78a91c1..c39c6a6 100644 --- a/order-management/tests/events/test_assign_tenant.py +++ b/order-management/tests/events/test_assign_tenant.py @@ -24,4 +24,6 @@ def test_assign_tenant_cnpj( result = dynamodb_persistence_layer.collect.query( PartitionKey('9omWNKymwU5U4aeun6mWzZ') ) + + print(result) assert 4 == len(result['items'])