Improve interface

Author: emyller

api/organisations/subscription_info_cache.py

@@ -16,7 +16,7 @@
 ]
 
 
-def update_caches(update_cache_entities: typing.Tuple[SubscriptionCacheEntity, ...]):  # type: ignore[no-untyped-def]
+def update_caches(*update_cache_entities: SubscriptionCacheEntity) -> None:
     """
     Update the cache objects for an update_cache_entity in the database.
     """

api/organisations/tasks.py

@@ -89,13 +89,13 @@ def update_organisation_subscription_information_cache_recurring() -> None:
 
 @register_task_handler()
 def update_organisation_subscription_information_api_usage_cache() -> None:
-    subscription_info_cache.update_caches((SubscriptionCacheEntity.API_USAGE,))
+    subscription_info_cache.update_caches(SubscriptionCacheEntity.API_USAGE)
 
 
 @register_task_handler(timeout=timedelta(minutes=5))
 def update_organisation_subscription_information_cache() -> None:
     subscription_info_cache.update_caches(
-        (SubscriptionCacheEntity.CHARGEBEE, SubscriptionCacheEntity.API_USAGE)
+        SubscriptionCacheEntity.CHARGEBEE, SubscriptionCacheEntity.API_USAGE
     )
 
 

api/tests/unit/organisations/test_unit_organisations_subscription_info_cache.py

@@ -48,11 +48,7 @@ def test_update_caches__with_usage_data__populates_cache_correctly(  # type: ign
     mocked_get_subscription_metadata.return_value = chargebee_metadata
 
     # When
-    subscription_cache_entities = (
-        SubscriptionCacheEntity.API_USAGE,
-        SubscriptionCacheEntity.CHARGEBEE,
-    )
-    update_caches(subscription_cache_entities)
+    update_caches(SubscriptionCacheEntity.API_USAGE, SubscriptionCacheEntity.CHARGEBEE)
 
     # Then
     assert (
@@ -118,11 +114,7 @@ def test_update_caches__no_usage_data__resets_cache_to_zero(
     mocked_get_subscription_metadata.return_value = chargebee_metadata
 
     # When
-    subscription_cache_entities = (
-        SubscriptionCacheEntity.API_USAGE,
-        SubscriptionCacheEntity.CHARGEBEE,
-    )
-    update_caches(subscription_cache_entities)
+    update_caches(SubscriptionCacheEntity.API_USAGE, SubscriptionCacheEntity.CHARGEBEE)
 
     # Then
     organisation.refresh_from_db()
@@ -159,7 +151,7 @@ def test_update_caches__postgres_analytics__populates_cache_correctly(
     )
 
     # When
-    update_caches((SubscriptionCacheEntity.API_USAGE,))
+    update_caches(SubscriptionCacheEntity.API_USAGE)
 
     # Then
     organisation.refresh_from_db()
@@ -197,7 +189,7 @@ def test_update_caches__postgres_and_influx_configured__prefers_postgres(
     )
 
     # When
-    update_caches((SubscriptionCacheEntity.API_USAGE,))
+    update_caches(SubscriptionCacheEntity.API_USAGE)
 
     # Then
     assert mocked_get_top_organisations_from_local_db.call_count == 3
@@ -228,7 +220,7 @@ def test_update_caches__no_analytics_source_configured__skips_api_usage_update(
     )
 
     # When
-    update_caches((SubscriptionCacheEntity.API_USAGE,))
+    update_caches(SubscriptionCacheEntity.API_USAGE)
 
     # Then — neither analytics source was queried
     assert mock_get_top_organisations_from_local_db.call_count == 0

api/tests/unit/organisations/test_unit_organisations_tasks.py

@@ -2182,7 +2182,7 @@ def test_update_organisation_subscription_information_api_usage_cache__called__c
 
     # Then
     assert mock_update_caches.call_args_list == [
-        mocker.call((SubscriptionCacheEntity.API_USAGE,))
+        mocker.call(SubscriptionCacheEntity.API_USAGE)
     ]
 
 
@@ -2200,6 +2200,6 @@ def test_update_organisation_subscription_information_cache__called__calls_updat
     # Then
     assert mock_update_caches.call_args_list == [
         mocker.call(
-            (SubscriptionCacheEntity.CHARGEBEE, SubscriptionCacheEntity.API_USAGE)
+            SubscriptionCacheEntity.CHARGEBEE, SubscriptionCacheEntity.API_USAGE
         )
     ]