Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix Chelmsford City Council #396

Merged
merged 1 commit into from
Oct 29, 2023
+25 −39
Merged

fix: Fix Chelmsford City Council #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions uk_bin_collection/tests/council_schemas/ChelmsfordCityCouncil.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"additionalProperties": false,
"properties": {
"type": {
"$ref": "#/definitions/Type"
"type": "string"
},
"collectionDate": {
"type": "string"
Expand All @@ -34,14 +34,6 @@
"type"
],
"title": "Bin"
},
"Type": {
"type": "string",
"enum": [
"Food waste, black bin, green box, card sack",
"Food waste, brown bin, paper sack, plastic and cartons bag"
],
"title": "Type"
}
}
}
2 changes: 1 addition & 1 deletion uk_bin_collection/tests/input.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"wiki_note": "Replace XXXXXXXX with UPRN keeping \"cbc\" before it."
},
"ChelmsfordCityCouncil": {
"url": "https://www.chelmsford.gov.uk/myhome/?entry[655e95fb-5f84-4d1b-ab65-878a2f3e3ce4]=5527623",
"url": "https://www.chelmsford.gov.uk/myhome/?entry[655e95fb-5f84-4d1b-ab65-878a2f3e3ce4]=14368859",
"wiki_name": "Chelmsford City Council",
"wiki_command_url_override": "https://www.chelmsford.gov.uk/myhome/XXXXXX",
"wiki_note": "Follow the instructions [here](https://www.chelmsford.gov.uk/myhome/) until you get the page listing your \"Address\", \"Ward\" etc then copy the URL and replace the URL in the command."
Expand Down
34 changes: 9 additions & 25 deletions uk_bin_collection/tests/outputs/ChelmsfordCityCouncil.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,40 @@
{
"bins": [
{
"type": "Food waste, brown bin, paper sack, plastic and cartons bag",
"collectionDate": "04/07/2023"
},
{
"type": "Food waste, black bin, green box, card sack",
"collectionDate": "11/07/2023"
},
{
"type": "Food waste, brown bin, paper sack, plastic and cartons bag",
"collectionDate": "18/07/2023"
},
{
"type": "Food waste, black bin, green box, card sack",
"collectionDate": "25/07/2023"
"collectionDate": "03/10/2023"
},
{
"type": "Food waste, brown bin, paper sack, plastic and cartons bag",
"collectionDate": "01/08/2023"
"collectionDate": "10/10/2023"
},
{
"type": "Food waste, black bin, green box, card sack",
"collectionDate": "08/08/2023"
"collectionDate": "17/10/2023"
},
{
"type": "Food waste, brown bin, paper sack, plastic and cartons bag",
"collectionDate": "15/08/2023"
"collectionDate": "24/10/2023"
},
{
"type": "Food waste, black bin, green box, card sack",
"collectionDate": "22/08/2023"
"collectionDate": "31/10/2023"
},
{
"type": "Food waste, brown bin, paper sack, plastic and cartons bag",
"collectionDate": "29/08/2023"
"collectionDate": "07/11/2023"
},
{
"type": "Food waste, black bin, green box, card sack",
"collectionDate": "05/09/2023"
"collectionDate": "14/11/2023"
},
{
"type": "Food waste, brown bin, paper sack, plastic and cartons bag",
"collectionDate": "12/09/2023"
"collectionDate": "21/11/2023"
},
{
"type": "Food waste, black bin, green box, card sack",
"collectionDate": "19/09/2023"
},
{
"type": "Food waste, brown bin, paper sack, plastic and cartons bag",
"collectionDate": "26/09/2023"
"collectionDate": "28/11/2023"
}
]
}
18 changes: 14 additions & 4 deletions uk_bin_collection/uk_bin_collection/councils/ChelmsfordCityCouncil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import re
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
Expand Down Expand Up @@ -32,10 +35,12 @@ def parse_data(self, page: str, **kwargs) -> dict:

# Loop the months
for month in soup.find_all("div", {"class": "usercontent"}):
if month.find("h2"):
year = datetime.strptime(
month.find("h2").get_text(strip=True), "%B %Y"
).strftime("%Y")
year = ""
if month.find("h2") and 'calendar' not in month.find("h2").get_text(strip=True):
year = datetime.strptime(month.find("h2").get_text(strip=True), "%B %Y").strftime("%Y")
elif month.find("h3"):
year = datetime.strptime(month.find("h3").get_text(strip=True), "%B %Y").strftime("%Y")
if year != "":
for row in month.find_all("li"):
results = re.search(
"([A-Za-z]+ \\d\\d? [A-Za-z]+): (.+)", row.get_text(strip=True)
Expand All @@ -49,4 +54,9 @@ def parse_data(self, page: str, **kwargs) -> dict:
}
data["bins"].append(dict_data)

# Sort collections
data["bins"].sort(
key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
)

return data
Loading