From 36718ab3be906aacc2d0d206f91f5f27da66d8a9 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Tue, 9 Jul 2024 23:30:09 +0100 Subject: [PATCH] handling aggregations storage to db --- backend/app/db/functions/portfolio_functions.py | 2 +- backend/app/plan/router.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/app/db/functions/portfolio_functions.py b/backend/app/db/functions/portfolio_functions.py index 69203368..402675e8 100644 --- a/backend/app/db/functions/portfolio_functions.py +++ b/backend/app/db/functions/portfolio_functions.py @@ -11,7 +11,7 @@ def aggregate_portfolio_recommendations( session.query( func.sum(Recommendation.estimated_cost).label("cost"), func.sum(Recommendation.total_work_hours).label("total_work_hours"), - func.sum(Recommendation.adjusted_heat_demand).label("energy_savings"), + func.sum(Recommendation.kwh_savings).label("energy_savings"), func.sum(Recommendation.co2_equivalent_savings).label("co2_equivalent_savings"), func.sum(Recommendation.energy_cost_savings).label("energy_cost_savings"), ) diff --git a/backend/app/plan/router.py b/backend/app/plan/router.py index 0fe50538..7d92f425 100644 --- a/backend/app/plan/router.py +++ b/backend/app/plan/router.py @@ -129,7 +129,7 @@ def extract_portfolio_aggregation_data( pre_retrofit_energy_consumption = p.current_adjusted_energy post_retrofit_energy_consumption = p.current_adjusted_energy - sum( - [r["adjusted_heat_demand"] for r in default_recommendations] + [r["kwh_savings"] for r in default_recommendations] ) # Add up energy savings