eli-391 reverting caching of campaign config

Author: eddalmond1

src/eligibility_signposting_api/repos/campaign_repo.py

@@ -1,22 +1,14 @@
 import json
-import logging
-import os
 from collections.abc import Generator
 from typing import Annotated, NewType
 
 from botocore.client import BaseClient
 from wireup import Inject, service
 
-from eligibility_signposting_api.common.cache_manager import (
-    CAMPAIGN_CONFIGS_CACHE_KEY,
-    cache_manager,
-)
 from eligibility_signposting_api.model.campaign_config import CampaignConfig, Rules
 
 BucketName = NewType("BucketName", str)
 
-logger = logging.getLogger(__name__)
-
 
 @service
 class CampaignRepo:
@@ -34,47 +26,8 @@ def __init__(
         self.bucket_name = bucket_name
 
     def get_campaign_configs(self) -> Generator[CampaignConfig]:
-        """Get campaign configurations, using cached data if available.
-
-        Campaign rules are loaded once per Lambda container and cached globally
-        to improve performance by avoiding repeated S3 reads, unless caching is disabled for testing.
-        """
-        # Check if caching is disabled for tests
-        if os.getenv("DISABLE_CAMPAIGN_CACHE", "").lower() in ("true", "1", "yes"):
-            logger.debug("Campaign caching disabled for testing")
-            yield from self._load_campaign_configs_from_s3()
-            return
-
-        cached_configs = cache_manager.get(CAMPAIGN_CONFIGS_CACHE_KEY)
-
-        if cached_configs is None:
-            logger.info("Loading campaign configurations from S3 and caching for container reuse")
-            configs = self._load_campaign_configs_from_s3()
-            cache_manager.set(CAMPAIGN_CONFIGS_CACHE_KEY, configs)
-            logger.info("Cached campaign configurations", extra={"campaign_count": len(configs)})
-            yield from configs
-        else:
-            logger.debug("Using cached campaign configurations")
-            yield from cached_configs  # type: ignore[misc]
-
-    def _load_campaign_configs_from_s3(self) -> list[CampaignConfig]:
-        """Load campaign configurations from S3."""
-        configs = []
         campaign_objects = self.s3_client.list_objects(Bucket=self.bucket_name)
-
         for campaign_object in campaign_objects["Contents"]:
             response = self.s3_client.get_object(Bucket=self.bucket_name, Key=f"{campaign_object['Key']}")
             body = response["Body"].read()
-            config = Rules.model_validate(json.loads(body)).campaign_config
-            configs.append(config)
-
-        return configs
-
-    def clear_campaign_cache(self) -> None:
-        """Clear the campaign configurations cache.
-
-        This forces the next call to get_campaign_configs() to reload from S3.
-        Useful for testing or when you need to refresh the data.
-        """
-        cache_manager.clear(CAMPAIGN_CONFIGS_CACHE_KEY)
-        logger.info("Campaign configurations cache cleared")
+            yield Rules.model_validate(json.loads(body)).campaign_config

tests/integration/conftest.py

@@ -17,7 +17,6 @@
 from httpx import RequestError
 from yarl import URL
 
-from eligibility_signposting_api.common.cache_manager import cache_manager
 from eligibility_signposting_api.model import eligibility_status
 from eligibility_signposting_api.model.campaign_config import (
     CampaignConfig,
@@ -206,7 +205,6 @@ def flask_function(lambda_client: BaseClient, iam_role: str, lambda_zip: Path) -
                     "FIREHOSE_ENDPOINT": os.getenv("LOCALSTACK_INTERNAL_ENDPOINT", "http://localstack:4566/"),
                     "AWS_REGION": AWS_REGION,
                     "LOG_LEVEL": "DEBUG",
-                    "DISABLE_CAMPAIGN_CACHE": "true",  # Disable caching for integration tests
                 }
             },
         )
@@ -479,34 +477,6 @@ def firehose_delivery_stream(firehose_client: BaseClient, audit_bucket: BucketNa
     )
 
 
-@pytest.fixture(scope="class", autouse=True)
-def clear_performance_caches():
-    """Clear all performance caches before each test class.
-
-    This ensures test isolation when using the performance-optimized
-    Flask app and campaign configuration caching.
-    """
-    cache_manager.clear_all()
-    yield
-    # Optionally clear again after tests complete
-    cache_manager.clear_all()
-
-
-@pytest.fixture
-def clear_campaign_cache_for_test():
-    """Clear campaign cache before each test function that needs fresh campaign data.
-
-    This fixture should be used by tests that create specific campaign configurations
-    and expect them to be loaded fresh from S3, not from cache.
-    """
-    from eligibility_signposting_api.common.cache_manager import CAMPAIGN_CONFIGS_CACHE_KEY
-
-    cache_manager.clear(CAMPAIGN_CONFIGS_CACHE_KEY)
-    yield
-    # Optionally clear again after test completes
-    cache_manager.clear(CAMPAIGN_CONFIGS_CACHE_KEY)
-
-
 @pytest.fixture(scope="class")
 def campaign_config(s3_client: BaseClient, rules_bucket: BucketName) -> Generator[CampaignConfig]:
     campaign: CampaignConfig = rule.CampaignConfigFactory.build(

tests/integration/in_process/test_eligibility_endpoint.py

@@ -242,7 +242,6 @@ def test_actionable_with_and_rule(
         client: FlaskClient,
         persisted_person: NHSNumber,
         campaign_config_with_and_rule: CampaignConfig,  # noqa: ARG002
-        clear_campaign_cache_for_test,  # noqa: ARG002
     ):
         # Given
 

tests/integration/repo/test_campaign_repo.py

@@ -26,11 +26,10 @@ def test_get_campaign_config(s3_client: BaseClient, rules_bucket: BucketName, ca
     # Given
     repo = CampaignRepo(s3_client, rules_bucket)
 
-    # Ensure we start with a fresh cache for this test
-    repo.clear_campaign_cache()
-
     # When
-    actual = list(repo.get_campaign_configs())  # Then
+    actual = list(repo.get_campaign_configs())
+
+    # Then
     assert_that(
         actual,
         has_item(
@@ -51,35 +50,3 @@ def test_get_campaign_config(s3_client: BaseClient, rules_bucket: BucketName, ca
             )
         ),
     )
-
-
-def test_get_campaign_config_caching_behavior(
-    s3_client: BaseClient,
-    rules_bucket: BucketName,
-    campaign_config: CampaignConfig,  # noqa: ARG001
-):
-    """Test that campaign configurations are properly cached and cache clearing works."""
-    # Given
-    repo = CampaignRepo(s3_client, rules_bucket)
-
-    # Ensure we start with a fresh cache
-    repo.clear_campaign_cache()
-
-    # When - first call should load from S3
-    first_result = list(repo.get_campaign_configs())
-
-    # When - second call should use cache (this tests the cache hit path)
-    second_result = list(repo.get_campaign_configs())
-
-    # Then - both results should be identical
-    assert len(first_result) == len(second_result)
-    assert first_result[0].id == second_result[0].id
-    assert first_result[0].name == second_result[0].name
-
-    # When - clear cache and call again
-    repo.clear_campaign_cache()
-    third_result = list(repo.get_campaign_configs())
-
-    # Then - should still get the same data (reloaded from S3)
-    assert len(third_result) == len(first_result)
-    assert third_result[0].id == first_result[0].id