uk_bin_collection 0.82.0__py3-none-any.whl → 0.82.1__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -283,10 +283,10 @@
         "wiki_name": "Doncaster Council"
     },
     "DorsetCouncil": {
-        "url": "https://gi.dorsetcouncil.gov.uk/mapping/mylocal/viewresults/100040711049",
-        "wiki_command_url_override": "https://gi.dorsetcouncil.gov.uk/mapping/mylocal/viewresults/XXXXXXXX",
-        "wiki_name": "Dorset Council",
-        "wiki_note": "Replace XXXXXXXX with UPRN."
+        "skip_get_url": true,
+        "url": "https://www.dorsetcouncil.gov.uk/",
+        "uprn": "100040711049",
+        "wiki_name": "Dorset Council"
     },
     "DoverDistrictCouncil": {
         "url": "https://collections.dover.gov.uk/property/100060908340",

uk_bin_collection/uk_bin_collection/councils/DorsetCouncil.py

@@ -14,38 +14,22 @@ class CouncilClass(AbstractGetBinDataClass):
     def parse_data(self, page: str, **kwargs) -> dict:
         data = {"bins": []}
         collections = []
-
-        # Parse the page and find all the result boxes
-        soup = BeautifulSoup(page.text, features="html.parser")
-        soup.prettify()
-        results = soup.find_all("li", {"class": "resultListItem"})
-
-        # If the result box has a wanted string in, we can use it. Check the contents of each box and find the
-        # desired text and dates
-        for r in results:
-            if "Your next" in r.text:
-                if type(r.contents[10]) is element.NavigableString:
-                    bin_text = r.contents[10].text.split(" ")[2].title() + " bin"
-                    bin_date = datetime.strptime(
-                        remove_ordinal_indicator_from_date_string(
-                            r.contents[11].text.strip()
-                        ),
-                        "%A %d %B %Y",
-                    )
-                else:
-                    bin_text = r.contents[11].text.split(" ")[2].title() + " bin"
-                    bin_date = datetime.strptime(
-                        remove_ordinal_indicator_from_date_string(
-                            r.contents[12].text.strip()
-                        ),
-                        "%A %d %B %Y",
-                    )
-
-                if bin_date.date() >= datetime.now().date():
-                    collections.append((bin_text, bin_date))
-
-                # Sort the text and date elements by date
-                ordered_data = sorted(collections, key=lambda x: x[1])
+        url_base = "https://geoapi.dorsetcouncil.gov.uk/v1/services/"
+        url_types = ["recyclingday", "refuseday", "foodwasteday", "gardenwasteday"]
+
+        uprn = kwargs.get("uprn")
+        # Check the UPRN is valid
+        check_uprn(uprn)
+
+        for url_type in url_types:
+            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:

uk_bin_collection/uk_bin_collection/get_bin_data.py

@@ -5,7 +5,7 @@ None
 """
 
 import json
-import logging
+import logging, logging.config
 from abc import ABC, abstractmethod
 import os
 import requests

{uk_bin_collection-0.82.0.dist-info → uk_bin_collection-0.82.1.dist-info}/METADATA

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

{uk_bin_collection-0.82.0.dist-info → uk_bin_collection-0.82.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ uk_bin_collection/README.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-cutwz5RoYYWZRLYx2tr6zIs_9Rc,3843
 uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
 uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
-uk_bin_collection/tests/input.json,sha256=fI2ytw25uVQirZ28xuGL3iB7fPFJ9DrYwRn-s5ISce8,59301
+uk_bin_collection/tests/input.json,sha256=R_hD1z-Wyc5VMuuQpBay7xLoo-ALHNSZX4OrLxOp_VQ,59163
 uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
 uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
 uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=LrOSt_loA1Mw3vTqaO2LpaDMu7rYJy6k5Kr-EOBln7s,3424
@@ -48,7 +48,7 @@ uk_bin_collection/uk_bin_collection/councils/CroydonCouncil.py,sha256=QJH27plySb
 uk_bin_collection/uk_bin_collection/councils/DartfordBoroughCouncil.py,sha256=SPirUUoweMwX5Txtsr0ocdcFtKxCQ9LhzTTJN20tM4w,1550
 uk_bin_collection/uk_bin_collection/councils/DerbyshireDalesDistrictCouncil.py,sha256=MQC1-jXezXczrxTcvPQvkpGgyyAbzSKlX38WsmftHak,4007
 uk_bin_collection/uk_bin_collection/councils/DoncasterCouncil.py,sha256=b7pxoToXu6dBBYXsXmlwfPXE8BjHxt0hjCOBNlNgvX8,3118
-uk_bin_collection/uk_bin_collection/councils/DorsetCouncil.py,sha256=sdSR5ryOSWHtK_0OKJ75LGOvMiUAnQCc3uwT3xfqZ_0,2304
+uk_bin_collection/uk_bin_collection/councils/DorsetCouncil.py,sha256=zfXQJpywfEQvBOhv5uPSkHdTrAg114yXIuTYDjHSXsA,1629
 uk_bin_collection/uk_bin_collection/councils/DoverDistrictCouncil.py,sha256=3Zgap6kaVpDXtRfBKEL1Ms6eb0iFIipYKNtOq3Hrdd4,1891
 uk_bin_collection/uk_bin_collection/councils/DurhamCouncil.py,sha256=6O8bNsQVYQbrCYQE9Rp0c_rtkcXuxR3s9J6jn4MK4_s,1695
 uk_bin_collection/uk_bin_collection/councils/EastCambridgeshireCouncil.py,sha256=aYUVE5QqTxdj8FHhCB4EiFVDJahWJD9Pq0d1upBEvXg,1501
@@ -180,9 +180,9 @@ uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py,sha256=zDDa7n4K_zm5P
 uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bIdsvmoSzBjJAvTTi6yPfJa8xjJx1ys2w,1490
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=4s9ODGPAwPqwXc8SrTX5Wlfmizs3_58iXUtHc4Ir86o,1162
 uk_bin_collection/uk_bin_collection/create_new_council.py,sha256=m-IhmWmeWQlFsTZC4OxuFvtw5ZtB8EAJHxJTH4O59lQ,1536
-uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=MR3V6SlzeCTGkF7lB_mQgs7ATkbPUoQhVbF5ngs3xac,4529
-uk_bin_collection-0.82.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.82.0.dist-info/METADATA,sha256=zFhhom61NP92IdfPLs9hgFpFavReYfejQokftpu2Rzo,16231
-uk_bin_collection-0.82.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uk_bin_collection-0.82.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.82.0.dist-info/RECORD,,
+uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=YvmHfZqanwrJ8ToGch34x-L-7yPe31nB_x77_Mgl_vo,4545
+uk_bin_collection-0.82.1.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.82.1.dist-info/METADATA,sha256=eF66OGftcUZmlsUAk4B5mGDaJrfHErD-tINXzxW6Ta8,16231
+uk_bin_collection-0.82.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uk_bin_collection-0.82.1.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.82.1.dist-info/RECORD,,