diff --git a/.env b/.env index 54a17528a..7a1d27547 100644 --- a/.env +++ b/.env @@ -26,7 +26,6 @@ DEFAULT_THEME=Vakantieverhuur DEFAULT_REASON=SIG melding VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_URL=https://api.acceptatie.toeristischeverhuur.nl/api/ VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_ACCESS_TOKEN=SECRET_ACCESS_TOKEN -VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_BAG_ID=0503100000000209 VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_BSN=999999990 ZAKEN_CONTAINER_HOST=http://zaak-gateway:8000 diff --git a/app/apps/health/health_checks.py b/app/apps/health/health_checks.py index e71a26a7d..97ce8b4ce 100644 --- a/app/apps/health/health_checks.py +++ b/app/apps/health/health_checks.py @@ -272,7 +272,7 @@ def check_status(self): ), "The registration data is empty and could not be retrieved using the BSN number" bag_registrations = get_vakantieverhuur_registrations_by_bag_id( - settings.VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_BAG_ID + settings.BAG_ID_AMSTEL_1 ) assert ( len(bag_registrations) > 0 @@ -303,7 +303,7 @@ def check_status(self): try: get_vakantieverhuur_meldingen( - settings.VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_BAG_ID, + settings.BAG_ID_AMSTEL_1, query_params=params, use_retry=False, ) diff --git a/app/config/settings.py b/app/config/settings.py index 7bf7f9842..7f2d6e9ba 100644 --- a/app/config/settings.py +++ b/app/config/settings.py @@ -335,12 +335,6 @@ def filter_traces(envelope): "BAG_API_BENKAGG_SEARCH_URL", "https://api.data.amsterdam.nl/v1/benkagg/adresseerbareobjecten/", ) -# API key for the public Amsterdam API (api.data.amsterdam.nl). -# This key is NOT used for authorization, but to identify who is using the API for communication purposes. -BAG_API_PUBLIC_KEY = os.getenv( - "BAG_API_PUBLIC_KEY", - "eyJhbGciOiJFZERTQSIsInR5cCI6IkpXVCJ9.eyJzdWIiOjMxNjQ2NDI4NzA1MzQ4NzI1NTEsImV4cCI6MTczODA3MDQ4N30.sGNs0EIRcdyUv76X1J1q46Y4kAIHSqHR1fca-srQlIQnV0aWduQn5xTlGQM1lvZCDk_F5qWf0__8u1jcYDMlDg", -) # Bag_id of Amstel 1 for testing purposes. BAG_ID_AMSTEL_1 = os.getenv( "BAG_ID_AMSTEL_1", @@ -554,9 +548,6 @@ def get_redis_url(): VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_ACCESS_TOKEN = os.getenv( "VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_ACCESS_TOKEN" ) -VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_BAG_ID = os.getenv( - "VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_BAG_ID", "0503100000000209" -) VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_BSN = os.getenv( "VAKANTIEVERHUUR_TOERISTISCHE_VERHUUR_API_BSN" ) diff --git a/app/utils/api_queries_bag.py b/app/utils/api_queries_bag.py index a2a972a6e..6a53d4666 100644 --- a/app/utils/api_queries_bag.py +++ b/app/utils/api_queries_bag.py @@ -6,8 +6,6 @@ logger = logging.getLogger(__name__) -headers = {"x-api-key": settings.BAG_API_PUBLIC_KEY} - @retry(stop=stop_after_attempt(3), after=after_log(logger, logging.ERROR)) def do_bag_search_benkagg_by_id(identificatie): @@ -21,7 +19,6 @@ def do_bag_search_benkagg_by_id(identificatie): address_search = requests.get( settings.BAG_API_BENKAGG_SEARCH_URL, params={"identificatie": identificatie}, - headers=headers, timeout=30, ) return address_search.json()