uk_bin_collection 0.77.0__py3-none-any.whl → 0.78.0__py3-none-any.whl

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/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/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

{uk_bin_collection-0.77.0.dist-info → uk_bin_collection-0.78.0.dist-info}/METADATA

@@ -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.dist-info → uk_bin_collection-0.78.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 uk_bin_collection/README.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uk_bin_collection/tests/council_feature_input_parity.py,sha256=_BINFpWMsMg91Jf1MYydPykOi8gu06x8C-E2AdT0A3Q,5205
 uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
-uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=JfARfiOGbj6ENoieIpFw0XKmkGgm4krWg8sbofgx9k4,16357
-uk_bin_collection/tests/input.json,sha256=PaincPdmWl4MqajMT9-79qGNOK2Zz2cgAY2_bTuy4gk,53745
+uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=KBY8I28P8v-ONJjwQvG23ifiPXCORn-jg-V39nDMI2k,16465
+uk_bin_collection/tests/input.json,sha256=T_vMqcs4bGTlTctCVvy9NiwoAhX1NT42Q0YzybESQxo,54042
 uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
 uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
 uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=Pg3Z7c3zrebx1w-yIZ9xTJ3E-okVndlNIAJL-F46HKU,2962
@@ -57,6 +57,7 @@ uk_bin_collection/uk_bin_collection/councils/EastSuffolkCouncil.py,sha256=qQ0oOf
 uk_bin_collection/uk_bin_collection/councils/EastleighBoroughCouncil.py,sha256=V4Vso4DvawFiezKlmXbTlJEK9Sjhz9nA8WeYjwtO2e4,2310
 uk_bin_collection/uk_bin_collection/councils/EnvironmentFirst.py,sha256=_9QJYDHpdnYK5R6znvZk1w0F9GnPnI8G4b6I_p26h4U,1695
 uk_bin_collection/uk_bin_collection/councils/ErewashBoroughCouncil.py,sha256=QTQA6NjZtTL2baDeerIQW1SQpawwu6kGDMGdVvYQRRo,2501
+uk_bin_collection/uk_bin_collection/councils/FarehamBoroughCouncil.py,sha256=61PRsYvwyG_gYNTUqGtjnKJ-fNrjmZf6bqNbxAwurhQ,2450
 uk_bin_collection/uk_bin_collection/councils/FenlandDistrictCouncil.py,sha256=sFrnKzIE2tIcz0YrC6A9HcevzgNdf6E6_HLGMWDKtGw,2513
 uk_bin_collection/uk_bin_collection/councils/ForestOfDeanDistrictCouncil.py,sha256=xO5gqgsN9K-cQsuDoQF7ycZkjNdCPAQwIYOCFWxFJ_Y,4504
 uk_bin_collection/uk_bin_collection/councils/GatesheadCouncil.py,sha256=Ecq4kMbtAHnQrnxjhC7CG3oEZQ3D1aAk5qXVZk-ouxc,4601
@@ -165,8 +166,8 @@ uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py,sha256=zDDa7n4K_zm5P
 uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bIdsvmoSzBjJAvTTi6yPfJa8xjJx1ys2w,1490
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=4s9ODGPAwPqwXc8SrTX5Wlfmizs3_58iXUtHc4Ir86o,1162
 uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=9qppF2oPkhmOoK8-ZkRIU1M6vhBh-yUCWAZEEd07iLk,5414
-uk_bin_collection-0.77.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.77.0.dist-info/METADATA,sha256=dWmzwfpIqThI-9oJf3jASJodK51-kB5TO1bgM_XJdY0,12594
-uk_bin_collection-0.77.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uk_bin_collection-0.77.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.77.0.dist-info/RECORD,,
+uk_bin_collection-0.78.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.78.0.dist-info/METADATA,sha256=v9XlHA0dAhpDBuF1d6qka2eCRqHc7p0I0Fh651hy4yg,12594
+uk_bin_collection-0.78.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uk_bin_collection-0.78.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.78.0.dist-info/RECORD,,