uk_bin_collection 0.128.6__py3-none-any.whl → 0.130.0__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -31,13 +31,6 @@
         "wiki_name": "Ards and North Down Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
-    "ArdsAndNorthDownCouncil": {
-        "url": "https://www.ardsandnorthdown.gov.uk",
-        "wiki_command_url_override": "https://www.ardsandnorthdown.gov.uk",
-        "uprn": "187136177",
-        "wiki_name": "Ards and North Down Council",
-        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
-    },
     "ArgyllandButeCouncil": {
         "uprn": "125061759",
         "skip_get_url": true,
@@ -212,6 +205,15 @@
         "wiki_name": "Bolton Council",
         "wiki_note": "To get the UPRN, you will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search). Previously required a single field that was UPRN and full address; now requires UPRN and postcode as separate fields."
     },
+    "BostonBoroughCouncil": {
+        "postcode": "PE20 1AY",
+        "skip_get_url": true,
+        "house_number": "CEDAR",
+        "web_driver": "http://selenium:4444",
+        "url": "https://www.boston.gov.uk/findwastecollections",
+        "wiki_name": "Boston Borough Council",
+        "wiki_note": "Provide your house number in the `house_number` parameter and postcode in the `postcode` parameter."
+    },
     "BracknellForestCouncil": {
         "house_number": "57",
         "paon": "57",
@@ -348,7 +350,7 @@
     "CardiffCouncil": {
         "skip_get_url": true,
         "uprn": "100100112419",
-        "url": "https://www.cardiff.gov.uk/ENG/resident/Rubbish-and-recycling/When-are-my-bins-collected/Pages/default.aspx",
+        "url": "https://www.gov.uk",
         "wiki_name": "Cardiff Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -611,13 +613,6 @@
         "wiki_name": "East Herts Council",
         "wiki_note": "Pass the house number and postcode in their respective parameters."
     },
-    "EastHertsCouncil": {
-        "house_number": "1",
-        "postcode": "CM20 2FZ",
-        "skip_get_url": true,
-        "url": "https://www.eastherts.gov.uk",
-        "wiki_name": "East Herts Council"
-    },
     "EastLindseyDistrictCouncil": {
         "house_number": "1",
         "postcode": "PE22 0YD",
@@ -627,6 +622,14 @@
         "wiki_name": "East Lindsey District Council",
         "wiki_note": "Pass the house name/number and postcode in their respective parameters. This parser requires a Selenium webdriver."
     },
+    "EastLothianCouncil": {
+        "house_number": "Flat 1",
+        "postcode": "EH21 6QA",
+        "skip_get_url": true,
+        "url": "https://eastlothian.gov.uk",
+        "wiki_name": "East Lothian Council",
+        "wiki_note": "Pass the house number and postcode in their respective parameters"
+    },
     "EastRenfrewshireCouncil": {
         "house_number": "23",
         "postcode": "G46 6RG",
@@ -645,6 +648,12 @@
         "wiki_name": "East Riding Council",
         "wiki_note": "Put the full address as it displays on the council website dropdown when you do the check manually."
     },
+    "EastStaffordshireBoroughCouncil": {
+        "url": "https://www.eaststaffsbc.gov.uk/bins-rubbish-recycling/collection-dates/68382",
+        "wiki_command_url_override": "https://www.eaststaffsbc.gov.uk/bins-rubbish-recycling/collection-dates/XXXXX",
+        "wiki_name": "East Staffordshire Borough Council",
+        "wiki_note": "Replace `XXXXX` with your property's ID when selecting from https://www.eaststaffsbc.gov.uk/bins-rubbish-recycling/collection-dates."
+    },
     "EastSuffolkCouncil": {
         "postcode": "IP11 9FJ",
         "skip_get_url": true,
@@ -745,20 +754,6 @@
         "wiki_name": "Flintshire County Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
-    "FifeCouncil": {
-        "url": "https://www.fife.gov.uk",
-        "wiki_command_url_override": "https://www.fife.gov.uk",
-        "uprn": "320203521",
-        "wiki_name": "Fife Council",
-        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
-    },
-    "FlintshireCountyCouncil": {
-        "url": "https://digital.flintshire.gov.uk",
-        "wiki_command_url_override": "https://digital.flintshire.gov.uk",
-        "uprn": "100100213710",
-        "wiki_name": "Flintshire County Council",
-        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
-    },
     "FolkstoneandHytheDistrictCouncil": {
         "skip_get_url": true,
         "uprn": "50032097",
@@ -887,6 +882,12 @@
         "wiki_name": "Hartlepool Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
+    "HerefordshireCouncil": {
+        "url": "https://www.herefordshire.gov.uk/rubbish-recycling/check-bin-collection-day?blpu_uprn=10096232662",
+        "wiki_command_url_override": "https://www.herefordshire.gov.uk/rubbish-recycling/check-bin-collection-day?blpu_uprn=XXXXXXXXXXXX",
+        "wiki_name": "Herefordshire Council",
+        "wiki_note": "Replace 'XXXXXXXXXX' with your property's UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
+    },
     "HertsmereBoroughCouncil": {
         "house_number": "1",
         "postcode": "WD7 9HZ",
@@ -994,6 +995,12 @@
         "wiki_name": "Leeds City Council",
         "wiki_note": "Pass the house number, postcode, and UPRN. This parser requires a Selenium webdriver."
     },
+    "LeicesterCityCouncil": {
+        "url": "https://biffaleicester.co.uk",
+        "uprn": "2465027976",
+        "wiki_name": "Leicester City Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "LichfieldDistrictCouncil": {
         "url": "https://www.lichfielddc.gov.uk",
         "wiki_command_url_override": "https://www.lichfielddc.gov.uk",
@@ -1231,7 +1238,7 @@
         "url": "https://community.newcastle.gov.uk/my-neighbourhood/ajax/getBinsNew.php?uprn=004510730634",
         "wiki_command_url_override": "https://community.newcastle.gov.uk/my-neighbourhood/ajax/getBinsNew.php?uprn=XXXXXXXX",
         "wiki_name": "Newcastle City Council",
-        "wiki_note": "Replace XXXXXXXX with your UPRN."
+        "wiki_note": "Replace XXXXXXXX with your UPRN. UPRNs need to be 12 digits long so please pad the left hand side with 0s if your UPRN is not long enough"
     },
     "NewcastleUnderLymeCouncil": {
         "url": "https://www.newcastle-staffs.gov.uk",

uk_bin_collection/uk_bin_collection/councils/BostonBoroughCouncil.py

@@ -0,0 +1,149 @@
+from bs4 import BeautifulSoup
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import Select
+from selenium.webdriver.support.wait import WebDriverWait
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        driver = None
+        try:
+            data = {"bins": []}
+            user_paon = kwargs.get("paon")
+            user_postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            check_paon(user_paon)
+            check_postcode(user_postcode)
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get("https://www.boston.gov.uk/findwastecollections")
+
+            accept_button = WebDriverWait(driver, timeout=30).until(
+                EC.element_to_be_clickable((By.NAME, "acceptall"))
+            )
+            accept_button.click()
+
+            # Wait for the postcode field to appear then populate it
+            inputElement_postcode = WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located(
+                    (By.ID, "BBCWASTECOLLECTIONS_START_SEARCHPOSTCODE")
+                )
+            )
+            inputElement_postcode.send_keys(user_postcode)
+
+            # Click search button
+            findAddress = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.ID, "BBCWASTECOLLECTIONS_START_START10_NEXT")
+                )
+            )
+            findAddress.click()
+
+            # Wait for the custom dropdown container to be visible
+            WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable(
+                    (By.ID, "BBCWASTECOLLECTIONS_COLLECTIONADDRESS_INCIDENTUPRN_chosen")
+                )
+            )
+
+            # Click on the dropdown to open it
+            dropdown = driver.find_element(
+                By.ID, "BBCWASTECOLLECTIONS_COLLECTIONADDRESS_INCIDENTUPRN_chosen"
+            )
+            dropdown.click()
+
+            # Wait for the dropdown options to be visible
+            WebDriverWait(driver, 10).until(
+                EC.visibility_of_element_located((By.CLASS_NAME, "chosen-results"))
+            )
+
+            # Locate the desired option using its text
+            desired_option = driver.find_element(
+                By.XPATH,
+                "//li[@class='active-result' and contains(text(), '"
+                + user_paon
+                + "')]",
+            )
+
+            # Click on the desired option
+            desired_option.click()
+
+            # dropdown.select_by_visible_text(user_paon)
+
+            # Click search button
+            findAddress = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.ID, "BBCWASTECOLLECTIONS_COLLECTIONADDRESS_NEXT3_NEXT")
+                )
+            )
+            findAddress.click()
+
+            # Wait for the collections table to appear
+            WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.ID, "BBCWASTECOLLECTIONS_SERVICE_FIELD859_OUTER")
+                )
+            )
+
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+
+            # Find the container with the bin information
+            bins = soup.find_all(
+                "div", class_="grid__cell grid__cell--listitem grid__cell--cols1"
+            )
+
+            current_year = datetime.now().year
+            next_year = current_year + 1
+
+            # Loop through each bin container to extract the details
+            for bin_div in bins:
+                # Find the bin type (title text)
+                bin_type = bin_div.find("h2", class_="item__title").text.strip()
+
+                # Find the next collection date
+                next_collection = (
+                    bin_div.find("div", class_="item__content")
+                    .find("div")
+                    .text.strip()
+                    .replace("Next: ", "")
+                )
+
+                next_collection = datetime.strptime(
+                    remove_ordinal_indicator_from_date_string(next_collection),
+                    "%A %d %B",
+                )
+
+                if (datetime.now().month == 12) and (next_collection.month == 1):
+                    next_collection = next_collection.replace(year=next_year)
+                else:
+                    next_collection = next_collection.replace(year=current_year)
+
+                dict_data = {
+                    "type": bin_type,
+                    "collectionDate": next_collection.strftime(date_format),
+                }
+                data["bins"].append(dict_data)
+
+        except Exception as e:
+            # Here you can log the exception if needed
+            print(f"An error occurred: {e}")
+            # Optionally, re-raise the exception if you want it to propagate
+            raise
+        finally:
+            # This block ensures that the driver is closed regardless of an exception
+            if driver:
+                driver.quit()
+        return data

uk_bin_collection/uk_bin_collection/councils/EastLothianCouncil.py

@@ -0,0 +1,83 @@
+import requests
+from bs4 import BeautifulSoup
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+
+        user_postcode = kwargs.get("postcode")
+        user_paon = kwargs.get("paon")
+        check_postcode(user_postcode)
+        check_paon(user_paon)
+        bindata = {"bins": []}
+
+        URI = "http://collectiondates.eastlothian.gov.uk/ajax/your-calendar/load-streets-spring-2024.asp"
+
+        payload = {
+            "postcode": user_postcode,
+        }
+
+        headers = {
+            "Referer": "http://collectiondates.eastlothian.gov.uk/your-calendar",
+            "User-Agent": "Mozilla/5.0",
+        }
+
+        # Make the GET request
+        response = requests.get(URI, headers=headers, params=payload)
+
+        # Parse the HTML with BeautifulSoup
+        soup = BeautifulSoup(response.text, "html.parser")
+
+        # Find the select dropdown
+        select = soup.find("select", id="SelectStreet")
+
+        # Find the option that contains "Flat 1"
+        address = select.find("option", string=lambda text: text and user_paon in text)
+
+        URI = "http://collectiondates.eastlothian.gov.uk/ajax/your-calendar/load-recycling-summer-2024.asp"
+
+        payload = {
+            "id": address["value"],
+        }
+
+        # Make the GET request
+        response = requests.get(URI, headers=headers, params=payload)
+
+        # Parse the HTML with BeautifulSoup
+        soup = BeautifulSoup(response.text, "html.parser")
+
+        # Extract collection details
+        calendar_items = soup.find_all("div", class_="calendar-item")
+        for item in calendar_items:
+            waste_label = item.find("div", class_="waste-label").text.strip()
+            waste_value = item.find("div", class_="waste-value").find("h4").text.strip()
+
+            try:
+                collection_date = datetime.strptime(
+                    remove_ordinal_indicator_from_date_string(waste_value),
+                    "%A %d %B %Y",
+                )
+            except ValueError:
+                continue
+
+            dict_data = {
+                "type": waste_label.replace(" is:", ""),
+                "collectionDate": collection_date.strftime(date_format),
+            }
+            bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/EastStaffordshireBoroughCouncil.py

@@ -0,0 +1,86 @@
+import requests
+from bs4 import BeautifulSoup
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import Select
+from selenium.webdriver.support.wait import WebDriverWait
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+
+        bindata = {"bins": []}
+
+        soup = BeautifulSoup(page.text, features="html.parser")
+
+        current_year = datetime.now().year
+        next_year = current_year + 1
+
+        # Extract next collection
+        next_collection_section = soup.find("div", class_="collection-next")
+        if next_collection_section:
+            next_collection_text = next_collection_section.find("h2").text.strip()
+            date_match = re.search(
+                r"(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (\d+)(?:st|nd|rd|th)? (\w+)",
+                next_collection_text,
+            )
+            if date_match:
+                collection_date = f"{date_match.group(1)} {remove_ordinal_indicator_from_date_string(date_match.group(2))} {date_match.group(3)}"
+
+                collection_date = datetime.strptime(collection_date, "%A %d %B")
+
+                if (datetime.now().month == 12) and (collection_date.month == 1):
+                    collection_date = collection_date.replace(year=next_year)
+                else:
+                    collection_date = collection_date.replace(year=current_year)
+
+                # Get bin types
+                bins = next_collection_section.find_all("div", class_="field__item")
+                for bin_type in bins:
+                    dict_data = {
+                        "type": bin_type.text.strip(),
+                        "collectionDate": collection_date.strftime(date_format),
+                    }
+                    bindata["bins"].append(dict_data)
+
+        # Extract other collections
+        other_collections = soup.find_all("li")
+        for collection in other_collections:
+            date_text = collection.contents[0].strip()
+            date_match = re.search(
+                r"(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday), (\d+)(?:st|nd|rd|th)? (\w+)",
+                date_text,
+            )
+            if date_match:
+                collection_date = f"{date_match.group(1)} {remove_ordinal_indicator_from_date_string(date_match.group(2))} {date_match.group(3)}"
+                collection_date = datetime.strptime(collection_date, "%A %d %B")
+
+                if (datetime.now().month == 12) and (collection_date.month == 1):
+                    collection_date = collection_date.replace(year=next_year)
+                else:
+                    collection_date = collection_date.replace(year=current_year)
+
+                # Get bin types
+                bins = collection.find_all("div", class_="field__item")
+                for bin_type in bins:
+                    dict_data = {
+                        "type": bin_type.text.strip(),
+                        "collectionDate": collection_date.strftime(date_format),
+                    }
+                    bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/HerefordshireCouncil.py

@@ -0,0 +1,53 @@
+import logging
+
+from bs4 import BeautifulSoup
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        # Make a BS4 object
+        soup = BeautifulSoup(page.text, features="html.parser")
+        soup.prettify()
+
+        data = {"bins": []}
+
+        checkValid = soup.find("p", id="selectedAddressResult")
+        if checkValid is None:
+            raise ValueError("Address/UPRN not found")
+
+        collections = soup.find("div", id="wasteCollectionDates")
+
+        for bins in collections.select('div[class*="hc-island"]'):
+            bin_type = bins.h4.get_text(strip=True)
+
+            # Last div.hc-island is the calendar link, skip it
+            if bin_type == "Calendar":
+                continue
+
+            # Next collection date is in a span under the second p.hc-no-margin of the div.
+            bin_collection = re.search(
+                r"(.*) \(.*\)", bins.select("div > p > span")[0].get_text(strip=True)
+            ).group(1)
+            if bin_collection:
+                logging.info(
+                    f"Bin type: {bin_type} - Collection date: {bin_collection}"
+                )
+                dict_data = {
+                    "type": bin_type,
+                    "collectionDate": datetime.strptime(
+                        bin_collection, "%A %d %B %Y"
+                    ).strftime(date_format),
+                }
+                data["bins"].append(dict_data)
+
+        return data

uk_bin_collection/uk_bin_collection/councils/LeicesterCityCouncil.py

@@ -0,0 +1,62 @@
+import time
+
+import requests
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        user_uprn = str(user_uprn).zfill(12)
+
+        URI = "https://biffaleicester.co.uk/wp-admin/admin-ajax.php"
+
+        payload = {
+            "action": "get_details_api",
+            "uprn": user_uprn,
+        }
+
+        headers = {
+            "Origin": "https://biffaleicester.co.uk",
+            "Referer": "https://biffaleicester.co.uk/services/waste-collection-days/",
+            "User-Agent": "Mozilla/5.0",
+        }
+
+        # Make the GET request
+        response = requests.post(URI, headers=headers, data=payload)
+
+        # Parse the JSON response
+        bin_collection = response.json()
+
+        # Loop through each collection in bin_collection
+        for collection in bin_collection["anyType"]:
+            bin_type = collection["ServiceModeDesc"]
+            date = collection["ServiceDueDate"]
+
+            dict_data = {
+                "type": bin_type,
+                "collectionDate": datetime.strptime(
+                    date,
+                    "%d/%m/%y",
+                ).strftime(date_format),
+            }
+            bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/MidlothianCouncil.py

@@ -82,6 +82,30 @@ class CouncilClass(AbstractGetBinDataClass):
                     if pattern.match(link_text):
                         return address_link
 
+            try:
+                print("Finding next page link not found.")
+                # Find the 'Next page' link
+                next_page_link = soup.find("a", class_="button float-right")
+
+                # Ensure the link exists
+                if next_page_link:
+                    # Extract the href attribute
+                    next_page_url = next_page_link["href"]
+
+                    # Send a GET request to the next page
+                    next_response = requests.get(next_page_url)
+                    next_response.raise_for_status()  # Raise an exception for HTTP errors
+
+                    # Parse the HTML content of the next page
+                    soup = BeautifulSoup(next_response.text, "html.parser")
+                    address_link = self._get_result_by_identifier(soup, identifier)
+                    return address_link
+                else:
+                    print("Next page link not found.")
+            except AttributeError as e:
+                print(f"Warning: Could not find the search results. Error: {e}")
+                return None  # Return None if no result found
+
             print(f"Warning: No results found for identifier '{identifier}'.")
             return None  # Return None if no match is found
 

uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py

@@ -19,6 +19,7 @@ def parse_collection_date(date_string) -> datetime:
 
     return parsed_date
 
+
 class CouncilClass(AbstractGetBinDataClass):
     """
     Concrete classes have to implement all abstract operations of the
@@ -84,6 +85,9 @@ class CouncilClass(AbstractGetBinDataClass):
 
         data = {"bins": []}
 
+        current_year = datetime.now().year
+        next_year = current_year + 1
+
         next_collection_date = soup.find(
             "strong", id="SBC-YBD-collectionDate"
         ).text.strip()
@@ -104,20 +108,27 @@ class CouncilClass(AbstractGetBinDataClass):
         future_bins = [li.text.strip() for li in soup.select("#FirstFutureBins li")]
 
         for bin in next_bins:
+            collection_date = datetime.strptime(next_collection_date, "%A, %d %B")
+            if (datetime.now().month == 12) and (collection_date.month == 1):
+                collection_date = collection_date.replace(year=next_year)
+            else:
+                collection_date = collection_date.replace(year=current_year)
+
             dict_data = {
                 "type": bin,
-                "collectionDate": datetime.strptime(
-                    next_collection_date, "%A, %d %B"
-                ).strftime(date_format),
+                "collectionDate": collection_date.strftime(date_format),
             }
             data["bins"].append(dict_data)
 
         for bin in future_bins:
+            collection_date = datetime.strptime(future_collection_date, "%A, %d %B")
+            if (datetime.now().month == 12) and (collection_date.month == 1):
+                collection_date = collection_date.replace(year=next_year)
+            else:
+                collection_date = collection_date.replace(year=current_year)
             dict_data = {
                 "type": bin,
-                "collectionDate": datetime.strptime(
-                    future_collection_date, "%A, %d %B"
-                ).strftime(date_format),
+                "collectionDate": collection_date.strftime(date_format),
             }
             data["bins"].append(dict_data)
 

{uk_bin_collection-0.128.6.dist-info → uk_bin_collection-0.130.0.dist-info}/METADATA

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

{uk_bin_collection-0.128.6.dist-info → uk_bin_collection-0.130.0.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=mQ6Mu07OBuIodT-uD74zTi-AuXDMQQ09GyzDcPvaxqo,115118
+uk_bin_collection/tests/input.json,sha256=EUx3biB0uK4bYrQEM5YTMa3xXTxKVfb0-mcw8bupyqM,115835
 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=VZ0a81sioJULD7syAYHjvK_-nT_Rd36tUyzPetSA0gk,3475
@@ -39,6 +39,7 @@ uk_bin_collection/uk_bin_collection/councils/BlabyDistrictCouncil.py,sha256=xqWk
 uk_bin_collection/uk_bin_collection/councils/BlackburnCouncil.py,sha256=ZLA2V3qPsJTom7SeQdGDhF4tJSfgIV5Qi202QvGKJZ0,4477
 uk_bin_collection/uk_bin_collection/councils/BlaenauGwentCountyBoroughCouncil.py,sha256=C5Fi19t5HJcrOHhWnt_6pttgRL2IWIYnwYlF9MdSPR0,4330
 uk_bin_collection/uk_bin_collection/councils/BoltonCouncil.py,sha256=WI68r8jB0IHPUT4CgmZMtng899AAMFTxkyTdPg9yLF8,4117
+uk_bin_collection/uk_bin_collection/councils/BostonBoroughCouncil.py,sha256=8xv6FMNj8Qgwn5K0nMdB5X8hkcNFzhcJ48DMordflJY,5631
 uk_bin_collection/uk_bin_collection/councils/BracknellForestCouncil.py,sha256=Llo1rULaAZ8rChVYZqXFFLo7CN6vbT0ULUJD6ActouY,9015
 uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py,sha256=BEWS2c62cOsf26jqn1AkNUvVmc5AlUADYLaQuPn9RY4,5456
 uk_bin_collection/uk_bin_collection/councils/BraintreeDistrictCouncil.py,sha256=2vYHilpI8mSwC2Ykdr1gxYAN3excDWqF6AwtGbkwbTw,2441
@@ -94,8 +95,10 @@ uk_bin_collection/uk_bin_collection/councils/EastCambridgeshireCouncil.py,sha256
 uk_bin_collection/uk_bin_collection/councils/EastDevonDC.py,sha256=U0VwSNIldMv5nUoiXtFgjbE0m6Kb-8W2WZQGVCNF_WI,3261
 uk_bin_collection/uk_bin_collection/councils/EastHertsCouncil.py,sha256=hjIrZXM0qe8xvHfrBqMDyXnq0_h_ySODqTfmOI5ahTc,4071
 uk_bin_collection/uk_bin_collection/councils/EastLindseyDistrictCouncil.py,sha256=RSOTD1MIXSW27eGf3TixCiJK4HtSJnpfME2CjalDeXs,4326
+uk_bin_collection/uk_bin_collection/councils/EastLothianCouncil.py,sha256=zTp-GDWYeUIlFaqfkqGvo7XMtxJd0VbxdGgqaAwRACk,2792
 uk_bin_collection/uk_bin_collection/councils/EastRenfrewshireCouncil.py,sha256=5giegMCKQ2JhVDR5M4mevVxIdhZtSW7kbuuoSkj3EGk,4361
 uk_bin_collection/uk_bin_collection/councils/EastRidingCouncil.py,sha256=oL-NqriLVy_NChGASNh8qTqeakLn4iP_XzoMC6VlPGM,5216
+uk_bin_collection/uk_bin_collection/councils/EastStaffordshireBoroughCouncil.py,sha256=s13zlAN9Rac-RVHNFLIjIY0X8C6sPTNS37EL2t6vXw8,3692
 uk_bin_collection/uk_bin_collection/councils/EastSuffolkCouncil.py,sha256=qQ0oOfGd0sWcczse_B22YoeL9uj3og8v3UJLt_Sx29c,4353
 uk_bin_collection/uk_bin_collection/councils/EastleighBoroughCouncil.py,sha256=V4Vso4DvawFiezKlmXbTlJEK9Sjhz9nA8WeYjwtO2e4,2310
 uk_bin_collection/uk_bin_collection/councils/EdinburghCityCouncil.py,sha256=YRjNgevnCxfaAIU8BV9dkqG17NiT6S-hp7l-1rdLVgQ,3150
@@ -126,6 +129,7 @@ uk_bin_collection/uk_bin_collection/councils/HaringeyCouncil.py,sha256=t_6AkAu4w
 uk_bin_collection/uk_bin_collection/councils/HarrogateBoroughCouncil.py,sha256=_g3fP5Nq-OUjgNrfRf4UEyFKzq0x8QK-4enh5RP1efA,2050
 uk_bin_collection/uk_bin_collection/councils/HartDistrictCouncil.py,sha256=_llxT4JYYlwm20ZtS3fXwtDs6mwJyLTZBP2wBhvEpWk,2342
 uk_bin_collection/uk_bin_collection/councils/HartlepoolBoroughCouncil.py,sha256=MUT1A24iZShT2p55rXEvgYwGUuw3W05Z4ZQAveehv-s,2842
+uk_bin_collection/uk_bin_collection/councils/HerefordshireCouncil.py,sha256=JpQhkWM6Jeuzf1W7r0HqvtVnEqNi18nhwJX70YucdsI,1848
 uk_bin_collection/uk_bin_collection/councils/HertsmereBoroughCouncil.py,sha256=-ThSG6NIJP_wf2GmGL7SAvxbOujdhanZ8ECP4VSQCBs,5415
 uk_bin_collection/uk_bin_collection/councils/HighPeakCouncil.py,sha256=x7dfy8mdt2iGl8qJxHb-uBh4u0knmi9MJ6irOJw9WYA,4805
 uk_bin_collection/uk_bin_collection/councils/HighlandCouncil.py,sha256=GNxDU65QuZHV5va2IrKtcJ6TQoDdwmV03JvkVqOauP4,3291
@@ -140,6 +144,7 @@ uk_bin_collection/uk_bin_collection/councils/KirkleesCouncil.py,sha256=WPM7koIqK
 uk_bin_collection/uk_bin_collection/councils/KnowsleyMBCouncil.py,sha256=VdlWDESoHfr_X0r8-UMaLMUQhKZOa2BnpVPkX-1u3EQ,5605
 uk_bin_collection/uk_bin_collection/councils/LancasterCityCouncil.py,sha256=FmHT6oyD4BwWuhxA80PHnGA7HPrLuyjP_54Cg8hT6k4,2537
 uk_bin_collection/uk_bin_collection/councils/LeedsCityCouncil.py,sha256=iSZApZ9oSfSatQ6dAxmykSfti91jGuY6n2BwEkVMOiU,5144
+uk_bin_collection/uk_bin_collection/councils/LeicesterCityCouncil.py,sha256=o3kE8sjThQa4_AvSK5NH8VH7jWFO9MMPgoqLOTjyh0w,1851
 uk_bin_collection/uk_bin_collection/councils/LichfieldDistrictCouncil.py,sha256=l3zgTWuKOW8fgb8PmXv0OTI6HaiGBPndefNQk8MM4oY,1810
 uk_bin_collection/uk_bin_collection/councils/LincolnCouncil.py,sha256=aUCqjHuk0sLtx83a-2agcLIMgEbfqjltXRCBRXT9J-8,3733
 uk_bin_collection/uk_bin_collection/councils/LisburnCastlereaghCityCouncil.py,sha256=vSOzdEwp9ZeUhed7E3eVv9ReD-2XgbSkpyAbVnfc-Gk,3309
@@ -164,7 +169,7 @@ uk_bin_collection/uk_bin_collection/councils/MidAndEastAntrimBoroughCouncil.py,s
 uk_bin_collection/uk_bin_collection/councils/MidDevonCouncil.py,sha256=RjBZ7R3_Pax9p1d2DCygqryjV1RP4BYvqb-rT_KyOEg,3322
 uk_bin_collection/uk_bin_collection/councils/MidSuffolkDistrictCouncil.py,sha256=h6M-v5jVYe7OlQ47Vf-0pEgECZLOOacK3_XE6zbpsM4,6329
 uk_bin_collection/uk_bin_collection/councils/MidSussexDistrictCouncil.py,sha256=AZgC9wmDLEjUOtIFvf0ehF5LHturXTH4DkE3ioPSVBA,6254
-uk_bin_collection/uk_bin_collection/councils/MidlothianCouncil.py,sha256=mM5-itJDNhjsT5UEjSFfWppmfmPFSns4u_1QblewuFU,5605
+uk_bin_collection/uk_bin_collection/councils/MidlothianCouncil.py,sha256=-VKvdIhrs859-YqxsNMzRWm2alP1avBR1_J8O9gJnYw,6725
 uk_bin_collection/uk_bin_collection/councils/MiltonKeynesCityCouncil.py,sha256=7e2pGBLCw24pNItHeI9jkxQ3rEOZ4WC4zVlbvKYGdXE,2600
 uk_bin_collection/uk_bin_collection/councils/MoleValleyDistrictCouncil.py,sha256=xWR5S0gwQu9gXxjl788Wux1KaC0CT7ZFw0iXuRLZCEM,5599
 uk_bin_collection/uk_bin_collection/councils/MonmouthshireCountyCouncil.py,sha256=V3R98D3DtCPZK3RNCg8yR2ddoUz_tOzl2YTgWfjdPX0,2468
@@ -247,7 +252,7 @@ uk_bin_collection/uk_bin_collection/councils/StratfordUponAvonCouncil.py,sha256=
 uk_bin_collection/uk_bin_collection/councils/StroudDistrictCouncil.py,sha256=Akx80Ve7D8RVdIW1vkWLYp80VrhL6Qc3dMMKnbFWUhY,3653
 uk_bin_collection/uk_bin_collection/councils/SunderlandCityCouncil.py,sha256=4DnKyyu56_AwuchD6_oL1dvpDStMvkkxQtYN79rUKOs,3825
 uk_bin_collection/uk_bin_collection/councils/SurreyHeathBoroughCouncil.py,sha256=MROVvf7RSRYYjM2ZDD83rAEwf8BSnqXVrasgBiJC92A,5220
-uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py,sha256=LNewGYrRHPforrsyZO7EaAy7Wx7VXi3I_tZ0SO9VcAA,4408
+uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py,sha256=pAGzj9CUDaU1w0wMEbJIl1fxcW0kWIzvzsU7oYMdgWE,5001
 uk_bin_collection/uk_bin_collection/councils/SwanseaCouncil.py,sha256=nmVPoPhnFgVi--vczX2i4Sf3bqM5RWJuwfhioRUr5XE,2303
 uk_bin_collection/uk_bin_collection/councils/SwindonBoroughCouncil.py,sha256=lSIykpkBjVwQSf3rrnrNuh7YRepgnkKQLbf1iErMuJs,1932
 uk_bin_collection/uk_bin_collection/councils/TamesideMBCouncil.py,sha256=k2TAAZG7n2S1BWVyxbE_-4-lZuzhOimCNz4yimUCOGk,1995
@@ -301,8 +306,8 @@ uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bId
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=EQWRhZ2pEejlvm0fPyOTsOHKvUZmPnxEYO_OWRGKTjs,1158
 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=YvmHfZqanwrJ8ToGch34x-L-7yPe31nB_x77_Mgl_vo,4545
-uk_bin_collection-0.128.6.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.128.6.dist-info/METADATA,sha256=4iZ2Zs9pA4B7EuezyBwaj0rDq8cX5KE98OVl2aQxk3Y,19549
-uk_bin_collection-0.128.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.128.6.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.128.6.dist-info/RECORD,,
+uk_bin_collection-0.130.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.130.0.dist-info/METADATA,sha256=BnCUzurUgw3yydA2WY7gFgwqUBQ2R3h6HGT5RC4wXEo,19549
+uk_bin_collection-0.130.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.130.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.130.0.dist-info/RECORD,,