From aac29ff4dbba2b8f326de440aece162c82287ca1 Mon Sep 17 00:00:00 2001
From: 5ila5 <38183212+5ila5@users.noreply.github.com>
Date: Sun, 14 Apr 2024 12:22:47 +0200
Subject: [PATCH] recycleapp_be propperly handling streets containing '.'
 (#1979)

* recycleapp_be properly handling streets containing '.'

---------

Co-authored-by: 5ila5 <5ila5@users.noreply.github.com>
---
 .../source/recycleapp_be.py                        | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/custom_components/waste_collection_schedule/waste_collection_schedule/source/recycleapp_be.py b/custom_components/waste_collection_schedule/waste_collection_schedule/source/recycleapp_be.py
index f43782cd..8f4757d1 100644
--- a/custom_components/waste_collection_schedule/waste_collection_schedule/source/recycleapp_be.py
+++ b/custom_components/waste_collection_schedule/waste_collection_schedule/source/recycleapp_be.py
@@ -30,6 +30,11 @@ TEST_CASES = {
         "house_number": 1,
         "add_events": True,
     },
+    "3200 Th. De Beckerstraat 1": {
+        "postcode": 3200,
+        "street": "Th. De Beckerstraat",
+        "house_number": 1,
+    },
 }
 
 _LOGGER = logging.getLogger(__name__)
@@ -38,7 +43,9 @@ _LOGGER = logging.getLogger(__name__)
 class Source:
     def __init__(self, postcode, street, house_number, add_events=True):
         self._postcode = postcode
+        # Steet search does not work with . in the street name and with the chars in front of the .
         self._street = street
+        self._steet_search = street.split(".")[-1]
         self._house_number = house_number
         self._add_events = add_events
 
@@ -59,15 +66,18 @@ class Source:
         r.raise_for_status()
         zipcodeId = r.json()["items"][0]["id"]
 
-        params = {"q": self._street, "zipcodes": zipcodeId}
+        params = {"q": self._steet_search, "zipcodes": zipcodeId}
         r = requests.post(f"{url}/streets", params=params, headers=headers)
         r.raise_for_status()
 
         streetId = None
         for item in r.json()["items"]:
-            if item["name"] == self._street:
+            if item["name"].lower().strip() == self._street.lower().strip():
                 streetId = item["id"]
         if streetId is None:
+            _LOGGER.warning(
+                f"No exact street match found, using first result: {r.json()['items'][0]['name']}"
+            )
             streetId = r.json()["items"][0]["id"]
 
         now = datetime.now()