From 445379b9363c7657aca5e94cc2938c64b7c62873 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Wed, 24 Jul 2024 16:45:08 +0100
Subject: [PATCH 1/2] minor

---
 recommendations/Recommendations.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/recommendations/Recommendations.py b/recommendations/Recommendations.py
index fcdd513f..0469f501 100644
--- a/recommendations/Recommendations.py
+++ b/recommendations/Recommendations.py
@@ -782,6 +782,11 @@ class Recommendations:
                         }
                     }
 
+                # Prevent from being negative
+                predicted_sap_points = 0 if predicted_sap_points < 0 else predicted_sap_points
+                predicted_co2_savings = 0 if predicted_co2_savings < 0 else predicted_co2_savings
+                predicted_heat_demand = 0 if predicted_heat_demand < 0 else predicted_heat_demand
+
                 if rec["type"] == "low_energy_lighting":
                     # For the moment, we cap the number of SAP points that can be achieved by ventilation at 2
                     rec["sap_points"] = min(predicted_sap_points, LightingRecommendations.SAP_LIMIT)

From 06427a5a79551e315938c6ea1e19a484d2b258f4 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Wed, 24 Jul 2024 16:54:56 +0100
Subject: [PATCH 2/2] Setting up new bucket for energy assessments

---
 etl/__init__.py                     | 0
 etl/xml_survey_extraction/README.md | 3 +++
 etl/xml_survey_extraction/app.py    | 9 +++++++++
 infrastructure/terraform/main.tf    | 6 ++++++
 4 files changed, 18 insertions(+)
 delete mode 100644 etl/__init__.py
 create mode 100644 etl/xml_survey_extraction/README.md
 create mode 100644 etl/xml_survey_extraction/app.py

diff --git a/etl/__init__.py b/etl/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/etl/xml_survey_extraction/README.md b/etl/xml_survey_extraction/README.md
new file mode 100644
index 00000000..4912a28c
--- /dev/null
+++ b/etl/xml_survey_extraction/README.md
@@ -0,0 +1,3 @@
+# Survey Extraction App
+
+This app is responsible survey data from energy assessment XMLs
\ No newline at end of file
diff --git a/etl/xml_survey_extraction/app.py b/etl/xml_survey_extraction/app.py
new file mode 100644
index 00000000..6f53e4e2
--- /dev/null
+++ b/etl/xml_survey_extraction/app.py
@@ -0,0 +1,9 @@
+def main():
+    """
+    This function executes the main process, which will retrieve data from the specified locations, extract the data
+    fields and store them to our database
+    :return:
+    """
+
+    # TODO: Build solution to get this data from Onedrive and store what we need in S3
+    #       In s3, we have a bucket called retrofit-energy-assessments-{stage} which
diff --git a/infrastructure/terraform/main.tf b/infrastructure/terraform/main.tf
index 9aa734bb..972722bb 100644
--- a/infrastructure/terraform/main.tf
+++ b/infrastructure/terraform/main.tf
@@ -175,6 +175,12 @@ module "retrofit_hotwater_kwh_predictions" {
   allowed_origins = var.allowed_origins
 }
 
+module "retrofit_energy_assessments" {
+  source          = "./modules/s3"
+  bucketname      = "retrofit-energy-assessments-${var.stage}"
+  allowed_origins = var.allowed_origins
+}
+
 # Set up the route53 record for the API
 module "route53" {
   source         = "./modules/route53"