From 85b38ea43ccfb0f7812589c39f17edaedab81613 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Thu, 21 Aug 2025 18:13:09 +0000
Subject: [PATCH] added funding data to front end

---
 src/app/db/db.ts                                |  2 ++
 src/app/db/schema/funding.ts                    |  3 +++
 .../[propertyId]/plans/[planId]/page.tsx        |  5 ++++-
 .../building-passport/[propertyId]/utils.ts     | 17 ++++++++++++++++-
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/app/db/db.ts b/src/app/db/db.ts
index 6e89c713..8798282f 100644
--- a/src/app/db/db.ts
+++ b/src/app/db/db.ts
@@ -7,6 +7,7 @@ import * as recommendationSchema from "@/app/db/schema/recommendations";
 import * as materialSchema from "@/app/db/schema/materials";
 import * as solarSchema from "@/app/db/schema/solar";
 import * as EnergyAssessmentsSchema from "@/app/db/schema/energy_assessments";
+import * as FundingSchema from "@/app/db/schema/funding";
 import * as Relations from "@/app/db/schema/relations";
 
 export const pool = new Pool({
@@ -27,6 +28,7 @@ const schema = {
   ...solarSchema,
   ...Relations,
   ...EnergyAssessmentsSchema,
+  ...FundingSchema,
 };
 
 export const db = drizzle(pool, {
diff --git a/src/app/db/schema/funding.ts b/src/app/db/schema/funding.ts
index e3c7bf30..d3976e66 100644
--- a/src/app/db/schema/funding.ts
+++ b/src/app/db/schema/funding.ts
@@ -42,3 +42,6 @@ export const fundingPackageMeasures = pgTable("funding_package_measures", {
     partialProjectScore: real("partial_project_score"),
     upliftProjectScore: real("uplift_project_score"),
 });
+
+
+export type FundingPackage = typeof fundingPackage.$inferSelect;
\ No newline at end of file
diff --git a/src/app/portfolio/[slug]/building-passport/[propertyId]/plans/[planId]/page.tsx b/src/app/portfolio/[slug]/building-passport/[propertyId]/plans/[planId]/page.tsx
index e3e611f9..05efebbb 100644
--- a/src/app/portfolio/[slug]/building-passport/[propertyId]/plans/[planId]/page.tsx
+++ b/src/app/portfolio/[slug]/building-passport/[propertyId]/plans/[planId]/page.tsx
@@ -1,5 +1,5 @@
 import RecommendationContainer from "@/app/components/building-passport/RecommendationContainer";
-import { getPropertyMeta, getRecommendations, getPlanMeta } from "../../utils";
+import { getPropertyMeta, getRecommendations, getPlanMeta, getPlanFunding } from "../../utils";
 
 export default async function Recommendations(
   props: {
@@ -10,6 +10,9 @@ export default async function Recommendations(
   const propertyMeta = await getPropertyMeta(params.propertyId);
   const recommendations = await getRecommendations(params.planId);
   const planMeta = await getPlanMeta(params.planId);
+  const funding = await getPlanFunding(params.planId);
+
+  console.log("Funding Data:", funding);
 
   return (
     <div className="leading-loose tracking-wider">
diff --git a/src/app/portfolio/[slug]/building-passport/[propertyId]/utils.ts b/src/app/portfolio/[slug]/building-passport/[propertyId]/utils.ts
index 487ea865..b5e11d81 100644
--- a/src/app/portfolio/[slug]/building-passport/[propertyId]/utils.ts
+++ b/src/app/portfolio/[slug]/building-passport/[propertyId]/utils.ts
@@ -22,14 +22,29 @@ import {
   energyAssessment,
   EnergyAssessment,
   energyAssessmentDocuments,
-  EnergyAssessmentDocument,
   EnergyAssessmentDocumentWithScenario,
 } from "@/app/db/schema/energy_assessments";
+import {
+  fundingPackage,
+  FundingPackage
+} from "@/app/db/schema/funding";
 
 type RecommendationList = {
   recommendation: Recommendation;
 }[];
 
+export async function getPlanFunding(planId: string): Promise<FundingPackage[]> {
+  const data = await db.query.fundingPackage.findMany({
+    where: eq(fundingPackage.planId, BigInt(planId)),
+  });
+
+  if (!data) {
+    throw new Error("Network response was not ok");
+  }
+
+  return data;
+}
+
 export async function getEnergyAssessment(
   uprn: number
 ): Promise<EnergyAssessment> {