diff --git a/order-events/app/events/remove_slots_if_canceled.py b/order-events/app/events/remove_slots_if_canceled.py index 527bfef..36738af 100644 --- a/order-events/app/events/remove_slots_if_canceled.py +++ b/order-events/app/events/remove_slots_if_canceled.py @@ -5,7 +5,6 @@ from aws_lambda_powertools.utilities.data_classes import ( ) from aws_lambda_powertools.utilities.typing import LambdaContext from layercake.dynamodb import ( - ComposeKey, DynamoDBPersistenceLayer, KeyPair, ) @@ -33,8 +32,8 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool: result = enrollment_layer.collection.query( KeyPair( # Post-migration: Uncomment the following line - # ComposeKey(tenant_id, prefix='slots#org'), - ComposeKey(tenant_id, prefix='vacancies'), + # f'slots#org#{tenant_id}', + f'vacancies#{tenant_id}', order_id, ) ) @@ -45,8 +44,9 @@ def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool: for pair in result['items']: batch.delete_item( Key={ - # Post-migration: Rename `vacancies` to `slots#org` - 'id': {'S': ComposeKey(pair['id'], prefix='vacancies')}, + # Post-migration: Uncomment the following line + # 'id': {'S': f'slots#org#{tenant_id}'}, + 'id': {'S': f'vacancies#{tenant_id}'}, 'sk': {'S': pair['sk']}, } ) diff --git a/order-events/template.yaml b/order-events/template.yaml index 62f0b42..398b0d0 100644 --- a/order-events/template.yaml +++ b/order-events/template.yaml @@ -71,7 +71,7 @@ Resources: EventRemoveSlotsIfCanceledFunction: Type: AWS::Serverless::Function Properties: - Handler: events.delete_slots_if_canceled.lambda_handler + Handler: events.remove_slots_if_canceled.lambda_handler LoggingConfig: LogGroup: !Ref EventLog Policies: diff --git a/order-events/tests/events/stopgap/test_patch_items.py b/order-events/tests/events/stopgap/test_patch_items.py deleted file mode 100644 index f8bce53..0000000 --- a/order-events/tests/events/stopgap/test_patch_items.py +++ /dev/null @@ -1,35 +0,0 @@ -from decimal import Decimal - -import app.events.stopgap.patch_items as app -from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair - -from ...conftest import LambdaContext - - -def test_patch_items( - dynamodb_seeds, - dynamodb_persistence_layer: DynamoDBPersistenceLayer, - lambda_context: LambdaContext, -): - event = { - 'detail': { - 'new_image': { - 'id': '9omWNKymwU5U4aeun6mWzZ', - 'items': [ - { - 'id': 'a810dd22-56c0-4d9b-8cd2-7e2ee9c45839', - 'name': 'pytest', - 'quantity': 17, - 'unit_price': Decimal('87.2'), - }, - ], - } - }, - } - assert app.lambda_handler(event, lambda_context) # type: ignore - - result = dynamodb_persistence_layer.collection.get_item( - KeyPair('9omWNKymwU5U4aeun6mWzZ', 'items') - ) - - assert result['items'][0]['id'] == 'dc1a0428-47bf-4db1-a5da-24be49c9fda6' diff --git a/order-events/tests/seeds.jsonl b/order-events/tests/seeds.jsonl index af1097c..b7f6b14 100644 --- a/order-events/tests/seeds.jsonl +++ b/order-events/tests/seeds.jsonl @@ -1,6 +1,6 @@ {"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": "9omWNKymwU5U4aeun6mWzZ"}, "sk": {"S": "0"}, "total": {"N": "398"}, "status": {"S": "PENDING"}, "payment_method": {"S": "MANUAL"}, "tenant": {"S": "cJtK9SsnJhKPyxESe7g3DG"}} +{"id": {"S": "9omWNKymwU5U4aeun6mWzZ"}, "sk": {"S": "0"}, "total": {"N": "398"}, "status": {"S": "PENDING"}, "payment_method": {"S": "MANUAL"}, "tenant_id": {"S": "cJtK9SsnJhKPyxESe7g3DG"}} {"id": {"S": "cnpj"}, "sk": {"S": "15608435000190"}, "user_id": {"S": "cJtK9SsnJhKPyxESe7g3DG"}} {"id": {"S": "email"}, "sk": {"S": "sergio@somosbeta.com.br"}, "user_id": {"S": "5OxmMjL-ujoR5IMGegQz"}} {"id": {"S": "5OxmMjL-ujoR5IMGegQz"}, "sk": {"S": "0"}, "name": {"S": "Sérgio R Siqueira"}} diff --git a/order-events/uv.lock b/order-events/uv.lock index 7a12739..0ca8636 100644 --- a/order-events/uv.lock +++ b/order-events/uv.lock @@ -331,6 +331,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/0f/e7/aa315e6a749d9b96c2504a1ba0ba031ba2d0517e972ce22682e3fccecb09/cssselect2-0.8.0-py3-none-any.whl", hash = "sha256:46fc70ebc41ced7a32cd42d58b1884d72ade23d21e5a4eaaf022401c13f0e76e", size = 15454, upload-time = "2025-03-05T14:46:06.463Z" }, ] +[[package]] +name = "dictdiffer" +version = "0.9.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/61/7b/35cbccb7effc5d7e40f4c55e2b79399e1853041997fcda15c9ff160abba0/dictdiffer-0.9.0.tar.gz", hash = "sha256:17bacf5fbfe613ccf1b6d512bd766e6b21fb798822a133aa86098b8ac9997578", size = 31513, upload-time = "2021-07-22T13:24:29.276Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/47/ef/4cb333825d10317a36a1154341ba37e6e9c087bac99c1990ef07ffdb376f/dictdiffer-0.9.0-py2.py3-none-any.whl", hash = "sha256:442bfc693cfcadaf46674575d2eba1c53b42f5e404218ca2c2ff549f2df56595", size = 16754, upload-time = "2021-07-22T13:24:26.783Z" }, +] + [[package]] name = "dnspython" version = "2.7.0" @@ -340,48 +349,6 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/68/1b/e0a87d256e40e8c888847551b20a017a6b98139178505dc7ffb96f04e954/dnspython-2.7.0-py3-none-any.whl", hash = "sha256:b4c34b7d10b51bcc3a5071e7b8dee77939f1e878477eeecc965e9835f63c6c86", size = 313632, upload-time = "2024-10-05T20:14:57.687Z" }, ] -[[package]] -name = "elastic-transport" -version = "8.17.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "certifi" }, - { name = "urllib3" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/6a/54/d498a766ac8fa475f931da85a154666cc81a70f8eb4a780bc8e4e934e9ac/elastic_transport-8.17.1.tar.gz", hash = "sha256:5edef32ac864dca8e2f0a613ef63491ee8d6b8cfb52881fa7313ba9290cac6d2", size = 73425, upload-time = "2025-03-13T07:28:30.776Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/cf/cd/b71d5bc74cde7fc6fd9b2ff9389890f45d9762cbbbf81dc5e51fd7588c4a/elastic_transport-8.17.1-py3-none-any.whl", hash = "sha256:192718f498f1d10c5e9aa8b9cf32aed405e469a7f0e9d6a8923431dbb2c59fb8", size = 64969, upload-time = "2025-03-13T07:28:29.031Z" }, -] - -[[package]] -name = "elasticsearch" -version = "8.18.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "elastic-transport" }, - { name = "python-dateutil" }, - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/2a/e4/40fc0e8d9a646889ac3f865cd35e41835f3cf888c716c7aae82248e022f0/elasticsearch-8.18.1.tar.gz", hash = "sha256:998035f17a8c1fba7ae26b183dca797dcf95db86da6a7ecba56d31afc40f07c7", size = 750746, upload-time = "2025-04-29T09:32:16.361Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/33/62/f62e8a5c7c6f7b27481c9ffc248fb32078ad88878aa4f3731a83a14cc797/elasticsearch-8.18.1-py3-none-any.whl", hash = "sha256:1a8c8b5ec3ce5be88f96d2f898375671648e96272978bce0dee3137d9326aabb", size = 906320, upload-time = "2025-04-29T09:32:12.527Z" }, -] - -[[package]] -name = "elasticsearch-dsl" -version = "8.18.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "elastic-transport" }, - { name = "elasticsearch" }, - { name = "python-dateutil" }, - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/72/6d/00cbeee412a2dc825f0df18c98463a2e0b423b86800fba6c50ea2c627962/elasticsearch_dsl-8.18.0.tar.gz", hash = "sha256:763465dba9eae166add10567e924c65730aa122819b08bfe9a077e91b13b30d1", size = 31886, upload-time = "2025-04-16T11:54:14.412Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/77/a9/b200790a22585aeb023d88bd8b9fb222820e2976ce4239d401670116ae3c/elasticsearch_dsl-8.18.0-py3-none-any.whl", hash = "sha256:0522c5bb20c7abae69855109e650bf1166d486cbf706b5e1b29c28936a9102a3", size = 10406, upload-time = "2025-04-16T11:54:12.677Z" }, -] - [[package]] name = "email-validator" version = "2.2.0" @@ -531,13 +498,12 @@ wheels = [ [[package]] name = "layercake" -version = "0.6.12" +version = "0.7.2" source = { directory = "../layercake" } dependencies = [ { name = "arnparse" }, { name = "aws-lambda-powertools", extra = ["all"] }, - { name = "elasticsearch" }, - { name = "elasticsearch-dsl" }, + { name = "dictdiffer" }, { name = "ftfy" }, { name = "glom" }, { name = "jinja2" }, @@ -551,6 +517,7 @@ dependencies = [ { name = "requests" }, { name = "smart-open", extra = ["s3"] }, { name = "sqlite-utils" }, + { name = "unidecode" }, { name = "weasyprint" }, ] @@ -558,8 +525,7 @@ dependencies = [ requires-dist = [ { name = "arnparse", specifier = ">=0.0.2" }, { name = "aws-lambda-powertools", extras = ["all"], specifier = ">=3.8.0" }, - { name = "elasticsearch", specifier = ">=8.17.2" }, - { name = "elasticsearch-dsl", specifier = ">=8.17.1" }, + { name = "dictdiffer", specifier = ">=0.9.0" }, { name = "ftfy", specifier = ">=6.3.1" }, { name = "glom", specifier = ">=24.11.0" }, { name = "jinja2", specifier = ">=3.1.6" }, @@ -573,6 +539,7 @@ requires-dist = [ { name = "requests", specifier = ">=2.32.3" }, { name = "smart-open", extras = ["s3"], specifier = ">=7.1.0" }, { name = "sqlite-utils", specifier = ">=3.38" }, + { name = "unidecode", specifier = ">=1.4.0" }, { name = "weasyprint", specifier = ">=65.0" }, ] @@ -1073,6 +1040,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/17/69/cd203477f944c353c31bade965f880aa1061fd6bf05ded0726ca845b6ff7/typing_inspection-0.4.1-py3-none-any.whl", hash = "sha256:389055682238f53b04f7badcb49b989835495a96700ced5dab2d8feae4b26f51", size = 14552, upload-time = "2025-05-21T18:55:22.152Z" }, ] +[[package]] +name = "unidecode" +version = "1.4.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/94/7d/a8a765761bbc0c836e397a2e48d498305a865b70a8600fd7a942e85dcf63/Unidecode-1.4.0.tar.gz", hash = "sha256:ce35985008338b676573023acc382d62c264f307c8f7963733405add37ea2b23", size = 200149, upload-time = "2025-04-24T08:45:03.798Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/8f/b7/559f59d57d18b44c6d1250d2eeaa676e028b9c527431f5d0736478a73ba1/Unidecode-1.4.0-py3-none-any.whl", hash = "sha256:c3c7606c27503ad8d501270406e345ddb480a7b5f38827eafe4fa82a137f0021", size = 235837, upload-time = "2025-04-24T08:45:01.609Z" }, +] + [[package]] name = "urllib3" version = "2.4.0"