From d893114e3885ea1fff6589ff62edb9603b2382df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Rafael=20Siqueira?= Date: Wed, 14 Jan 2026 17:49:58 -0300 Subject: [PATCH] add validation to data --- konviva-events/app/app.py | 26 +++++----- konviva-events/app/enrollment.py | 9 ---- konviva-events/tests/seeds.jsonl | 2 +- konviva-events/tests/test_app.py | 26 ++++++---- konviva-events/uv.lock | 88 +++++++++++++++++++++++++++++++- 5 files changed, 118 insertions(+), 33 deletions(-) diff --git a/konviva-events/app/app.py b/konviva-events/app/app.py index 20562ae..8a2ac6c 100644 --- a/konviva-events/app/app.py +++ b/konviva-events/app/app.py @@ -1,12 +1,13 @@ from decimal import Decimal from http import HTTPStatus -from typing import Any +from typing import Annotated, Any from aws_lambda_powertools import Logger, Tracer from aws_lambda_powertools.event_handler.api_gateway import ( APIGatewayHttpResolver, Response, ) +from aws_lambda_powertools.event_handler.openapi.params import Body from aws_lambda_powertools.logging import correlation_paths from aws_lambda_powertools.utilities.typing import LambdaContext from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair, SortKey @@ -23,28 +24,27 @@ dyn = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client) @app.post('/') @tracer.capture_method -def postback(): - json_body = app.current_event.json_body - - event_name = json_body['event_name'] - score = round(Decimal(json_body['APROVEITAMENTO']), 2) - progress = round(Decimal(json_body['ANDAMENTO']), 2) +def postback( + status: Annotated[str, Body(embed=True)], + konviva_id: Annotated[str, Body(alias='ID_MATRICULA', embed=True)], + score: Annotated[Decimal, Body(alias='APROVEITAMENTO', embed=True)], + progress: Annotated[Decimal, Body(alias='ANDAMENTO', embed=True)], +): + score = score.quantize(Decimal('0.00')) + progress = progress.quantize(Decimal('0.00')) enrollment_id = dyn.collection.get_item( KeyPair( # Post-migration: uncomment the following line # pk='KONVIVA', pk='konviva', - sk=SortKey( - json_body['ID_MATRICULA'], - path_spec='enrollment_id', - ), + sk=SortKey(konviva_id, path_spec='enrollment_id'), ), exc_cls=EnrollmentNotFoundError, ) # Make sure webhooks send the correct event names - match event_name: - case 'UPDATING': + match status: + case 'IN_PROGRESS': update_progress( enrollment_id, progress, diff --git a/konviva-events/app/enrollment.py b/konviva-events/app/enrollment.py index f8f4511..b3e1ed7 100644 --- a/konviva-events/app/enrollment.py +++ b/konviva-events/app/enrollment.py @@ -199,7 +199,6 @@ def _set_status_as_completed( start_dt=now_, days=cert_exp_interval - dedup_window_offset_days, ) - transact.put( item={ 'id': id, @@ -309,14 +308,6 @@ def _set_status_as_failed( }, exc_cls=EnrollmentConflictError, ) - transact.put( - item={ - 'id': id, - 'sk': 'FAILED', - 'created_at': now_, - }, - cond_expr='attribute_not_exists(sk)', - ) # Remove reminders and events that no longer apply transact.delete( key=KeyPair( diff --git a/konviva-events/tests/seeds.jsonl b/konviva-events/tests/seeds.jsonl index d16aa95..e56b4eb 100644 --- a/konviva-events/tests/seeds.jsonl +++ b/konviva-events/tests/seeds.jsonl @@ -17,7 +17,7 @@ {"id": "6c7e3d9b-f5d1-4da4-9e55-0825bb6ff2b8", "sk": "0", "progress": 80, "status": "IN_PROGRESS", "user": {"id": "123", "name": "Myles Kennedy"}, "course": {"id": "432", "name": "pytest"}, "created_at": "2022-04-06T11:07:32.762178-03:00"} {"id": "6c7e3d9b-f5d1-4da4-9e55-0825bb6ff2b8", "sk": "METADATA#DEDUPLICATION_WINDOW", "offset_days": 90, "created_at": "2025-04-06T11:07:32.762178-03:00"} {"id": "6c7e3d9b-f5d1-4da4-9e55-0825bb6ff2b8", "sk": "SCHEDULE#REMINDER_ACCESS_PERIOD_BEFORE_30_DAYS"} -{"id": "6c7e3d9b-f5d1-4da4-9e55-0825bb6ff2b8", "sk": "SCHEDULE#SET_ACCESS_EXPIRED"} +//{"id": "6c7e3d9b-f5d1-4da4-9e55-0825bb6ff2b8", "sk": "SCHEDULE#SET_ACCESS_EXPIRED"} {"id": "cc2c3bce-c34a-4e82-aa6c-1a19e70ec5ae", "sk": "0", "progress": 109, "status": "COMPLETED", "user": {"id": "321", "name": "Chester Bennington"}, "course": {"id": "432", "name": "pytest"}, "created_at": "2022-04-06T11:07:32.762178-03:00"} {"id": "cc2c3bce-c34a-4e82-aa6c-1a19e70ec5ae", "sk": "SCHEDULE#SET_AS_ARCHIVED"} diff --git a/konviva-events/tests/test_app.py b/konviva-events/tests/test_app.py index a7d127b..4e43027 100644 --- a/konviva-events/tests/test_app.py +++ b/konviva-events/tests/test_app.py @@ -1,7 +1,13 @@ from http import HTTPMethod, HTTPStatus from layercake.dateutils import now -from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair, PartitionKey +from layercake.dynamodb import ( + DynamoDBPersistenceLayer, + KeyPair, + PartitionKey, + SortKey, + TransactKey, +) from .conftest import HttpApiProxy, LambdaContext @@ -22,7 +28,7 @@ def test_start_progress( 'ID_MATRICULA': '123', 'APROVEITAMENTO': '23.152173913043477', 'ANDAMENTO': '38.888888888888886', - 'event_name': 'UPDATING', + 'status': 'IN_PROGRESS', }, ), lambda_context, @@ -58,7 +64,7 @@ def test_update_progress( 'ID_MATRICULA': '456', 'APROVEITAMENTO': '23.152173913043477', 'ANDAMENTO': '12.888888888888886', - 'event_name': 'UPDATING', + 'status': 'IN_PROGRESS', }, ), lambda_context, @@ -99,7 +105,7 @@ def test_set_as_completed( 'ID_MATRICULA': '567', 'APROVEITAMENTO': '89.152173913043477', 'ANDAMENTO': '100', - 'event_name': 'COMPLETED', + 'status': 'COMPLETED', }, ), lambda_context, @@ -119,7 +125,6 @@ def test_set_as_completed( item.get('sk') == 'SCHEDULE#REMINDER_CERT_EXPIRATION_BEFORE_30_DAYS' for item in r['items'] ) - assert any(item.get('sk') == 'SCHEDULE#SET_CERT_EXPIRED' for item in r['items']) r = dynamodb_persistence_layer.collection.query(PartitionKey('LOCK')) assert len(r['items']) == 1 @@ -148,7 +153,7 @@ def test_set_as_failed( 'ID_MATRICULA': '567', 'APROVEITAMENTO': '12.152173913043477', 'ANDAMENTO': '100', - 'event_name': 'COMPLETED', + 'status': 'COMPLETED', }, ), lambda_context, @@ -156,7 +161,10 @@ def test_set_as_failed( assert r['statusCode'] == HTTPStatus.NO_CONTENT # Check `seeds.jsonl` for sample data related to this query - r = dynamodb_persistence_layer.collection.query( - PartitionKey('6c7e3d9b-f5d1-4da4-9e55-0825bb6ff2b8') + r = dynamodb_persistence_layer.collection.get_items( + TransactKey('6c7e3d9b-f5d1-4da4-9e55-0825bb6ff2b8') + + SortKey('0') + + SortKey('METADATA#DEDUPLICATION_WINDOW', rename_key='dedup_window') ) - assert any(item.get('sk') == 'FAILED' for item in r['items']) + assert 'failed_at' in r + assert 'dedup_window' in r diff --git a/konviva-events/uv.lock b/konviva-events/uv.lock index 65a2810..1afe33f 100644 --- a/konviva-events/uv.lock +++ b/konviva-events/uv.lock @@ -11,6 +11,18 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/78/b6/6307fbef88d9b5ee7421e68d78a9f162e0da4900bc5f5793f6d3d0e34fb8/annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53", size = 13643, upload-time = "2024-05-20T21:33:24.1Z" }, ] +[[package]] +name = "anyio" +version = "4.12.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "idna" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/96/f0/5eb65b2bb0d09ac6776f2eb54adee6abe8228ea05b20a5ad0e4945de8aac/anyio-4.12.1.tar.gz", hash = "sha256:41cfcc3a4c85d3f05c932da7c26d0201ac36f72abd4435ba90d0464a3ffed703", size = 228685, upload-time = "2026-01-06T11:45:21.246Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/38/0e/27be9fdef66e72d64c0cdc3cc2823101b80585f8119b5c112c2e8f5f7dab/anyio-4.12.1-py3-none-any.whl", hash = "sha256:d405828884fc140aa80a3c667b8beed277f1dfedec42ba031bd6ac3db606ab6c", size = 113592, upload-time = "2026-01-06T11:45:19.497Z" }, +] + [[package]] name = "arnparse" version = "0.0.2" @@ -250,6 +262,23 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/2c/1a/aff8bb287a4b1400f69e09a53bd65de96aa5cee5691925b38731c67fc695/click_default_group-1.2.4-py2.py3-none-any.whl", hash = "sha256:9b60486923720e7fc61731bdb32b617039aba820e22e1c88766b1125592eaa5f", size = 4123, upload-time = "2023-08-04T07:54:56.875Z" }, ] +[[package]] +name = "cloudflare" +version = "4.3.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, + { name = "distro" }, + { name = "httpx" }, + { name = "pydantic" }, + { name = "sniffio" }, + { name = "typing-extensions" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/5d/48/e481c0a9b9010a5c41b5ca78ff9fbe00dc8a9a4d39da5af610a4ec49c7f7/cloudflare-4.3.1.tar.gz", hash = "sha256:b1e1c6beeb8d98f63bfe0a1cba874fc4e22e000bcc490544f956c689b3b5b258", size = 1933187, upload-time = "2025-06-16T21:43:18.716Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/3a/8f/c6c543565efd3144da4304efa5917aac06b6416a8663a6defe0e9b2b7569/cloudflare-4.3.1-py3-none-any.whl", hash = "sha256:6927135a5ee5633d6e2e1952ca0484745e933727aeeb189996d2ad9d292071c6", size = 4406465, upload-time = "2025-06-16T21:43:17.3Z" }, +] + [[package]] name = "colorama" version = "0.4.6" @@ -334,6 +363,15 @@ 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 = "distro" +version = "1.9.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/fc/f8/98eea607f65de6527f8a2e8885fc8015d3e6f5775df186e443e0964a11c3/distro-1.9.0.tar.gz", hash = "sha256:2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed", size = 60722, upload-time = "2023-12-24T09:54:32.31Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/12/b3/231ffd4ab1fc9d679809f356cebee130ac7daa00d6d6f3206dd4fd137e9e/distro-1.9.0-py3-none-any.whl", hash = "sha256:7bffd925d65168f85027d8da9af6bddab658135b840670a223589bc0c8ef02b2", size = 20277, upload-time = "2023-12-24T09:54:30.421Z" }, +] + [[package]] name = "dnspython" version = "2.7.0" @@ -403,6 +441,43 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/9c/a2/75fd80784ec33da8d39cf885e8811a4fbc045a90db5e336b8e345e66dbb2/glom-24.11.0-py3-none-any.whl", hash = "sha256:991db7fcb4bfa9687010aa519b7b541bbe21111e70e58fdd2d7e34bbaa2c1fbd", size = 102690, upload-time = "2024-11-02T23:17:46.468Z" }, ] +[[package]] +name = "h11" +version = "0.16.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/01/ee/02a2c011bdab74c6fb3c75474d40b3052059d95df7e73351460c8588d963/h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1", size = 101250, upload-time = "2025-04-24T03:35:25.427Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86", size = 37515, upload-time = "2025-04-24T03:35:24.344Z" }, +] + +[[package]] +name = "httpcore" +version = "1.0.9" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "certifi" }, + { name = "h11" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/06/94/82699a10bca87a5556c9c59b5963f2d039dbd239f25bc2a63907a05a14cb/httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8", size = 85484, upload-time = "2025-04-24T22:06:22.219Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/7e/f5/f66802a942d491edb555dd61e3a9961140fd64c90bce1eafd741609d334d/httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55", size = 78784, upload-time = "2025-04-24T22:06:20.566Z" }, +] + +[[package]] +name = "httpx" +version = "0.28.1" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "anyio" }, + { name = "certifi" }, + { name = "httpcore" }, + { name = "idna" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956/httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc", size = 141406, upload-time = "2024-12-06T15:37:23.222Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" }, +] + [[package]] name = "idna" version = "3.10" @@ -497,12 +572,13 @@ dev = [ [[package]] name = "layercake" -version = "0.11.2" +version = "0.12.0" source = { directory = "../layercake" } dependencies = [ { name = "arnparse" }, { name = "authlib" }, { name = "aws-lambda-powertools", extra = ["all"] }, + { name = "cloudflare" }, { name = "dictdiffer" }, { name = "ftfy" }, { name = "glom" }, @@ -528,6 +604,7 @@ requires-dist = [ { name = "arnparse", specifier = ">=0.0.2" }, { name = "authlib", specifier = ">=1.6.5" }, { name = "aws-lambda-powertools", extras = ["all"], specifier = ">=3.23.0" }, + { name = "cloudflare", specifier = ">=4.3.1" }, { name = "dictdiffer", specifier = ">=0.9.0" }, { name = "ftfy", specifier = ">=6.3.1" }, { name = "glom", specifier = ">=24.11.0" }, @@ -986,6 +1063,15 @@ s3 = [ { name = "boto3" }, ] +[[package]] +name = "sniffio" +version = "1.3.1" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a2/87/a6771e1546d97e7e041b6ae58d80074f81b7d5121207425c964ddf5cfdbd/sniffio-1.3.1.tar.gz", hash = "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc", size = 20372, upload-time = "2024-02-25T23:20:04.057Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e9/44/75a9c9421471a6c4805dbf2356f7c181a29c1879239abab1ea2cc8f38b40/sniffio-1.3.1-py3-none-any.whl", hash = "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2", size = 10235, upload-time = "2024-02-25T23:20:01.196Z" }, +] + [[package]] name = "sqlite-fts4" version = "1.0.3"