uk_bin_collection 0.91.0__tar.gz → 0.91.1__tar.gz

{uk_bin_collection-0.91.0 → uk_bin_collection-0.91.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.91.0
+Version: 0.91.1
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com

{uk_bin_collection-0.91.0 → uk_bin_collection-0.91.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uk_bin_collection"
-version = "0.91.0"
+version = "0.91.1"
 description = "Python Lib to collect UK Bin Data"
 readme = "README.md"
 authors = ["Robert Bradley <robbrad182@gmail.com>"]

{uk_bin_collection-0.91.0 → uk_bin_collection-0.91.1}/uk_bin_collection/uk_bin_collection/councils/DorsetCouncil.py

@@ -1,4 +1,5 @@
 from bs4 import BeautifulSoup, element
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -13,7 +14,6 @@ class CouncilClass(AbstractGetBinDataClass):
 
     def parse_data(self, page: str, **kwargs) -> dict:
         data = {"bins": []}
-        collections = []
         url_base = "https://geoapi.dorsetcouncil.gov.uk/v1/services/"
         url_types = ["recyclingday", "refuseday", "foodwasteday", "gardenwasteday"]
 
@@ -25,18 +25,17 @@ class CouncilClass(AbstractGetBinDataClass):
             response = requests.get(f"{url_base}{url_type}/{uprn}")
             if response.status_code != 200:
                 raise ConnectionError(f"Could not fetch from {url_type} endpoint")
-            json_data = response.json()["values"][0]
-            collections.append((f"{json_data.get('type')} bin", datetime.strptime(json_data.get('dateNextVisit'), "%Y-%m-%d")))
-
-        # Sort the text and date elements by date
-        ordered_data = sorted(collections, key=lambda x: x[1])
-
-        # Put the elements into the dictionary
-        for item in ordered_data:
-            dict_data = {
-                "type": item[0],
-                "collectionDate": item[1].strftime(date_format),
-            }
-            data["bins"].append(dict_data)
+            if response.json()["values"]:
+                json_data = response.json()["values"][0]
+
+                next_collection_date = datetime.strptime(
+                    json_data.get("dateNextVisit"), "%Y-%m-%d"
+                )
+
+                dict_data = {
+                    "type": f"{json_data.get('type')} bin",
+                    "collectionDate": next_collection_date.strftime("%d/%m/%Y"),
+                }
+                data["bins"].append(dict_data)
 
         return data

{uk_bin_collection-0.91.0 → uk_bin_collection-0.91.1}/uk_bin_collection/uk_bin_collection/councils/GatesheadCouncil.py

@@ -32,10 +32,8 @@ class CouncilClass(AbstractGetBinDataClass):
                 "https://www.gateshead.gov.uk/article/3150/Bin-collection-day-checker"
             )
 
-            accept_button = WebDriverWait(driver, timeout=30).until(
-                EC.element_to_be_clickable(
-                    (By.CLASS_NAME, "btn btn--contrast btn--complete")
-                )
+            accept_button = WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located((By.NAME, "acceptall"))
             )
             accept_button.click()