fix: #1604 - West Berkshire Council

fix: #1604 - West Berkshire Council

Author: m26dvd

uk_bin_collection/uk_bin_collection/councils/WestBerkshireCouncil.py

@@ -38,15 +38,15 @@ def parse_data(self, page: str, **kwargs) -> dict:
             # Wait for the postcode field to appear then populate it
             inputElement_postcode = WebDriverWait(driver, 30).until(
                 EC.presence_of_element_located(
-                    (By.ID, "FINDYOURBINDAYS_ADDRESSLOOKUPPOSTCODE")
+                    (By.ID, "FINDYOURBINDAYS3WEEKLY_ADDRESSLOOKUPPOSTCODE")
                 )
             )
             inputElement_postcode.send_keys(user_postcode)
 
             # Click search button
             findAddress = WebDriverWait(driver, 10).until(
                 EC.presence_of_element_located(
-                    (By.ID, "FINDYOURBINDAYS_ADDRESSLOOKUPSEARCH")
+                    (By.ID, "FINDYOURBINDAYS3WEEKLY_ADDRESSLOOKUPSEARCH")
                 )
             )
             findAddress.click()
@@ -56,7 +56,7 @@ def parse_data(self, page: str, **kwargs) -> dict:
                     (
                         By.XPATH,
                         ""
-                        "//*[@id='FINDYOURBINDAYS_ADDRESSLOOKUPADDRESS']//option[contains(., '"
+                        "//*[@id='FINDYOURBINDAYS3WEEKLY_ADDRESSLOOKUPADDRESS']//option[contains(., '"
                         + user_paon
                         + "')]",
                     )
@@ -66,18 +66,21 @@ def parse_data(self, page: str, **kwargs) -> dict:
             # Wait for the submit button to appear, then click it to get the collection dates
             WebDriverWait(driver, 30).until(
                 EC.presence_of_element_located(
-                    (By.XPATH, '//*[@id="FINDYOURBINDAYS_RUBBISHDATE"]/div')
+                    (
+                        By.XPATH,
+                        '//*[@id="FINDYOURBINDAYS3WEEKLY_RUBBISHRECYCLEFOODDATE"]/div',
+                    )
                 )
             )
             time.sleep(2)
 
             soup = BeautifulSoup(driver.page_source, features="html.parser")
             soup.prettify()
 
-            rubbish_div = soup.find(
-                "div", {"id": "FINDYOURBINDAYS_RUBBISHDATE_OUTERDIV"}
+            rubbish_div = soup.find("div", {"class": "rubbish_collection_difs_black"})
+            rubbish_date = rubbish_div.find(
+                "div", {"class": "rubbish_date_container_left_datetext"}
             )
-            rubbish_date = rubbish_div.find_all("div")[2]
             if rubbish_date.text == "Today":
                 rubbish_date = datetime.now()
             else:
@@ -86,10 +89,10 @@ def parse_data(self, page: str, **kwargs) -> dict:
                     "%A %d %B",
                 ).replace(year=datetime.now().year)
 
-            recycling_div = soup.find(
-                "div", {"id": "FINDYOURBINDAYS_RECYCLINGDATE_OUTERDIV"}
+            recycling_div = soup.find("div", {"class": "rubbish_collection_difs_green"})
+            recycling_date = recycling_div.find(
+                "div", {"class": "rubbish_date_container_left_datetext"}
             )
-            recycling_date = recycling_div.find_all("div")[2]
             if recycling_date.text == "Today":
                 recycling_date = datetime.now()
             else:
@@ -98,10 +101,10 @@ def parse_data(self, page: str, **kwargs) -> dict:
                     "%A %d %B",
                 ).replace(year=datetime.now().year)
 
-            food_div = soup.find(
-                "div", {"id": "FINDYOURBINDAYS_FOODWASTEDATE_OUTERDIV"}
+            food_div = soup.find("div", {"class": "rubbish_collection_difs_purple"})
+            food_date = food_div.find(
+                "div", {"class": "rubbish_date_container_left_datetext"}
             )
-            food_date = food_div.find_all("div")[2]
             if food_date.text == "Today":
                 food_date = datetime.now()
             else: