Merges pull request #7 v3.7.1

Product Manager cached db filed + filters, orders, pagination

3 files changed, 11 insertions, 17 deletions

diff --git a/tests/managers/thl/test_product.py b/tests/managers/thl/test_product.py
index 8d72fa5..ebbb8d6 100644
--- a/tests/managers/thl/test_product.py
+++ b/tests/managers/thl/test_product.py
@@ -86,8 +86,8 @@ class TestProductManagerGetMethods:
         instance = product_manager.get_by_uuid_if_exists(product_uuid=product.id)
         assert isinstance(instance, Product)
 
-        instance = product_manager.get_by_uuid_if_exists(product_uuid="abc123")
-        assert instance == None
+        instance = product_manager.get_by_uuid_if_exists(product_uuid=uuid4().hex)
+        assert instance is None
 
     def test_get_by_uuids_if_exists(
         self, product_factory: Callable[..., Product], product_manager: ProductManager
@@ -128,7 +128,8 @@ class TestProductManagerGetMethods:
     ):
         business_ids = [uuid4().hex for _ in range(5)]
 
-        product_manager.fetch_uuids(business_uuids=business_ids)
+        res = product_manager.filter_paginated(business_uuids=business_ids)
+        assert len(res) == 0
 
         for business_id in business_ids:
             product_factory(
@@ -139,10 +140,11 @@ class TestProductManagerGetMethods:
                 name=f"Test Product ID #{uuid4().hex[:6]}",
                 user_create_config=None,
             )
+        res = product_manager.filter_paginated(business_uuids=business_ids)
+        assert len(res) == len(business_ids)
 
 
 class TestProductManagerCreation:
-
     def test_base(
         self, product_factory: Callable[..., Product], product_manager: ProductManager
     ):
@@ -156,7 +158,6 @@ class TestProductManagerCreation:
 
 
 class TestProductManagerCreate:
-
     def test_create_simple(self, product_manager: ProductManager):
         # Always required: product_id, team_id, name, redirect_url
         # Required internally - if not passed use default: harmonizer_domain,
@@ -354,7 +355,6 @@ class TestProductManager:
 
 
 class TestProductManagerUpdate:
-
     def test_update(
         self, product_factory: Callable[..., Product], product_manager: ProductManager
     ):
@@ -377,7 +377,6 @@ class TestProductManagerUpdate:
 
 
 class TestProductManagerCacheClear:
-
     def test_cache_clear(
         self, product_factory: Callable[..., Product], product_manager: ProductManager
     ):
diff --git a/tests/managers/thl/test_product_prod.py b/tests/managers/thl/test_product_prod.py
index d584527..ed13718 100644
--- a/tests/managers/thl/test_product_prod.py
+++ b/tests/managers/thl/test_product_prod.py
@@ -51,7 +51,7 @@ class TestProductManagerGetMethods:
             product_manager.get_by_uuids(
                 product_uuids=[p.id for p in products] + ["abc123"]
             )
-        assert "invalid uuid passed" in str(cm.value)
+        assert "invalid uuid" in str(cm.value)
 
     def test_get_by_uuid_if_exists(
         self, product_factory: Callable[..., Product], product_manager: ProductManager
@@ -61,7 +61,7 @@ class TestProductManagerGetMethods:
         instance = product_manager.get_by_uuid_if_exists(product_uuid=products[0].id)
         assert isinstance(instance, Product)
 
-        instance = product_manager.get_by_uuid_if_exists(product_uuid="abc123")
+        instance = product_manager.get_by_uuid_if_exists(product_uuid=uuid4().hex)
         assert instance is None
 
     def test_get_by_uuids_if_exists(
diff --git a/tests/models/thl/test_product.py b/tests/models/thl/test_product.py
index ce3242e..f8f3da3 100644
--- a/tests/models/thl/test_product.py
+++ b/tests/models/thl/test_product.py
@@ -873,8 +873,7 @@ class TestProductFinancials:
 
         body, content_type = p1.balance.to_prometheus()
 
-        p1.prebuild_private_balance(thl_lm=thl_ledger_manager, pop_ledger_df=df)
-        assert p1.private_balance.commission == 5 * 2
+        assert p1.balance.commission == 5 * 2
 
         p1.prebuild_user_wallet_balances(pop_ledger_df=df)
         assert p1.user_wallet_balance.outstanding_liability == 38 * 2
@@ -952,15 +951,11 @@ class TestProductFinancials:
 
         p1.prebuild_balance(thl_lm=thl_ledger_manager, pop_ledger_df=df)
         assert p1.balance.payout == 95
-
-        p1.prebuild_private_balance(thl_lm=thl_ledger_manager, pop_ledger_df=df)
-        assert p1.private_balance.commission == 5
+        assert p1.balance.commission == 5
 
         p2.prebuild_balance(thl_lm=thl_ledger_manager, pop_ledger_df=df)
         assert p2.balance.payout == 57
-
-        p2.prebuild_private_balance(thl_lm=thl_ledger_manager, pop_ledger_df=df)
-        assert p2.private_balance.commission == 5
+        assert p2.balance.commission == 5
 
         p2.prebuild_user_wallet_balances(pop_ledger_df=df)
         assert p2.user_wallet_balance.outstanding_liability == 38