From 923059eb9d2acf53acaedb36286e404fad48f7fa Mon Sep 17 00:00:00 2001 From: Ishmeet Bindra Date: Mon, 8 Jan 2024 20:03:51 +0530 Subject: [PATCH] updated hash key and range key fetch --- tests/test_dynamodb.py | 6 +++--- tests/test_sqlite.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/test_dynamodb.py b/tests/test_dynamodb.py index 042a6b4..daaf4ee 100644 --- a/tests/test_dynamodb.py +++ b/tests/test_dynamodb.py @@ -232,7 +232,7 @@ def complex_query_data(complex_table): yield data finally: for datum in data: - ComplexKeyModel.delete((datum[ComplexKeyModel.Config.hash_key], datum[ComplexKeyModel.Config.range_key])) + ComplexKeyModel.delete((datum[ComplexKeyModel.model_config.get("hash_key")], datum[ComplexKeyModel.model_config.get("range_key")])) @pytest.fixture(scope="module") @@ -240,7 +240,7 @@ def alias_query_data(alias_table): presets = [dict(name="Jerry"), dict(name="Hermione"), dict(), dict(), dict()] data = [datum for datum in [alias_model_data_generator(**i) for i in presets]] for datum in data: - AliasKeyModel.parse_obj(datum).save() + AliasKeyModel.model_validate(datum).save() try: yield data finally: @@ -505,7 +505,7 @@ def test_query_alias_save(dynamo): AliasKeyModel.initialize() try: for datum in data: - AliasKeyModel.parse_obj(datum).save() + AliasKeyModel.model_validate(datum).save() except Exception as e: raise pytest.fail("Failed to save Alias model!") diff --git a/tests/test_sqlite.py b/tests/test_sqlite.py index bff3f6b..303c845 100644 --- a/tests/test_sqlite.py +++ b/tests/test_sqlite.py @@ -104,13 +104,13 @@ def test_query(model_in_db): data2["id"] = 2 data3 = model_data_generator() data3["id"] = 1234 - Model.parse_obj(data1).save() - Model.parse_obj(data2).save() - Model.parse_obj(data3).save() + Model.model_validate(data1).save() + Model.model_validate(data2).save() + Model.model_validate(data3).save() for r in range(0, 10): _data = model_data_generator() _data["id"] += 3 - Model.parse_obj(_data).save() + Model.model_validate(_data).save() res = Model.query(Rule(f"id < 3")) data = {m.id: m.dict() for m in res} assert data == {1: data1, 2: data2}