-
Notifications
You must be signed in to change notification settings - Fork 105
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 #913 from m26dvd/master
feat: Council Pack 7
- Loading branch information
Showing
7 changed files
with
466 additions
and
0 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
52 changes: 52 additions & 0 deletions
52
uk_bin_collection/uk_bin_collection/councils/AberdeenshireCouncil.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,52 @@ | ||
| 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_uprn = kwargs.get("uprn") | ||
| check_uprn(user_uprn) | ||
| bindata = {"bins": []} | ||
|
|
||
| URI = f"https://online.aberdeenshire.gov.uk/Apps/Waste-Collections/Routes/Route/{user_uprn}" | ||
|
|
||
| # Make the GET request | ||
| response = requests.get(URI) | ||
|
|
||
| soup = BeautifulSoup(response.content, features="html.parser") | ||
| soup.prettify() | ||
|
|
||
| for collection in soup.find("table").find("tbody").find_all("tr"): | ||
| th = collection.find("th") | ||
| if th: | ||
| continue | ||
| td = collection.find_all("td") | ||
| collection_date = datetime.strptime( | ||
| td[0].text, | ||
| "%d/%m/%Y %A", | ||
| ) | ||
| bin_type = td[1].text.split(" and ") | ||
|
|
||
| for bin in bin_type: | ||
| dict_data = { | ||
| "type": bin, | ||
| "collectionDate": collection_date.strftime(date_format), | ||
| } | ||
| bindata["bins"].append(dict_data) | ||
|
|
||
| bindata["bins"].sort( | ||
| key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y") | ||
| ) | ||
|
|
||
| return bindata |
54 changes: 54 additions & 0 deletions
54
uk_bin_collection/uk_bin_collection/councils/CanterburyCityCouncil.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,54 @@ | ||
| 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": []} | ||
|
|
||
| data = {"uprn": user_uprn, "usrn": "1"} | ||
|
|
||
| URI = ( | ||
| "https://zbr7r13ke2.execute-api.eu-west-2.amazonaws.com/Beta/get-bin-dates" | ||
| ) | ||
|
|
||
| # Make the GET request | ||
| response = requests.post(URI, json=data) | ||
| response.raise_for_status() | ||
|
|
||
| # Parse the JSON response | ||
| bin_collection = json.loads(response.json()["dates"]) | ||
| collections = { | ||
| "General": bin_collection["blackBinDay"], | ||
| "Recycling": bin_collection["recyclingBinDay"], | ||
| "Food": bin_collection["foodBinDay"], | ||
| "Garden": bin_collection["gardenBinDay"], | ||
| } | ||
| # Loop through each collection in bin_collection | ||
| for collection in collections: | ||
| print(collection) | ||
|
|
||
| if len(collections[collection]) <= 0: | ||
| continue | ||
| for date in collections[collection]: | ||
| date = ( | ||
| datetime.strptime(date, "%Y-%m-%dT%H:%M:%S").strftime("%d/%m/%Y"), | ||
| ) | ||
| dict_data = {"type": collection, "collectionDate": date[0]} | ||
| bindata["bins"].append(dict_data) | ||
|
|
||
| return bindata |
81 changes: 81 additions & 0 deletions
81
uk_bin_collection/uk_bin_collection/councils/LutonBoroughCouncil.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,81 @@ | ||
| import time | ||
|
|
||
| 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_uprn = kwargs.get("uprn") | ||
| check_uprn(user_uprn) | ||
| bindata = {"bins": []} | ||
|
|
||
| SESSION_URL = "https://myforms.luton.gov.uk/authapi/isauthenticated?uri=https%253A%252F%252Fmyforms.luton.gov.uk%252Fservice%252FFind_my_bin_collection_date&hostname=myforms.luton.gov.uk&withCredentials=true" | ||
|
|
||
| API_URL = "https://myforms.luton.gov.uk/apibroker/runLookup" | ||
|
|
||
| data = { | ||
| "formValues": { | ||
| "Find my bin collection date": { | ||
| "id": { | ||
| "value": f"1-{user_uprn}", | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| headers = { | ||
| "Content-Type": "application/json", | ||
| "Accept": "application/json", | ||
| "User-Agent": "Mozilla/5.0", | ||
| "X-Requested-With": "XMLHttpRequest", | ||
| "Referer": "https://myforms.luton.gov.uk/fillform/?iframe_id=fillform-frame-1&db_id=", | ||
| } | ||
| s = requests.session() | ||
| r = s.get(SESSION_URL) | ||
| r.raise_for_status() | ||
| session_data = r.json() | ||
| sid = session_data["auth-session"] | ||
| params = { | ||
| "id": "65cb710f8d525", | ||
| "repeat_against": "", | ||
| "noRetry": "true", | ||
| "getOnlyTokens": "undefined", | ||
| "log_id": "", | ||
| "app_name": "AF-Renderer::Self", | ||
| # unix_timestamp | ||
| "_": str(int(time.time() * 1000)), | ||
| "sid": sid, | ||
| } | ||
| r = s.post(API_URL, json=data, headers=headers, params=params) | ||
| r.raise_for_status() | ||
| data = r.json() | ||
| rows_data = data["integration"]["transformed"]["rows_data"][f"{user_uprn}"] | ||
|
|
||
| soup = BeautifulSoup(rows_data["html"], features="html.parser") | ||
| soup.prettify() | ||
| for collection in soup.find_all("tr"): | ||
| tds = collection.find_all("td") | ||
| bin_type = tds[1].text | ||
| collection_date = datetime.strptime( | ||
| tds[0].text, | ||
| "%A %d %b %Y", | ||
| ) | ||
| dict_data = { | ||
| "type": bin_type, | ||
| "collectionDate": collection_date.strftime(date_format), | ||
| } | ||
| bindata["bins"].append(dict_data) | ||
|
|
||
| return bindata |
56 changes: 56 additions & 0 deletions
56
uk_bin_collection/uk_bin_collection/councils/SwindonBoroughCouncil.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,56 @@ | ||
| import time | ||
|
|
||
| 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_uprn = kwargs.get("uprn") | ||
| check_uprn(user_uprn) | ||
| bindata = {"bins": []} | ||
|
|
||
| URI = f"https://www.swindon.gov.uk/info/20122/rubbish_and_recycling_collection_days?addressList={user_uprn}&uprnSubmit=Yes" | ||
|
|
||
| # Make the GET request | ||
| response = requests.get(URI) | ||
|
|
||
| # Parse the JSON response | ||
| soup = BeautifulSoup(response.text, "html.parser") | ||
|
|
||
| bin_collection_content = soup.find_all( | ||
| "div", {"class": "bin-collection-content"} | ||
| ) | ||
| for content in bin_collection_content: | ||
| content_left = content.find("div", {"class": "content-left"}) | ||
| content_right = content.find("div", {"class": "content-right"}) | ||
| if content_left and content_right: | ||
|
|
||
| bin_types = content_left.find("h3").text.split(" and ") | ||
| for bin_type in bin_types: | ||
|
|
||
| collection_date = datetime.strptime( | ||
| content_right.find( | ||
| "span", {"class": "nextCollectionDate"} | ||
| ).text, | ||
| "%A, %d %B %Y", | ||
| ).strftime(date_format) | ||
|
|
||
| dict_data = { | ||
| "type": bin_type, | ||
| "collectionDate": collection_date, | ||
| } | ||
| bindata["bins"].append(dict_data) | ||
|
|
||
| return bindata |
Oops, something went wrong.