-
Notifications
You must be signed in to change notification settings - Fork 111
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #948 from m26dvd/master
feat: Council Pack 11
- Loading branch information
Showing
5 changed files
with
339 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
uk_bin_collection/uk_bin_collection/councils/BrecklandCouncil.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| 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": []} | ||
|
|
||
| URI = "https://www.breckland.gov.uk/apiserver/ajaxlibrary" | ||
|
|
||
| data = { | ||
| "id": "1730410741649", | ||
| "jsonrpc": "2.0", | ||
| "method": "Breckland.Whitespace.JointWasteAPI.GetBinCollectionsByUprn", | ||
| "params": {"uprn": user_uprn, "environment": "live"}, | ||
| } | ||
| # Make the GET request | ||
| response = requests.post(URI, json=data) | ||
|
|
||
| # Parse the JSON response | ||
| bin_collection = response.json() | ||
|
|
||
| # Loop through each collection in bin_collection | ||
| for collection in bin_collection["result"]: | ||
| bin_type = collection.get("collectiontype") | ||
| collection_date = collection.get("nextcollection") | ||
|
|
||
| dict_data = { | ||
| "type": bin_type, | ||
| "collectionDate": datetime.strptime( | ||
| collection_date, | ||
| "%d/%m/%Y %H:%M:%S", | ||
| ).strftime("%d/%m/%Y"), | ||
| } | ||
| bindata["bins"].append(dict_data) | ||
|
|
||
| bindata["bins"].sort( | ||
| key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y") | ||
| ) | ||
|
|
||
| return bindata |
120 changes: 120 additions & 0 deletions
120
uk_bin_collection/uk_bin_collection/councils/CotswoldDistrictCouncil.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| import time | ||
| from datetime import datetime | ||
|
|
||
| from bs4 import BeautifulSoup | ||
| from selenium.webdriver.common.by import By | ||
| from selenium.webdriver.common.keys import Keys | ||
| 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: | ||
| page = "https://community.cotswold.gov.uk/s/waste-collection-enquiry" | ||
|
|
||
| data = {"bins": []} | ||
|
|
||
| house_number = kwargs.get("paon") | ||
| postcode = kwargs.get("postcode") | ||
| full_address = f"{house_number}, {postcode}" | ||
| web_driver = kwargs.get("web_driver") | ||
| headless = kwargs.get("headless") | ||
|
|
||
| # Create Selenium webdriver | ||
| driver = create_webdriver(web_driver, headless, None, __name__) | ||
| driver.get(page) | ||
|
|
||
| # If you bang in the house number (or property name) and postcode in the box it should find your property | ||
| wait = WebDriverWait(driver, 60) | ||
| address_entry_field = wait.until( | ||
| EC.presence_of_element_located( | ||
| (By.XPATH, '//*[@id="combobox-input-19"]') | ||
| ) | ||
| ) | ||
|
|
||
| address_entry_field.send_keys(str(full_address)) | ||
|
|
||
| address_entry_field = wait.until( | ||
| EC.element_to_be_clickable((By.XPATH, '//*[@id="combobox-input-19"]')) | ||
| ) | ||
| address_entry_field.click() | ||
| address_entry_field.send_keys(Keys.BACKSPACE) | ||
| address_entry_field.send_keys(str(full_address[len(full_address) - 1])) | ||
|
|
||
| first_found_address = wait.until( | ||
| EC.element_to_be_clickable( | ||
| (By.XPATH, '//*[@id="dropdown-element-19"]/ul') | ||
| ) | ||
| ) | ||
|
|
||
| first_found_address.click() | ||
| # Wait for the 'Select your property' dropdown to appear and select the first result | ||
| next_btn = wait.until( | ||
| EC.element_to_be_clickable((By.XPATH, "//lightning-button/button")) | ||
| ) | ||
| next_btn.click() | ||
| bin_data = wait.until( | ||
| EC.presence_of_element_located( | ||
| (By.XPATH, "//span[contains(text(), 'Container')]") | ||
| ) | ||
| ) | ||
|
|
||
| soup = BeautifulSoup(driver.page_source, features="html.parser") | ||
|
|
||
| rows = soup.find_all("tr", class_="slds-hint-parent") | ||
| current_year = datetime.now().year | ||
|
|
||
| for row in rows: | ||
| columns = row.find_all("td") | ||
| if columns: | ||
| container_type = row.find("th").text.strip() | ||
| if columns[0].get_text() == "Today": | ||
| collection_day = datetime.now().strftime("%a, %d %B") | ||
| elif columns[0].get_text() == "Tomorrow": | ||
| collection_day = (datetime.now() + timedelta(days=1)).strftime( | ||
| "%a, %d %B" | ||
| ) | ||
| else: | ||
| collection_day = re.sub( | ||
| r"[^a-zA-Z0-9,\s]", "", columns[0].get_text() | ||
| ).strip() | ||
|
|
||
| # Parse the date from the string | ||
| parsed_date = datetime.strptime(collection_day, "%a, %d %B") | ||
| if parsed_date < datetime( | ||
| parsed_date.year, parsed_date.month, parsed_date.day | ||
| ): | ||
| parsed_date = parsed_date.replace(year=current_year + 1) | ||
| else: | ||
| parsed_date = parsed_date.replace(year=current_year) | ||
| # Format the date as %d/%m/%Y | ||
| formatted_date = parsed_date.strftime("%d/%m/%Y") | ||
|
|
||
| # Add the bin type and collection date to the 'data' dictionary | ||
| data["bins"].append( | ||
| {"type": container_type, "collectionDate": formatted_date} | ||
| ) | ||
| 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.