-
Notifications
You must be signed in to change notification settings - Fork 100
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 #1020 from m26dvd/master
feat: Council Pack 17
- Loading branch information
Showing
7 changed files
with
528 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
122 changes: 122 additions & 0 deletions
122
uk_bin_collection/uk_bin_collection/councils/AberdeenCityCouncil.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,122 @@ | ||
| 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": []} | ||
|
|
||
| SESSION_URL = "https://integration.aberdeencity.gov.uk/authapi/isauthenticated?uri=https%253A%252F%252Fintegration.aberdeencity.gov.uk%252Fservice%252Fbin_collection_calendar___view&hostname=integration.aberdeencity.gov.uk&withCredentials=true" | ||
|
|
||
| API_URL = "https://integration.aberdeencity.gov.uk/apibroker/runLookup" | ||
|
|
||
| headers = { | ||
| "Content-Type": "application/json", | ||
| "Accept": "application/json", | ||
| "User-Agent": "Mozilla/5.0", | ||
| "X-Requested-With": "XMLHttpRequest", | ||
| "Referer": "https://integration.aberdeencity.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": "583c08ffc47fe", | ||
| "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, headers=headers, params=params) | ||
| r.raise_for_status() | ||
|
|
||
| data = r.json() | ||
| rows_data = data["integration"]["transformed"]["rows_data"]["0"] | ||
| if not isinstance(rows_data, dict): | ||
| raise ValueError("Invalid data returned from API") | ||
| token = rows_data["token"] | ||
|
|
||
| data = { | ||
| "formValues": { | ||
| "Section 1": { | ||
| "nauprn": { | ||
| "value": user_uprn, | ||
| }, | ||
| "token": { | ||
| "value": token, | ||
| }, | ||
| "mindate": { | ||
| "value": datetime.now().strftime("%Y-%m-%d"), | ||
| }, | ||
| "maxdate": { | ||
| "value": (datetime.now() + timedelta(days=30)).strftime( | ||
| "%Y-%m-%d" | ||
| ), | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| params = { | ||
| "id": "5a3141caf4016", | ||
| "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"]["0"] | ||
| if not isinstance(rows_data, dict): | ||
| raise ValueError("Invalid data returned from API") | ||
|
|
||
| date_pattern = re.compile(r"^(.*?)(Date\d+)$") | ||
| count_pattern = re.compile(r"^Count(.*)$") | ||
| for key, value in rows_data.items(): | ||
| date_match = date_pattern.match(key) | ||
| # Match count keys | ||
| count_match = count_pattern.match(key) | ||
| if count_match: | ||
| continue | ||
|
|
||
| # Match date keys | ||
| date_match = date_pattern.match(key) | ||
| if date_match: | ||
| bin_type = date_match.group(1) | ||
| dict_data = { | ||
| "type": bin_type, | ||
| "collectionDate": datetime.strptime(value, "%A %d %B %Y").strftime( | ||
| date_format | ||
| ), | ||
| } | ||
| bindata["bins"].append(dict_data) | ||
|
|
||
| return bindata |
70 changes: 70 additions & 0 deletions
70
uk_bin_collection/uk_bin_collection/councils/BraintreeDistrictCouncil.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,70 @@ | ||
| 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_postcode = kwargs.get("postcode") | ||
| user_uprn = kwargs.get("uprn") | ||
| check_postcode(user_postcode) | ||
| check_uprn(user_uprn) | ||
| bindata = {"bins": []} | ||
|
|
||
| URI = "https://www.braintree.gov.uk/xfp/form/554" | ||
|
|
||
| response = requests.get(URI) | ||
| soup = BeautifulSoup(response.content, "html.parser") | ||
| token = (soup.find("input", {"name": "__token"})).get("value") | ||
|
|
||
| headers = { | ||
| "Content-Type": "application/x-www-form-urlencoded", | ||
| "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.0.0 Safari/537.36", | ||
| "Referer": "https://www.braintree.gov.uk/xfp/form/554", | ||
| } | ||
|
|
||
| form_data = { | ||
| "__token": token, | ||
| "page": "5730", | ||
| "locale": "en_GB", | ||
| "qe15dda0155d237d1ea161004d1839e3369ed4831_0_0": user_postcode, | ||
| "qe15dda0155d237d1ea161004d1839e3369ed4831_1_0": user_uprn, | ||
| "next": "Next", | ||
| } | ||
| collection_lookup = requests.post(URI, data=form_data, headers=headers) | ||
| collection_lookup.raise_for_status() | ||
| for results in BeautifulSoup(collection_lookup.text, "html.parser").find_all( | ||
| "div", class_="date_display" | ||
| ): | ||
| collection_info = results.text.strip().split("\n") | ||
| collection_type = collection_info[0].strip() | ||
|
|
||
| # Skip if no collection date is found | ||
| if len(collection_info) < 2: | ||
| continue | ||
|
|
||
| collection_date = collection_info[1].strip() | ||
|
|
||
| dict_data = { | ||
| "type": collection_type, | ||
| "collectionDate": collection_date, | ||
| } | ||
| bindata["bins"].append(dict_data) | ||
|
|
||
| bindata["bins"].sort( | ||
| key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y") | ||
| ) | ||
|
|
||
| return bindata |
88 changes: 88 additions & 0 deletions
88
uk_bin_collection/uk_bin_collection/councils/BurnleyBoroughCouncil.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,88 @@ | ||
| 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": []} | ||
|
|
||
| SESSION_URL = "https://your.burnley.gov.uk/authapi/isauthenticated?uri=https%253A%252F%252Fyour.burnley.gov.uk%252Fen%252FAchieveForms%252F%253Fform_uri%253Dsandbox-publish%253A%252F%252FAF-Process-b41dcd03-9a98-41be-93ba-6c172ba9f80c%252FAF-Stage-edb97458-fc4d-4316-b6e0-85598ec7fce8%252Fdefinition.json%2526redirectlink%253D%25252Fen%2526cancelRedirectLink%253D%25252Fen%2526consentMessage%253Dyes&hostname=your.burnley.gov.uk&withCredentials=true" | ||
|
|
||
| API_URL = "https://your.burnley.gov.uk/apibroker/runLookup" | ||
|
|
||
| headers = { | ||
| "Content-Type": "application/json", | ||
| "Accept": "application/json", | ||
| "User-Agent": "Mozilla/5.0", | ||
| "X-Requested-With": "XMLHttpRequest", | ||
| "Referer": "https://your.burnley.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"] | ||
|
|
||
| data = { | ||
| "formValues": { | ||
| "Section 1": { | ||
| "case_uprn1": { | ||
| "value": user_uprn, | ||
| } | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| params = { | ||
| "id": "607fe757df87c", | ||
| "repeat_against": "", | ||
| "noRetry": "false", | ||
| "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"] | ||
| if not isinstance(rows_data, dict): | ||
| raise ValueError("Invalid data returned from API") | ||
|
|
||
| current_year = (datetime.now()).year | ||
| for key, value in rows_data.items(): | ||
| bin_type = value["display"].split(" - ")[0] | ||
| collection_date = datetime.strptime( | ||
| value["display"].split(" - ")[1], "%A %d %B" | ||
| ) | ||
|
|
||
| if collection_date.month == 1: | ||
| collection_date = collection_date.replace(year=current_year + 1) | ||
| else: | ||
| collection_date = collection_date.replace(year=current_year) | ||
|
|
||
| dict_data = { | ||
| "type": bin_type, | ||
| "collectionDate": collection_date.strftime(date_format), | ||
| } | ||
| bindata["bins"].append(dict_data) | ||
|
|
||
| return bindata |
Oops, something went wrong.