From 68458f1b9193752d969d29440f5c8fdecdb8d561 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 2 Jan 2024 15:45:42 +0000
Subject: [PATCH] Added uprn to create_property

---
 backend/app/db/functions/property_functions.py | 5 +++--
 backend/app/plan/router.py                     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/app/db/functions/property_functions.py b/backend/app/db/functions/property_functions.py
index 93dc0c49..88b4e87d 100644
--- a/backend/app/db/functions/property_functions.py
+++ b/backend/app/db/functions/property_functions.py
@@ -11,7 +11,7 @@ from backend.app.db.models.portfolio import (
 from sqlalchemy.orm.exc import NoResultFound
 
 
-def create_property(session: Session, portfolio_id: int, address: str, postcode: str) -> (int, bool):
+def create_property(session: Session, portfolio_id: int, address: str, postcode: str, uprn: str) -> (int, bool):
     """
     This function will create a record for the property in the database if it does not exist.
     If it does exist, it will just update the updated_at field.
@@ -25,7 +25,7 @@ def create_property(session: Session, portfolio_id: int, address: str, postcode:
     try:
         # Attempt to fetch the existing property
         existing_property = session.query(PropertyModel).filter_by(
-            address=address, postcode=postcode, portfolio_id=portfolio_id
+            uprn=uprn, portfolio_id=portfolio_id
         ).one()
 
         # Update the 'updated_at' field
@@ -43,6 +43,7 @@ def create_property(session: Session, portfolio_id: int, address: str, postcode:
             address=address,
             postcode=postcode,
             portfolio_id=portfolio_id,
+            uprn=uprn,
             creation_status=PropertyCreationStatus.LOADING,
             status=PortfolioStatus.ASSESSMENT.value,
             has_pre_condition_report=False,
diff --git a/backend/app/plan/router.py b/backend/app/plan/router.py
index c7adfeb7..9e24126e 100644
--- a/backend/app/plan/router.py
+++ b/backend/app/plan/router.py
@@ -81,7 +81,7 @@ async def trigger_plan(body: PlanTriggerRequest):
             epc_searcher.find_property()
             # Create a record in db
             property_id, is_new = create_property(
-                session, body.portfolio_id, epc_searcher.address_clean, epc_searcher.postcode_clean
+                session, body.portfolio_id, epc_searcher.address_clean, epc_searcher.postcode_clean, epc_searcher.uprn
             )
             # if a new record was not created, we don't produduce recommendations
             if not is_new: