feat: Adding Bolsover Council

fix: robbrad#990

uk_bin_collection/tests/input.json

@@ -196,6 +196,12 @@
         "wiki_name": "Blaenau Gwent County Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
+    "BolsoverCouncil": {
+        "url": "https://bolsover.gov.uk",
+        "uprn": "100030066827",
+        "wiki_name": "Bolsover Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "BoltonCouncil": {
         "postcode": "BL1 5PQ",
         "skip_get_url": true,
@@ -1485,7 +1491,7 @@
         "wiki_name": "Rhondda Cynon Taff Council",
         "wiki_note": "To get the UPRN, you can use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
-"RochdaleCouncil": {
+    "RochdaleCouncil": {
         "postcode": "OL11 5BE",
         "skip_get_url": true,
         "uprn": "23049922",

uk_bin_collection/uk_bin_collection/councils/BolsoverCouncil.py

@@ -0,0 +1,298 @@
+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://selfservice.bolsover.gov.uk/authapi/isauthenticated?uri=https%253A%252F%252Fselfservice.bolsover.gov.uk%252Fservice%252FCheck_your_Bin_Day&hostname=selfservice.bolsover.gov.uk&withCredentials=true"
+
+        API_URL = "https://selfservice.bolsover.gov.uk/apibroker/runLookup"
+
+        data = {
+            "formValues": {"Bin Collection": {"uprnLoggedIn": {"value": user_uprn}}},
+        }
+        headers = {
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "User-Agent": "Mozilla/5.0",
+            "X-Requested-With": "XMLHttpRequest",
+            "Referer": "https://selfservice.bolsover.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": "6023d37e037c3",
+            "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")
+
+        # print(rows_data)
+
+        route = rows_data["Route"]
+
+        # print(route)
+
+        def get_route_number(route):
+            if route[:2] == "Mo":
+                return 0
+            elif route[:2] == "Tu":
+                return 1
+            elif route[:2] == "We":
+                return 2
+            elif route[:2] == "Th":
+                return 3
+            elif route[:2] == "Fr":
+                return 4
+            else:
+                return None  # Default case if none of the conditions match
+
+        dayOfCollectionAsNumber = get_route_number(route)
+        # print(dayOfCollectionAsNumber)
+
+        def calculate_collection_date(
+            dayOfCollectionAsNumber,
+            currentDayAsNumber,
+            today,
+            dayDiffPlus,
+            dayDiffMinus,
+        ):
+            if dayOfCollectionAsNumber == currentDayAsNumber:
+                return today
+            elif dayOfCollectionAsNumber > currentDayAsNumber:
+                return today + timedelta(days=dayDiffPlus)
+            else:
+                return today + timedelta(days=dayDiffMinus)
+
+        # Example usage
+        today = datetime.today()  # Current date
+        currentDayAsNumber = today.weekday()
+        dayDiffPlus = dayOfCollectionAsNumber - currentDayAsNumber
+        dayDiffMinus = dayOfCollectionAsNumber - currentDayAsNumber + 7
+
+        week1 = calculate_collection_date(
+            dayOfCollectionAsNumber,
+            currentDayAsNumber,
+            today,
+            dayDiffPlus,
+            dayDiffMinus,
+        )
+        week2 = week1 + timedelta(days=7)
+        week3 = week2 + timedelta(days=7)
+        week4 = week3 + timedelta(days=7)
+
+        # print(week1.strftime(date_format))
+        # print(week2.strftime(date_format))
+        # print(week3.strftime(date_format))
+        # print(week4.strftime(date_format))
+
+        greenSusStart = datetime.strptime("2024-11-08", "%Y-%m-%d")
+        greenSusEnd = datetime.strptime("2025-03-18", "%Y-%m-%d")
+
+        def is_within_green_sus(dtDay0, greenSusStart, greenSusEnd):
+            return "Yes" if greenSusStart <= dtDay0 < greenSusEnd else "No"
+
+        week1InSus = is_within_green_sus(week1, greenSusStart, greenSusEnd)
+        week2InSus = is_within_green_sus(week2, greenSusStart, greenSusEnd)
+        week3InSus = is_within_green_sus(week3, greenSusStart, greenSusEnd)
+        week4InSus = is_within_green_sus(week4, greenSusStart, greenSusEnd)
+
+        # print(week1InSus)
+        # print(week2InSus)
+        # print(week3InSus)
+        # print(week4InSus)
+
+        WeekBlack = rows_data["WeekBlack"]
+        WeekBandG = rows_data["WeekBandG"]
+
+        if WeekBlack == "1":
+            WeekBandG = ""
+        if WeekBandG == "1":
+            WeekBlack = ""
+
+        def determine_bin_collection_week1(
+            txtBlack, txtBurgGreen, dtDay0, today, week1InSus
+        ):
+            # Check for empty values
+            if txtBlack == "" and txtBurgGreen == "":
+                return ""
+
+            # Black Bin Collection
+            if txtBlack == "1" and dtDay0 >= today:
+                return "Black Bin"
+
+            # Burgundy Bin Collection
+            if txtBurgGreen == "1" and dtDay0 > today:
+                if week1InSus == "Yes":
+                    return "Burgundy Bin"
+                elif week1InSus == "No":
+                    return "Burgundy Bin & Green Bin"
+
+            # Default cases based on week1InSus
+            if txtBlack == "" and dtDay0 >= today:
+                if week1InSus == "Yes":
+                    return "Burgundy Bin"
+                elif week1InSus == "No":
+                    return "Burgundy Bin & Green Bin"
+
+            return ""  # Default empty case
+
+        def determine_bin_collection_week2(
+            txtBlack, txtBurgGreen, dtDay7, today, week2InSus
+        ):
+            # Check for empty values
+            if txtBlack == "" and txtBurgGreen == "":
+                return ""
+
+            # Black Bin Collection
+            if txtBlack == "" and dtDay7 >= today:
+                return "Black Bin"
+
+            # Burgundy Bin Collection (week2InSus check)
+            if txtBurgGreen == "1" and dtDay7 > today:
+                if week2InSus == "Yes":
+                    return "Burgundy Bin"
+                elif week2InSus == "No":
+                    return "Burgundy Bin & Green Bin"
+
+            # Burgundy Bin Collection for txtBlack = '1'
+            if txtBlack == "1" and dtDay7 >= today:
+                if week2InSus == "Yes":
+                    return "Burgundy Bin"
+                elif week2InSus == "No":
+                    return "Burgundy Bin & Green Bin"
+
+            return ""  # Default empty case
+
+        def determine_bin_collection_week3(
+            txtBlack, txtBurgGreen, dtDay14, today, week3InSus
+        ):
+            # Check for empty values
+            if txtBlack == "" and txtBurgGreen == "":
+                return ""
+
+            # Black Bin Collection
+            if txtBlack == "1" and dtDay14 >= today:
+                return "Black Bin"
+
+            # Burgundy Bin Collection (week3InSus check)
+            if txtBurgGreen == "1" and dtDay14 > today:
+                if week3InSus == "Yes":
+                    return "Burgundy Bin"
+                elif week3InSus == "No":
+                    return "Burgundy Bin & Green Bin"
+
+            # Burgundy Bin Collection for txtBlack = ''
+            if txtBlack == "" and dtDay14 >= today:
+                if week3InSus == "Yes":
+                    return "Burgundy Bin"
+                elif week3InSus == "No":
+                    return "Burgundy Bin & Green Bin"
+
+            return ""  # Default empty case
+
+        def determine_bin_collection_week4(
+            txtBlack, txtBurgGreen, dtDay21, today, week4InSus
+        ):
+            # Check for empty values
+            if txtBlack == "" and txtBurgGreen == "":
+                return ""
+
+            # Black Bin Collection
+            if txtBlack == "" and dtDay21 >= today:
+                return "Black Bin"
+
+            # Burgundy Bin Collection (week4InSus check)
+            if txtBurgGreen == "1" and dtDay21 > today:
+                if week4InSus == "Yes":
+                    return "Burgundy Bin"
+                elif week4InSus == "No":
+                    return "Burgundy Bin & Green Bin"
+
+            # Burgundy Bin Collection for txtBlack = '1'
+            if txtBlack == "1" and dtDay21 >= today:
+                if week4InSus == "Yes":
+                    return "Burgundy Bin"
+                elif week4InSus == "No":
+                    return "Burgundy Bin & Green Bin"
+
+            return ""  # Default empty case
+
+        week1Text = determine_bin_collection_week1(
+            WeekBlack, WeekBandG, week1, today, week1InSus
+        )
+        week2Text = determine_bin_collection_week2(
+            WeekBlack, WeekBandG, week2, today, week2InSus
+        )
+        week3Text = determine_bin_collection_week3(
+            WeekBlack, WeekBandG, week3, today, week3InSus
+        )
+        week4Text = determine_bin_collection_week4(
+            WeekBlack, WeekBandG, week4, today, week4InSus
+        )
+
+        # print(week1Text)
+        # print(week2Text)
+        # print(week3Text)
+        # print(week4Text)
+
+        week_data = [
+            (week1Text, week1),
+            (week2Text, week2),
+            (week3Text, week3),
+            (week4Text, week4),
+        ]
+
+        # print(week_data)
+
+        # Iterate through the array
+        for week_text, week_date in week_data:
+            # Check if '&' exists and split
+            if "&" in week_text:
+                split_texts = [text.strip() for text in week_text.split("&")]
+                for text in split_texts:
+                    dict_data = {
+                        "type": text,
+                        "collectionDate": week_date.strftime(date_format),
+                    }
+                    bindata["bins"].append(dict_data)
+            else:
+                dict_data = {
+                    "type": week_text,
+                    "collectionDate": week_date.strftime(date_format),
+                }
+                bindata["bins"].append(dict_data)
+
+        return bindata

wiki/Councils.md

@@ -36,6 +36,7 @@ This document is still a work in progress, don't worry if your council isn't lis
 - [Blaby District Council](#blaby-district-council)
 - [Blackburn Council](#blackburn-council)
 - [Blaenau Gwent County Borough Council](#blaenau-gwent-county-borough-council)
+- [Bolsover Council](#bolsover-council)
 - [Bolton Council](#bolton-council)
 - [Boston Borough Council](#boston-borough-council)
 - [Bracknell Forest Council](#bracknell-forest-council)
@@ -621,6 +622,17 @@ Note: You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/searc
 
 ---
 
+### Bolsover Council
+```commandline
+python collect_data.py BolsoverCouncil https://bolsover.gov.uk -u XXXXXXXX
+```
+Additional parameters:
+- `-u` - UPRN
+
+Note: You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.
+
+---
+
 ### Bolton Council
 ```commandline
 python collect_data.py BoltonCouncil https://carehomes.bolton.gov.uk/bins.aspx -s -u XXXXXXXX -p "XXXX XXX" -w http://HOST:PORT/