uk_bin_collection 0.77.0__tar.gz → 0.78.0__tar.gz

{uk_bin_collection-0.77.0 → uk_bin_collection-0.78.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.77.0
+Version: 0.78.0
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com

{uk_bin_collection-0.77.0 → uk_bin_collection-0.78.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uk_bin_collection"
-version = "0.77.0"
+version = "0.78.0"
 description = "Python Lib to collect UK Bin Data"
 readme = "README.md"
 authors = ["Robert Bradley <robbrad182@gmail.com>"]

{uk_bin_collection-0.77.0 → uk_bin_collection-0.78.0}/uk_bin_collection/tests/features/validate_council_outputs.feature

@@ -241,6 +241,11 @@ Feature: Test each council output matches expected results
 		| council |
 		| ErewashBoroughCouncil |
 
+        @FarehamBoroughCouncil
+		Examples: FarehamBoroughCouncil
+		| council |
+		| FarehamBoroughCouncil |
+
         @FenlandDistrictCouncil
 		Examples: FenlandDistrictCouncil
 		| council |

{uk_bin_collection-0.77.0 → uk_bin_collection-0.78.0}/uk_bin_collection/tests/input.json

@@ -342,6 +342,12 @@
         "url": "https://map.erewash.gov.uk/isharelive.web/myerewash.aspx",
         "wiki_name": "Erewash Borough Council"
     },
+    "FarehamBoroughCouncil": {
+        "postcode": "PO14 4NR",        
+        "skip_get_url": true,
+        "url": "https://www.fareham.gov.uk/internetlookups/search_data.aspx?type=JSON&list=DomesticBinCollections&Road=&Postcode=PO14%204NR",
+        "wiki_name": "Fareham Borough Council"
+    },
     "FenlandDistrictCouncil": {
         "skip_get_url": true,
         "uprn": "200002981143",

uk_bin_collection-0.78.0/uk_bin_collection/uk_bin_collection/councils/FarehamBoroughCouncil.py

@@ -0,0 +1,69 @@
+import json
+
+import requests
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+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")
+        check_postcode(user_postcode)
+
+        headers = {
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36",
+        }
+        params = {
+            "type": "JSON",
+            "list": "DomesticBinCollections",
+            "Road": "",
+            "Postcode": user_postcode
+        }
+
+        response = requests.get(
+            "https://www.fareham.gov.uk/internetlookups/search_data.aspx",
+            params  = params,
+            headers = headers
+        )
+
+        bin_data = response.json()["data"]
+        data = {"bins": []}
+
+        if "rows" in bin_data:
+            collection_str = bin_data["rows"][0]["DomesticBinDay"]
+            
+            results = re.findall(r"(\d\d?\/\d\d?\/\d{4}) \((\w*)\)", collection_str)
+
+            if results:
+                    for result in results:
+                        collection_date = datetime.strptime(result[0], "%d/%m/%Y")
+                        dict_data = {
+                            "type": result[1],
+                            "collectionDate": collection_date.strftime(date_format),
+                        }
+                        data["bins"].append(dict_data)
+
+                        # Garden waste is also collected on recycling day
+                        if (dict_data["type"] == "Recycling"):
+                            garden_data = {
+                                "type": "Garden",
+                                "collectionDate": dict_data["collectionDate"],
+                            }
+                            data["bins"].append(garden_data)
+            else:
+                raise RuntimeError("Dates not parsed correctly.")
+        else:
+            raise ValueError("Postcode not found on website.")
+
+        data["bins"].sort(
+            key=lambda x: datetime.strptime(
+            x.get("collectionDate"), "%d/%m/%Y"
+            )
+        )
+
+        return data