Skip to content

Commit

Permalink
feat: Adding Highland Council
Browse files Browse the repository at this point in the history
fix: #780
  • Loading branch information
m26dvd committed Oct 10, 2024
1 parent f117caf commit 9b3769c
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 0 deletions.
7 changes: 7 additions & 0 deletions uk_bin_collection/tests/input.json
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,13 @@
"wiki_name": "Harrogate Borough Council",
"wiki_note": "Pass the UPRN which can be found at https://secure.harrogate.gov.uk/inmyarea URL doesn't need to be passed."
},
"HighlandCouncil": {
"url": "https://www.highland.gov.uk",
"wiki_command_url_override": "https://www.highland.gov.uk",
"uprn": "130072429",
"wiki_name": "Highland Council",
"wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
},
"HighPeakCouncil": {
"house_number": "9 Ellison Street, Glossop",
"postcode": "SK13 8BX",
Expand Down
88 changes: 88 additions & 0 deletions uk_bin_collection/uk_bin_collection/councils/HighlandCouncil.py
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://highland-self.achieveservice.com/authapi/isauthenticated?uri=https%3A%2F%2Fhighland-self.achieveservice.com%2Fen%2Fservice%2FCheck_your_household_bin_collection_days&hostname=highland-self.achieveservice.com&withCredentials=true"

API_URL = "https://highland-self.achieveservice.com/apibroker/runLookup"

data = {
"formValues": {"Your address": {"propertyuprn": {"value": user_uprn}}},
}
headers = {
"Content-Type": "application/json",
"Accept": "application/json",
"User-Agent": "Mozilla/5.0",
"X-Requested-With": "XMLHttpRequest",
"Referer": "https://highland-self.achieveservice.com/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": "660d44a698632",
"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"]["0"]
if not isinstance(rows_data, dict):
raise ValueError("Invalid data returned from API")

use_new = any(k.endswith("New") and v for k, v in rows_data.items())
next_date_key = "NextDateNew" if use_new else "NextDateOld"

for key, value in rows_data.items():
if not (key.endswith("NextDate") or key.endswith(next_date_key)):
continue

bin_type = key.split("NextDate")[0]
if bin_type == "refuse":
bin_type = "Non-recyclable waste"
if bin_type == "fibres":
bin_type = "Paper, card and cardboard recycling"
if bin_type == "containers":
bin_type = "Plastics, metals and cartons recycling"
if bin_type == "garden":
bin_type = "Garden waste"
if bin_type == "food":
bin_type = "Food waste"

try:
date = datetime.strptime(value, "%Y-%m-%d").strftime("%d/%m/%Y")
except ValueError:
continue
dict_data = {"type": bin_type, "collectionDate": date}
bindata["bins"].append(dict_data)

return bindata

0 comments on commit 9b3769c

Please sign in to comment.