Merge pull request #402 from UKGovernmentBEIS/PC-1465-Stop-old-EPCs-s…

…howing-in-EPC-select

PC-1465: stop old epcs showing in epc select

help_to_heat/frontdoor/mock_epc_api_data/sample_search_response.json

@@ -281,6 +281,100 @@
       "low-energy-lighting": "0",
       "walls-description": "Sandstone, as built, no insulation (assumed)",
       "hotwater-description": "Electric immersion, standard tariff"
+    },
+    {
+      "low-energy-fixed-light-count": "",
+      "address": "22 Acacia Avenue, Upper Wellgood, Fulchester, FL23 4JA",
+      "uprn-source": "Address Matched",
+      "floor-height": "2.833",
+      "heating-cost-potential": "1100",
+      "unheated-corridor-length": "2.05",
+      "hot-water-cost-potential": "166",
+      "construction-age-band": "England and Wales: before 1900",
+      "potential-energy-rating": "F",
+      "mainheat-energy-eff": "Very Poor",
+      "windows-env-eff": "Average",
+      "lighting-energy-eff": "Very Poor",
+      "environment-impact-potential": "28",
+      "glazed-type": "double glazing, unknown install date",
+      "heating-cost-current": "1916",
+      "address3": "",
+      "mainheatcont-description": "Programmer and appliance thermostats",
+      "sheating-energy-eff": "N/A",
+      "property-type": "Maisonette",
+      "local-authority-label": "Westminster",
+      "fixed-lighting-outlets-count": "",
+      "energy-tariff": "Unknown",
+      "mechanical-ventilation": "natural",
+      "hot-water-cost-current": "365",
+      "county": "Greater London Authority",
+      "postcode": "FL23 4JA",
+      "solar-water-heating-flag": "N",
+      "constituency": "E14000639",
+      "co2-emissions-potential": "9.9",
+      "number-heated-rooms": "3",
+      "floor-description": "(other premises below)",
+      "energy-consumption-potential": "602",
+      "local-authority": "E09000033",
+      "built-form": "NO DATA!",
+      "number-open-fireplaces": "0",
+      "windows-description": "Fully double glazed",
+      "glazed-area": "Normal",
+      "inspection-date": "2010-07-20",
+      "mains-gas-flag": "N",
+      "co2-emiss-curr-per-floor-area": "81",
+      "address1": "22 Acacia Avenue",
+      "heat-loss-corridor": "unheated corridor",
+      "flat-storey-count": "5.0",
+      "constituency-label": "Cities of London and Westminster",
+      "roof-energy-eff": "Very Poor",
+      "total-floor-area": "109.021",
+      "building-reference-number": "8502528768",
+      "environment-impact-current": "33",
+      "co2-emissions-current": "8.8",
+      "roof-description": "Pitched, no insulation (assumed)",
+      "floor-energy-eff": "N/A",
+      "number-habitable-rooms": "3",
+      "address2": "Upper Wellgood",
+      "hot-water-env-eff": "Poor",
+      "posttown": "Fulchester",
+      "mainheatc-energy-eff": "Good",
+      "main-fuel": "electricity - this is for backwards compatibility only and should not be used",
+      "lighting-env-eff": "Very Poor",
+      "windows-energy-eff": "Average",
+      "floor-env-eff": "N/A",
+      "sheating-env-eff": "N/A",
+      "lighting-description": "No low energy lighting",
+      "roof-env-eff": "Very Poor",
+      "walls-energy-eff": "Very Poor",
+      "photo-supply": "0.0",
+      "lighting-cost-potential": "136",
+      "mainheat-env-eff": "Poor",
+      "multi-glaze-proportion": "100",
+      "main-heating-controls": "2603",
+      "lodgement-datetime": "2010-07-20 16:38:12",
+      "flat-top-storey": "Y",
+      "current-energy-rating": "G",
+      "secondheat-description": "None",
+      "walls-env-eff": "Very Poor",
+      "transaction-type": "rental (private)",
+      "uprn": "001234567890",
+      "current-energy-efficiency": "8",
+      "energy-consumption-current": "538",
+      "mainheat-description": "Room heaters, electric",
+      "lighting-cost-current": "121",
+      "lodgement-date": "2010-07-20",
+      "extension-count": "0",
+      "mainheatc-env-eff": "Good",
+      "lmk-key": "333333333333333333333333333333333",
+      "wind-turbine-count": "0",
+      "tenure": "rental (private)",
+      "floor-level": "3rd",
+      "potential-energy-efficiency": "35",
+      "hot-water-energy-eff": "Very Poor",
+      "low-energy-lighting": "0",
+      "walls-description": "Sandstone, as built, no insulation (assumed)",
+      "hotwater-description": "Electric immersion, standard tariff"
     }
   ]
 }

help_to_heat/frontdoor/views.py

@@ -624,9 +624,9 @@ def save_post_data(self, data, session_id, page_name):
         try:
             if country != country_field_scotland:
                 address_and_lmk_details = interface.api.epc.get_address_and_epc_lmk(building_name_or_number, postcode)
-
                 if len(address_and_lmk_details) > 0:
-                    data[address_all_address_and_lmk_details_field] = address_and_lmk_details
+                    most_recent_address_and_lmk_details = utils.get_most_recent_epc_per_uprn(address_and_lmk_details)
+                    data[address_all_address_and_lmk_details_field] = most_recent_address_and_lmk_details
                     data[address_choice_field] = address_choice_field_write_address
                 else:
                     data[address_choice_field] = address_choice_field_epc_api_fail

help_to_heat/locale/cy/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-15 17:05+0000\n"
+"POT-Creation-Date: 2024-11-25 11:59+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -1585,11 +1585,11 @@ msgid ""
 "updated."
 msgstr ""
 "Os oes EPC newydd wedi'i rhoi i’ch eiddo chi ers 1 "
-"%(scottish_epc_cutoff_month)s, efallai na fyddwn yn gallu dod o hyd iddi yn ein "
-"cronfa ddata am mai dim ond bob chwarter y bydd honno’n cael ei diweddaru. "
-"Os nad ydych chi’n adnabod yr EPC isod fel eich un ddiweddaraf chi, dewch yn "
-"ôl i'r gwasanaeth yma ar ôl 1 %(next_scottish_dump_month)s pan ydyn ni’n disgwyl y "
-"bydd y gronfa ddata wedi'i diweddaru."
+"%(scottish_epc_cutoff_month)s, efallai na fyddwn yn gallu dod o hyd iddi yn "
+"ein cronfa ddata am mai dim ond bob chwarter y bydd honno’n cael ei "
+"diweddaru. Os nad ydych chi’n adnabod yr EPC isod fel eich un ddiweddaraf "
+"chi, dewch yn ôl i'r gwasanaeth yma ar ôl 1 %(next_scottish_dump_month)s pan "
+"ydyn ni’n disgwyl y bydd y gronfa ddata wedi'i diweddaru."
 
 #: help_to_heat/templates/frontdoor/epc.html:29
 msgid ""
@@ -2123,8 +2123,8 @@ msgstr ""
 "Os yw’ch eiddo wedi cael EPC ers 1 %(scottish_epc_cutoff_month)s, efallai na "
 "fyddwn yn gallu dod o hyd iddi yn ein cronfa ddata am mai bob chwarter y "
 "bydd honno’n cael ei diweddaru. Dewch yn ôl i’r gwasanaeth yma ar ôl 1 "
-"%(next_scottish_dump_month)s pan ydyn ni’n disgwyl y bydd y gronfa ddata wedi'i "
-"diweddaru."
+"%(next_scottish_dump_month)s pan ydyn ni’n disgwyl y bydd y gronfa ddata "
+"wedi'i diweddaru."
 
 #: help_to_heat/templates/frontdoor/no-epc.html:27
 msgid "You may continue using this service without an EPC."

help_to_heat/utils.py

@@ -3,6 +3,7 @@
 import functools
 import hashlib
 import inspect
+import itertools
 import secrets
 import types
 import uuid
@@ -249,3 +250,19 @@ def get_current_and_next_month_names(month_names):
 # this is to tell the user the first month we have no EPCs for, and the next month we expect to perform a dump
 def get_current_scottish_epc_cutoff_and_next_dump_month_names(month_names):
     return month_names[9], month_names[1]
+
+
+def get_most_recent_epc_per_uprn(address_and_lmk_details):
+    most_recent_address_and_lmk_details = []
+    sorted_address_and_lmk_details = sorted(address_and_lmk_details, key=lambda x: x.get("uprn", ""), reverse=True)
+
+    for uprn, group in itertools.groupby(sorted_address_and_lmk_details, lambda x: x.get("uprn", "")):
+        # Some EPCs might not have UPRNs, this is currently unobserved but technically possible.
+        # This is a failsafe to include them all in the output, as we are unable to filter them by UPRN
+        if uprn == "":
+            most_recent_address_and_lmk_details.extend(group)
+            continue
+        latest_epc = max(group, key=lambda x: datetime.strptime(x["lodgement-date"], "%Y-%m-%d"))
+        most_recent_address_and_lmk_details.append(latest_epc)
+
+    return most_recent_address_and_lmk_details

tests/test_frontdoor.py

@@ -6,7 +6,11 @@
 from django.utils import timezone
 
 from help_to_heat.frontdoor import interface
-from help_to_heat.frontdoor.consts import country_page
+from help_to_heat.frontdoor.consts import (
+    address_all_address_and_lmk_details_field,
+    address_page,
+    country_page,
+)
 from help_to_heat.frontdoor.mock_epc_api import (
     MockEPCApi,
     MockEPCApiWithEPCC,
@@ -2112,6 +2116,47 @@ def test_epc_page_shows_epc_info():
     assert page.has_one("p:contains('23 July 2010')")
 
 
+@unittest.mock.patch("help_to_heat.frontdoor.interface.EPCApi", MockEPCApi)
+def test_epc_select_only_shows_most_recent_epc_per_uprn():
+    client = utils.get_client()
+    page = client.get("/start")
+    assert page.status_code == 302
+    page = page.follow()
+
+    assert page.status_code == 200
+    session_id = page.path.split("/")[1]
+    assert uuid.UUID(session_id)
+    _check_page = _make_check_page(session_id)
+
+    form = page.get_form()
+    form["country"] = "England"
+    page = form.submit().follow()
+
+    form = page.get_form()
+    form["supplier"] = "Utilita"
+    page = form.submit().follow()
+
+    assert page.has_text("Do you own the property?")
+    page = _check_page(page, "own-property", "own_property", "Yes, I own my property and live in it")
+
+    assert page.has_text("Do you live in a park home")
+    page = _check_page(page, "park-home", "park_home", "No")
+
+    form = page.get_form()
+    form["building_name_or_number"] = "22"
+    form["postcode"] = "FL23 4JA"
+    page = form.submit().follow()
+
+    data = interface.api.session.get_answer(session_id, page_name=address_page)
+
+    assert page.has_one("label:contains('22 Acacia Avenue, Upper Wellgood, Fulchester, FL23 4JA')")
+    assert page.has_one("label:contains('11 Acacia Avenue, Upper Wellgood, Fulchester, FL23 4JA')")
+
+    assert len(data[address_all_address_and_lmk_details_field]) == 2
+    assert data[address_all_address_and_lmk_details_field][0]["lmk-key"] != "3333333333333333333333333333333333"
+    assert data[address_all_address_and_lmk_details_field][1]["lmk-key"] != "3333333333333333333333333333333333"
+
+
 @unittest.mock.patch("help_to_heat.frontdoor.interface.EPCApi", MockEPCApi)
 def test_success_page_still_shows_if_journey_cannot_reach_it():
     supplier = "Utilita"