From b100c15052f888d55465348786309a6d7156b42f Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Fri, 1 May 2026 16:32:04 +0000
Subject: [PATCH 01/25] Fetching user data from users hubspot table

---
 .../(portfolio)/your-projects/live/page.tsx   | 106 ++++++++++--------
 1 file changed, 61 insertions(+), 45 deletions(-)

diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx
index 5dc9759..aae8d8f 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx
@@ -1,11 +1,13 @@
 import { getServerSession } from "next-auth";
 import { AuthOptions } from "@/app/api/auth/[...nextauth]/authOptions";
 import { redirect } from "next/navigation";
-import { eq, inArray, and, desc } from "drizzle-orm";
+import { eq, inArray, and, desc, sql } from "drizzle-orm";
 import LiveTracker from "./LiveTracker";
 import { computeLiveTrackerData } from "./transforms";
 import { db } from "@/app/db/db";
 import { hubspotDealData } from "@/app/db/schema/crm/hubspot_deal_table";
+import { alias } from "drizzle-orm/pg-core";
+import { hubspotUsers } from "@/app/db/schema/crm/hubspot_user_table";
 import { uploadedFiles } from "@/app/db/schema/uploaded_files";
 import { portfolioOrganisation } from "@/app/db/schema/portfolio_organisation";
 import { organisation } from "@/app/db/schema/organisation";
@@ -20,53 +22,61 @@ import type { InferSelectModel } from "drizzle-orm";
 import { Card, CardContent } from "@/app/shadcn_components/ui/card";
 import { Building2 } from "lucide-react";
 
-type DbDeal = InferSelectModel<typeof hubspotDealData>;
+const coordinatorUser = alias(hubspotUsers, "coordinator_user");
+const designerUser = alias(hubspotUsers, "designer_user");
 
-function mapDbRowToHubspotDeal(row: DbDeal): HubspotDeal {
+type DealRow = {
+  deal: InferSelectModel<typeof hubspotDealData>;
+  coordinator: string | null;
+  designer: string | null;
+};
+
+function mapDbRowToHubspotDeal(row: DealRow): HubspotDeal {
+  const d = row.deal;
   return {
-    id: row.id,
-    dealId: row.dealId,
-    dealname: row.dealname,
-    dealstage: row.dealstage,
-    companyId: row.companyId,
-    projectCode: row.projectCode,
-    landlordPropertyId: row.landlordPropertyId,
-    uprn: row.uprn,
-    outcome: row.outcome,
-    outcomeNotes: row.outcomeNotes,
-    majorConditionIssueDescription: row.majorConditionIssueDescription,
-    majorConditionIssuePhotos: row.majorConditionIssuePhotos,
-    majorConditionIssuePhotosS3: row.majorConditionIssuePhotosS3,
-    coordinationStatus: row.coordinationStatus,
-    designStatus: row.designStatus,
-    pashubLink: row.pashubLink,
-    sharepointLink: row.sharepointLink,
-    dampMouldFlag: row.dampmouldGrowth,
-    dampMouldAndRepairComments: row.damnpMouldAndRepairComments,
-    preSapScore: row.preSap,
+    id: d.id,
+    dealId: d.dealId,
+    dealname: d.dealname,
+    dealstage: d.dealstage,
+    companyId: d.companyId,
+    projectCode: d.projectCode,
+    landlordPropertyId: d.landlordPropertyId,
+    uprn: d.uprn,
+    outcome: d.outcome,
+    outcomeNotes: d.outcomeNotes,
+    majorConditionIssueDescription: d.majorConditionIssueDescription,
+    majorConditionIssuePhotos: d.majorConditionIssuePhotos,
+    majorConditionIssuePhotosS3: d.majorConditionIssuePhotosS3,
+    coordinationStatus: d.coordinationStatus,
+    designStatus: d.designStatus,
+    pashubLink: d.pashubLink,
+    sharepointLink: d.sharepointLink,
+    dampMouldFlag: d.dampmouldGrowth,
+    dampMouldAndRepairComments: d.damnpMouldAndRepairComments,
+    preSapScore: d.preSap,
     coordinator: row.coordinator,
-    ioeV1Date: row.mtpCompletionDate,
-    ioeV2Date: row.mtpReModelCompletionDate,
-    ioeV3Date: row.ioeV3CompletionDate,
-    proposedMeasures: row.proposedMeasures,
-    approvedPackage: row.approvedPackage,
+    ioeV1Date: d.mtpCompletionDate,
+    ioeV2Date: d.mtpReModelCompletionDate,
+    ioeV3Date: d.ioeV3CompletionDate,
+    proposedMeasures: d.proposedMeasures,
+    approvedPackage: d.approvedPackage,
     designer: row.designer,
-    designDate: row.designCompletionDate,
-    actualMeasuresInstalled: row.actualMeasuresInstalled,
-    installer: row.installer,
-    installerHandover: row.installerHandover,
-    lodgementStatus: row.lodgementStatus,
-    measuresLodgementDate: row.measuresLodgementDate,
-    fullLodgementDate: row.lodgementDate,
-    confirmedSurveyDate: row.confirmedSurveyDate,
-    surveyedDate: row.surveyedDate,
-    designType: row.dealType,
-    eiScore: row.eiScore,
-    eiScorePotential: row.eiScorePotential,
-    epcSapScore: row.epcSapScore,
-    epcSapScorePotential: row.epcSapScorePotential,
-    createdAt: row.createdAt,
-    updatedAt: row.updatedAt,
+    designDate: d.designCompletionDate,
+    actualMeasuresInstalled: d.actualMeasuresInstalled,
+    installer: d.installer,
+    installerHandover: d.installerHandover,
+    lodgementStatus: d.lodgementStatus,
+    measuresLodgementDate: d.measuresLodgementDate,
+    fullLodgementDate: d.lodgementDate,
+    confirmedSurveyDate: d.confirmedSurveyDate,
+    surveyedDate: d.surveyedDate,
+    designType: d.dealType,
+    eiScore: d.eiScore,
+    eiScorePotential: d.eiScorePotential,
+    epcSapScore: d.epcSapScore,
+    epcSapScorePotential: d.epcSapScorePotential,
+    createdAt: d.createdAt,
+    updatedAt: d.updatedAt,
   };
 }
 
@@ -123,8 +133,14 @@ export default async function LiveReportingPage(props: {
   const companyId = link[0].hubspotCompanyId;
 
   const rawDeals = await db
-    .select()
+    .select({
+      deal: hubspotDealData,
+      coordinator: sql<string | null>`CASE WHEN ${hubspotDealData.coordinator} IS NULL THEN NULL ELSE COALESCE(${coordinatorUser.firstName} || ' ' || ${coordinatorUser.lastName}, 'Domna Coordinator') END`,
+      designer: sql<string | null>`CASE WHEN ${hubspotDealData.designer} IS NULL THEN NULL ELSE COALESCE(${designerUser.firstName} || ' ' || ${designerUser.lastName}, 'Domna Designer') END`,
+    })
     .from(hubspotDealData)
+    .leftJoin(coordinatorUser, eq(hubspotDealData.coordinator, coordinatorUser.hubspotOwnerId))
+    .leftJoin(designerUser, eq(hubspotDealData.designer, designerUser.hubspotOwnerId))
     .where(eq(hubspotDealData.companyId, companyId));
 
   const deals = rawDeals.map(mapDbRowToHubspotDeal);

From dc3bfa73d3324c774ca4ba1b4e33a2998366b997 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 11:25:45 +0000
Subject: [PATCH 02/25] extract MEASURE_NAMES catalogue and MeasureName type

---
 src/app/lib/measureDocumentRequirements.ts | 43 ++++++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/app/lib/measureDocumentRequirements.ts b/src/app/lib/measureDocumentRequirements.ts
index e196faf..a38b738 100644
--- a/src/app/lib/measureDocumentRequirements.ts
+++ b/src/app/lib/measureDocumentRequirements.ts
@@ -4,6 +4,40 @@
  * Used to compute per-measure upload completion and guide contractors in the upload modal.
  */
 
+/**
+ * Canonical list of measure names recognised by the application.
+ *
+ * This is the single source of truth: document-requirement lookups, UI dropdowns
+ * and validation should reference this tuple rather than maintaining their own
+ * copies. Names match the values produced by the upstream HubSpot pull pipeline.
+ */
+export const MEASURE_NAMES = [
+  "ASHP",
+  "Solar PV",
+  "DMevs",
+  "Loft insulation",
+  "CWI",
+  "EWI",
+  "IWI",
+  "Flat roof",
+  "RIR",
+  "UFI",
+  "HW",
+  "Windows",
+  "Ext. doors",
+  "TRVs",
+  "Heating controls",
+  "New boiler",
+  "HHRSH",
+  "Battery",
+  "LEL",
+  "Listed building",
+  "Removal 2nd heating",
+  "Others",
+] as const;
+
+export type MeasureName = (typeof MEASURE_NAMES)[number];
+
 // Required for every measure
 const BASE_DOCS = [
   "pre_photo",
@@ -18,7 +52,9 @@ const BASE_DOCS = [
 // MCS-accredited measures require MCS certification in addition to base docs
 const MCS_EXTRA = ["mcs_compliance_certificate"] as const;
 
-export const MEASURE_DOC_REQUIREMENTS: Record<string, string[]> = {
+export { BASE_DOCS };
+
+export const MEASURE_DOC_REQUIREMENTS: Partial<Record<MeasureName, string[]>> = {
   ASHP: [...BASE_DOCS, ...MCS_EXTRA, "commissioning_records"],
   "Solar PV": [...BASE_DOCS, ...MCS_EXTRA, "g98_notification"],
   DMevs: [
@@ -41,10 +77,11 @@ export const MEASURE_DOC_REQUIREMENTS: Record<string, string[]> = {
 
 /**
  * Returns the required document types for a given measure name.
- * Falls back to BASE_DOCS for any measure not explicitly listed.
+ * Falls back to BASE_DOCS for any measure not explicitly listed (including
+ * unknown measures from upstream).
  */
 export function getRequiredDocs(measureName: string): string[] {
-  return MEASURE_DOC_REQUIREMENTS[measureName] ?? [...BASE_DOCS];
+  return MEASURE_DOC_REQUIREMENTS[measureName as MeasureName] ?? [...BASE_DOCS];
 }
 
 /**

From 35d0af4474c5a0db433c1ca0c8f9962f8ce59529 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 11:25:54 +0000
Subject: [PATCH 03/25] share parseMeasures helper, accept ; and , separators

---
 src/app/lib/parseMeasures.ts                  | 20 +++++++++++++++++++
 .../live/ContractorUploadModal.tsx            |  6 +-----
 .../your-projects/live/MeasuresTable.tsx      |  6 +-----
 3 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 src/app/lib/parseMeasures.ts

diff --git a/src/app/lib/parseMeasures.ts b/src/app/lib/parseMeasures.ts
new file mode 100644
index 0000000..06bf73b
--- /dev/null
+++ b/src/app/lib/parseMeasures.ts
@@ -0,0 +1,20 @@
+/**
+ * Parses a measure-list string from the HubSpot pull pipeline.
+ *
+ * HubSpot's `proposed_measures` field is delivered as a semicolon-separated
+ * list (its native multi-select format). Earlier records were sometimes stored
+ * as comma-separated strings, and freeform text from contractors may use either
+ * separator. To keep the UI tolerant we accept both `;` and `,` as delimiters.
+ *
+ * Empty / whitespace-only inputs return `[]`. Individual entries are trimmed
+ * and any blank entries (e.g. from a trailing separator) are dropped.
+ */
+export function parseMeasures(raw: string | null | undefined): string[] {
+  if (!raw) return [];
+  // Tolerant strategy: split on either `;` or `,`. HubSpot's multi-select
+  // exports use `;` natively; legacy values and ad-hoc text may use `,`.
+  return raw
+    .split(/[;,]/)
+    .map((m) => m.trim())
+    .filter(Boolean);
+}
diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/ContractorUploadModal.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/ContractorUploadModal.tsx
index ccb1db8..a7dd151 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/ContractorUploadModal.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/ContractorUploadModal.tsx
@@ -23,6 +23,7 @@ import { CheckCircle2, XCircle, Upload, Loader2, Clock, ChevronDown, ChevronRigh
 import { uploadFileToS3 } from "@/app/utils/s3";
 import type { ClassifiedDeal, DocStatusMap } from "./types";
 import { getRequiredDocs } from "@/app/lib/measureDocumentRequirements";
+import { parseMeasures } from "@/app/lib/parseMeasures";
 
 // ── Types ─────────────────────────────────────────────────────────────────
 
@@ -164,11 +165,6 @@ function contentTypeFor(ext: string): string {
   return "application/octet-stream";
 }
 
-function parseMeasures(raw: string | null | undefined): string[] {
-  if (!raw) return [];
-  return raw.split(",").map((m) => m.trim()).filter(Boolean);
-}
-
 function s3KeyBasename(key: string): string {
   return key.split("/").pop() ?? key;
 }
diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/MeasuresTable.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/MeasuresTable.tsx
index f7e3414..764a6eb 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/MeasuresTable.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/MeasuresTable.tsx
@@ -18,6 +18,7 @@ import { Search, Save, ChevronDown, ChevronRight } from "lucide-react";
 import { STAGE_COLORS } from "./types";
 import type { ClassifiedDeal, PortfolioCapabilityType, ApprovalsByDeal } from "./types";
 import { ApprovalConfirmDialog, type PendingDiff } from "./ApprovalConfirmDialog";
+import { parseMeasures } from "@/app/lib/parseMeasures";
 
 type AuditEvent = {
   id: string;
@@ -36,11 +37,6 @@ type Props = {
   portfolioId: string;
 };
 
-function parseMeasures(raw: string | null | undefined): string[] {
-  if (!raw) return [];
-  return raw.split(",").map((m) => m.trim()).filter(Boolean);
-}
-
 function ApprovalStatus({
   proposed,
   approved,

From 486427f73d61301785c5597143d2fc8d971210a3 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 11:26:02 +0000
Subject: [PATCH 04/25] add vitest harness with parser and getRequiredDocs unit
 tests

---
 package-lock.json                             | 1297 ++++++++++++++++-
 package.json                                  |    5 +-
 .../lib/measureDocumentRequirements.test.ts   |   75 +
 src/app/lib/parseMeasures.test.ts             |   63 +
 vitest.config.ts                              |   17 +
 5 files changed, 1455 insertions(+), 2 deletions(-)
 create mode 100644 src/app/lib/measureDocumentRequirements.test.ts
 create mode 100644 src/app/lib/parseMeasures.test.ts
 create mode 100644 vitest.config.ts

diff --git a/package-lock.json b/package-lock.json
index 7b251ec..ef282c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -85,7 +85,8 @@
         "drizzle-kit": "^0.31.5",
         "eslint": "^8.57.1",
         "prettier": "^3.6.2",
-        "start-server-and-test": "^2.0.0"
+        "start-server-and-test": "^2.0.0",
+        "vitest": "^2.1.9"
       }
     },
     "node_modules/@alloc/quick-lru": {
@@ -4590,6 +4591,356 @@
         "react": ">=18.2.0"
       }
     },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.3.tgz",
+      "integrity": "sha512-x35CNW/ANXG3hE/EZpRU8MXX1JDN86hBb2wMGAtltkz7pc6cxgjpy1OMMfDosOQ+2hWqIkag/fGok1Yady9nGw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.3.tgz",
+      "integrity": "sha512-xw3xtkDApIOGayehp2+Rz4zimfkaX65r4t47iy+ymQB2G4iJCBBfj0ogVg5jpvjpn8UWn/+q9tprxleYeNp3Hw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.3.tgz",
+      "integrity": "sha512-vo6Y5Qfpx7/5EaamIwi0WqW2+zfiusVihKatLvtN1VFVy3D13uERk/6gZLU1UiHRL6fDXqj/ELIeVRGnvcTE1g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.3.tgz",
+      "integrity": "sha512-D+0QGcZhBzTN82weOnsSlY7V7+RMmPuF1CkbxyMAGE8+ZHeUjyb76ZiWmBlCu//AQQONvxcqRbwZTajZKqjuOw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.3.tgz",
+      "integrity": "sha512-6HnvHCT7fDyj6R0Ph7A6x8dQS/S38MClRWeDLqc0MdfWkxjiu1HSDYrdPhqSILzjTIC/pnXbbJbo+ft+gy/9hQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.3.tgz",
+      "integrity": "sha512-KHLgC3WKlUYW3ShFKnnosZDOJ0xjg9zp7au3sIm2bs/tGBeC2ipmvRh/N7JKi0t9Ue20C0dpEshi8WUubg+cnA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.3.tgz",
+      "integrity": "sha512-DV6fJoxEYWJOvaZIsok7KrYl0tPvga5OZ2yvKHNNYyk/2roMLqQAbGhr78EQ5YhHpnhLKJD3S1WFusAkmUuV5g==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.3.tgz",
+      "integrity": "sha512-mQKoJAzvuOs6F+TZybQO4GOTSMUu7v0WdxEk24krQ/uUxXoPTtHjuaUuPmFhtBcM4K0ons8nrE3JyhTuCFtT/w==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.3.tgz",
+      "integrity": "sha512-Whjj2qoiJ6+OOJMGptTYazaJvjOJm+iKHpXQM1P3LzGjt7Ff++Tp7nH4N8J/BUA7R9IHfDyx4DJIflifwnbmIA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.3.tgz",
+      "integrity": "sha512-4YTNHKqGng5+yiZt3mg77nmyuCfmNfX4fPmyUapBcIk+BdwSwmCWGXOUxhXbBEkFHtoN5boLj/5NON+u5QC9tg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.3.tgz",
+      "integrity": "sha512-SU3kNlhkpI4UqlUc2VXPGK9o886ZsSeGfMAX2ba2b8DKmMXq4AL7KUrkSWVbb7koVqx41Yczx6dx5PNargIrEA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.3.tgz",
+      "integrity": "sha512-6lDLl5h4TXpB1mTf2rQWnAk/LcXrx9vBfu/DT5TIPhvMhRWaZ5MxkIc8u4lJAmBo6klTe1ywXIUHFjylW505sg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.3.tgz",
+      "integrity": "sha512-BMo8bOw8evlup/8G+cj5xWtPyp93xPdyoSN16Zy90Q2QZ0ZYRhCt6ZJSwbrRzG9HApFabjwj2p25TUPDWrhzqQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.3.tgz",
+      "integrity": "sha512-E0L8X1dZN1/Rph+5VPF6Xj2G7JJvMACVXtamTJIDrVI44Y3K+G8gQaMEAavbqCGTa16InptiVrX6eM6pmJ+7qA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.3.tgz",
+      "integrity": "sha512-oZJ/WHaVfHUiRAtmTAeo3DcevNsVvH8mbvodjZy7D5QKvCefO371SiKRpxoDcCxB3PTRTLayWBkvmDQKTcX/sw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.3.tgz",
+      "integrity": "sha512-Dhbyh7j9FybM3YaTgaHmVALwA8AkUwTPccyCQ79TG9AJUsMQqgN1DDEZNr4+QUfwiWvLDumW5vdwzoeUF+TNxQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.3.tgz",
+      "integrity": "sha512-cJd1X5XhHHlltkaypz1UcWLA8AcoIi1aWhsvaWDskD1oz2eKCypnqvTQ8ykMNI0RSmm7NkTdSqSSD7zM0xa6Ig==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.60.3.tgz",
+      "integrity": "sha512-DAZDBHQfG2oQuhY7mc6I3/qB4LU2fQCjRvxbDwd/Jdvb9fypP4IJ4qmtu6lNjes6B531AI8cg1aKC2di97bUxA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.60.3.tgz",
+      "integrity": "sha512-cRxsE8c13mZOh3vP+wLDxpQBRrOHDIGOWyDL93Sy0Ga8y515fBcC2pjUfFwUe5T7tqvTvWbCpg1URM/AXdWIXA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.3.tgz",
+      "integrity": "sha512-QaWcIgRxqEdQdhJqW4DJctsH6HCmo5vHxY0krHSX4jMtOqfzC+dqDGuHM87bu4H8JBeibWx7jFz+h6/4C8wA5Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.3.tgz",
+      "integrity": "sha512-AaXwSvUi3QIPtroAUw1t5yHGIyqKEXwH54WUocFolZhpGDruJcs8c+xPNDRn4XiQsS7MEwnYsHW2l0MBLDMkWg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.3.tgz",
+      "integrity": "sha512-65LAKM/bAWDqKNEelHlcHvm2V+Vfb8C6INFxQXRHCvaVN1rJfwr4NvdP4FyzUaLqWfaCGaadf6UbTm8xJeYfEg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.3.tgz",
+      "integrity": "sha512-EEM2gyhBF5MFnI6vMKdX1LAosE627RGBzIoGMdLloPZkXrUN0Ckqgr2Qi8+J3zip/8NVVro3/FjB+tjhZUgUHA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.3.tgz",
+      "integrity": "sha512-E5Eb5H/DpxaoXH++Qkv28RcUJboMopmdDUALBczvHMf7hNIxaDZqwY5lK12UK1BHacSmvupoEWGu+n993Z0y1A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.3.tgz",
+      "integrity": "sha512-hPt/bgL5cE+Qp+/TPHBqptcAgPzgj46mPcg/16zNUmbQk0j+mOEQV/+Lqu8QRtDV3Ek95Q6FeFITpuhl6OTsAA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@rtsao/scc": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
@@ -5776,6 +6127,13 @@
       "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
       "license": "MIT"
     },
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/google.maps": {
       "version": "3.58.1",
       "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.58.1.tgz",
@@ -6309,6 +6667,119 @@
         }
       }
     },
+    "node_modules/@vitest/expect": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.1.9.tgz",
+      "integrity": "sha512-UJCIkTBenHeKT1TTlKMJWy1laZewsRIzYighyYiJKZreqtdxSos/S1t+ktRMQWu2CKqaarrkeszJx1cgC5tGZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/spy": "2.1.9",
+        "@vitest/utils": "2.1.9",
+        "chai": "^5.1.2",
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/mocker": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-2.1.9.tgz",
+      "integrity": "sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/spy": "2.1.9",
+        "estree-walker": "^3.0.3",
+        "magic-string": "^0.30.12"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "msw": "^2.4.9",
+        "vite": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "msw": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vitest/pretty-format": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.1.9.tgz",
+      "integrity": "sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/runner": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.1.9.tgz",
+      "integrity": "sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/utils": "2.1.9",
+        "pathe": "^1.1.2"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/snapshot": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.1.9.tgz",
+      "integrity": "sha512-oBO82rEjsxLNJincVhLhaxxZdEtV0EFHMK5Kmx5sJ6H9L183dHECjiefOAdnqpIgT5eZwT04PoggUnW88vOBNQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/pretty-format": "2.1.9",
+        "magic-string": "^0.30.12",
+        "pathe": "^1.1.2"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/spy": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.1.9.tgz",
+      "integrity": "sha512-E1B35FwzXXTs9FHNK6bDszs7mtydNi5MIfUWpceJ8Xbfb1gBMscAnwLbEu+B44ed6W3XjL9/ehLPHR1fkf1KLQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyspy": "^3.0.2"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/utils": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.1.9.tgz",
+      "integrity": "sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/pretty-format": "2.1.9",
+        "loupe": "^3.1.2",
+        "tinyrainbow": "^1.2.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
     "node_modules/acorn": {
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
@@ -6697,6 +7168,16 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/assertion-error": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/ast-types": {
       "version": "0.13.4",
       "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
@@ -7155,6 +7636,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/cac": {
+      "version": "6.7.14",
+      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
+      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/cachedir": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
@@ -7270,6 +7761,23 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/chai": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz",
+      "integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -7298,6 +7806,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/check-error": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.3.tgz",
+      "integrity": "sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      }
+    },
     "node_modules/check-more-types": {
       "version": "2.24.0",
       "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
@@ -7993,6 +8511,16 @@
       "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==",
       "license": "MIT"
     },
+    "node_modules/deep-eql": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -8497,6 +9025,13 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-module-lexer": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
+      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/es-object-atoms": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
@@ -9103,6 +9638,16 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
     "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -9197,6 +9742,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/expect-type": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
+      "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -11102,6 +11657,13 @@
         "loose-envify": "cli.js"
       }
     },
+    "node_modules/loupe": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.1.tgz",
+      "integrity": "sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -11133,6 +11695,16 @@
         "lz-string": "bin/bin.js"
       }
     },
+    "node_modules/magic-string": {
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.5"
+      }
+    },
     "node_modules/map-stream": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
@@ -11948,6 +12520,23 @@
         "node": ">=8"
       }
     },
+    "node_modules/pathe": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
+      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/pathval": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz",
+      "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.16"
+      }
+    },
     "node_modules/pause-stream": {
       "version": "0.0.11",
       "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
@@ -13062,6 +13651,51 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/rollup": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.60.3.tgz",
+      "integrity": "sha512-pAQK9HalE84QSm4Po3EmWIZPd3FnjkShVkiMlz1iligWYkWQ7wHYd1PF/T7QZ5TVSD6uSTon5gBVMSM4JfBV+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "1.0.8"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.60.3",
+        "@rollup/rollup-android-arm64": "4.60.3",
+        "@rollup/rollup-darwin-arm64": "4.60.3",
+        "@rollup/rollup-darwin-x64": "4.60.3",
+        "@rollup/rollup-freebsd-arm64": "4.60.3",
+        "@rollup/rollup-freebsd-x64": "4.60.3",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.60.3",
+        "@rollup/rollup-linux-arm-musleabihf": "4.60.3",
+        "@rollup/rollup-linux-arm64-gnu": "4.60.3",
+        "@rollup/rollup-linux-arm64-musl": "4.60.3",
+        "@rollup/rollup-linux-loong64-gnu": "4.60.3",
+        "@rollup/rollup-linux-loong64-musl": "4.60.3",
+        "@rollup/rollup-linux-ppc64-gnu": "4.60.3",
+        "@rollup/rollup-linux-ppc64-musl": "4.60.3",
+        "@rollup/rollup-linux-riscv64-gnu": "4.60.3",
+        "@rollup/rollup-linux-riscv64-musl": "4.60.3",
+        "@rollup/rollup-linux-s390x-gnu": "4.60.3",
+        "@rollup/rollup-linux-x64-gnu": "4.60.3",
+        "@rollup/rollup-linux-x64-musl": "4.60.3",
+        "@rollup/rollup-openbsd-x64": "4.60.3",
+        "@rollup/rollup-openharmony-arm64": "4.60.3",
+        "@rollup/rollup-win32-arm64-msvc": "4.60.3",
+        "@rollup/rollup-win32-ia32-msvc": "4.60.3",
+        "@rollup/rollup-win32-x64-gnu": "4.60.3",
+        "@rollup/rollup-win32-x64-msvc": "4.60.3",
+        "fsevents": "~2.3.2"
+      }
+    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -13398,6 +14032,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/siginfo": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -13566,6 +14207,13 @@
       "integrity": "sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==",
       "license": "MIT"
     },
+    "node_modules/stackback": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/start-server-and-test": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.1.3.tgz",
@@ -13638,6 +14286,13 @@
         "node": ">=10.17.0"
       }
     },
+    "node_modules/std-env": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.10.0.tgz",
+      "integrity": "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/stop-iteration-iterator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
@@ -14145,6 +14800,20 @@
       "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
       "license": "MIT"
     },
+    "node_modules/tinybench": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
+      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tinyexec": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
+      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/tinyglobby": {
       "version": "0.2.15",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
@@ -14190,6 +14859,36 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/tinypool": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
+      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      }
+    },
+    "node_modules/tinyrainbow": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz",
+      "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/tinyspy": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
+      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/tldts": {
       "version": "6.1.86",
       "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.86.tgz",
@@ -15237,6 +15936,585 @@
         "d3-timer": "^3.0.1"
       }
     },
+    "node_modules/vite": {
+      "version": "5.4.21",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz",
+      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vite-node": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.1.9.tgz",
+      "integrity": "sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cac": "^6.7.14",
+        "debug": "^4.3.7",
+        "es-module-lexer": "^1.5.4",
+        "pathe": "^1.1.2",
+        "vite": "^5.0.0"
+      },
+      "bin": {
+        "vite-node": "vite-node.mjs"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/vite/node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "node_modules/vitest": {
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.1.9.tgz",
+      "integrity": "sha512-MSmPM9REYqDGBI8439mA4mWhV5sKmDlBKWIYbA3lRb2PTHACE0mgKwA8yQ2xq9vxDTuk4iPrECBAEW2aoFXY0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/expect": "2.1.9",
+        "@vitest/mocker": "2.1.9",
+        "@vitest/pretty-format": "^2.1.9",
+        "@vitest/runner": "2.1.9",
+        "@vitest/snapshot": "2.1.9",
+        "@vitest/spy": "2.1.9",
+        "@vitest/utils": "2.1.9",
+        "chai": "^5.1.2",
+        "debug": "^4.3.7",
+        "expect-type": "^1.1.0",
+        "magic-string": "^0.30.12",
+        "pathe": "^1.1.2",
+        "std-env": "^3.8.0",
+        "tinybench": "^2.9.0",
+        "tinyexec": "^0.3.1",
+        "tinypool": "^1.0.1",
+        "tinyrainbow": "^1.2.0",
+        "vite": "^5.0.0",
+        "vite-node": "2.1.9",
+        "why-is-node-running": "^2.3.0"
+      },
+      "bin": {
+        "vitest": "vitest.mjs"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@edge-runtime/vm": "*",
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "@vitest/browser": "2.1.9",
+        "@vitest/ui": "2.1.9",
+        "happy-dom": "*",
+        "jsdom": "*"
+      },
+      "peerDependenciesMeta": {
+        "@edge-runtime/vm": {
+          "optional": true
+        },
+        "@types/node": {
+          "optional": true
+        },
+        "@vitest/browser": {
+          "optional": true
+        },
+        "@vitest/ui": {
+          "optional": true
+        },
+        "happy-dom": {
+          "optional": true
+        },
+        "jsdom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/wait-on": {
       "version": "9.0.3",
       "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-9.0.3.tgz",
@@ -15391,6 +16669,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/why-is-node-running": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
+      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "siginfo": "^2.0.0",
+        "stackback": "0.0.2"
+      },
+      "bin": {
+        "why-is-node-running": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/wmf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
diff --git a/package.json b/package.json
index e01c7ac..30b7374 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,8 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "test:e2e:open": "start-server-and-test dev http://localhost:3000 \"cypress open --e2e\"",
     "test:e2e:run": "cypress run",
     "migration:generate": "drizzle-kit generate",
@@ -91,6 +93,7 @@
     "drizzle-kit": "^0.31.5",
     "eslint": "^8.57.1",
     "prettier": "^3.6.2",
-    "start-server-and-test": "^2.0.0"
+    "start-server-and-test": "^2.0.0",
+    "vitest": "^2.1.9"
   }
 }
diff --git a/src/app/lib/measureDocumentRequirements.test.ts b/src/app/lib/measureDocumentRequirements.test.ts
new file mode 100644
index 0000000..45bb71f
--- /dev/null
+++ b/src/app/lib/measureDocumentRequirements.test.ts
@@ -0,0 +1,75 @@
+import { describe, expect, it } from "vitest";
+import {
+  BASE_DOCS,
+  MEASURE_DOC_REQUIREMENTS,
+  MEASURE_NAMES,
+  getRequiredDocs,
+} from "./measureDocumentRequirements";
+
+describe("MEASURE_NAMES catalogue", () => {
+  it("includes every measure keyed in MEASURE_DOC_REQUIREMENTS", () => {
+    for (const name of Object.keys(MEASURE_DOC_REQUIREMENTS)) {
+      expect(MEASURE_NAMES).toContain(name);
+    }
+  });
+
+  it("includes the names called out in the trailing comment as base-only", () => {
+    const baseOnly = [
+      "CWI",
+      "EWI",
+      "IWI",
+      "Flat roof",
+      "RIR",
+      "UFI",
+      "HW",
+      "Windows",
+      "Ext. doors",
+      "TRVs",
+      "Heating controls",
+      "New boiler",
+      "HHRSH",
+      "Battery",
+      "LEL",
+      "Listed building",
+      "Removal 2nd heating",
+      "Others",
+    ];
+    for (const name of baseOnly) {
+      expect(MEASURE_NAMES).toContain(name);
+    }
+  });
+});
+
+describe("getRequiredDocs", () => {
+  it("returns the explicit doc list for a known measure", () => {
+    const docs = getRequiredDocs("ASHP");
+    // ASHP gets BASE + MCS_EXTRA + commissioning_records
+    expect(docs).toEqual([
+      ...BASE_DOCS,
+      "mcs_compliance_certificate",
+      "commissioning_records",
+    ]);
+  });
+
+  it("returns Solar PV's specific docs (with G98 notification)", () => {
+    const docs = getRequiredDocs("Solar PV");
+    expect(docs).toContain("g98_notification");
+    expect(docs).toContain("mcs_compliance_certificate");
+  });
+
+  it("returns BASE_DOCS for a measure that only requires the baseline", () => {
+    const docs = getRequiredDocs("CWI");
+    expect(docs).toEqual([...BASE_DOCS]);
+  });
+
+  it("returns BASE_DOCS for an unknown measure name", () => {
+    const docs = getRequiredDocs("Definitely Not A Real Measure");
+    expect(docs).toEqual([...BASE_DOCS]);
+  });
+
+  it("returns a fresh array (mutating the result must not affect BASE_DOCS)", () => {
+    const docs = getRequiredDocs("Unknown");
+    docs.push("mutation");
+    expect(BASE_DOCS).not.toContain("mutation");
+  });
+});
diff --git a/src/app/lib/parseMeasures.test.ts b/src/app/lib/parseMeasures.test.ts
new file mode 100644
index 0000000..2ca5d99
--- /dev/null
+++ b/src/app/lib/parseMeasures.test.ts
@@ -0,0 +1,63 @@
+import { describe, expect, it } from "vitest";
+import { parseMeasures } from "./parseMeasures";
+
+describe("parseMeasures", () => {
+  it("returns [] for null", () => {
+    expect(parseMeasures(null)).toEqual([]);
+  });
+
+  it("returns [] for undefined", () => {
+    expect(parseMeasures(undefined)).toEqual([]);
+  });
+
+  it("returns [] for empty string", () => {
+    expect(parseMeasures("")).toEqual([]);
+  });
+
+  it("returns [] for whitespace-only string", () => {
+    expect(parseMeasures("   ")).toEqual([]);
+    expect(parseMeasures("\t\n  ")).toEqual([]);
+  });
+
+  it("splits semicolon-separated HubSpot output and trims each entry", () => {
+    expect(parseMeasures("ASHP;Solar PV;Loft insulation")).toEqual([
+      "ASHP",
+      "Solar PV",
+      "Loft insulation",
+    ]);
+  });
+
+  it("trims whitespace around semicolon-separated entries", () => {
+    expect(parseMeasures(" ASHP ;  Solar PV ;Loft insulation ")).toEqual([
+      "ASHP",
+      "Solar PV",
+      "Loft insulation",
+    ]);
+  });
+
+  it("splits legacy comma-separated input and trims", () => {
+    expect(parseMeasures("ASHP, Solar PV, Loft insulation")).toEqual([
+      "ASHP",
+      "Solar PV",
+      "Loft insulation",
+    ]);
+  });
+
+  it("tolerates a mix of semicolons and commas", () => {
+    expect(parseMeasures("ASHP; Solar PV, Loft insulation")).toEqual([
+      "ASHP",
+      "Solar PV",
+      "Loft insulation",
+    ]);
+  });
+
+  it("drops empty entries from trailing or duplicated separators", () => {
+    expect(parseMeasures("ASHP;;Solar PV;")).toEqual(["ASHP", "Solar PV"]);
+    expect(parseMeasures(",ASHP,,Solar PV,")).toEqual(["ASHP", "Solar PV"]);
+  });
+
+  it("returns a single entry when the input contains no separator", () => {
+    expect(parseMeasures("ASHP")).toEqual(["ASHP"]);
+    expect(parseMeasures("  ASHP  ")).toEqual(["ASHP"]);
+  });
+});
diff --git a/vitest.config.ts b/vitest.config.ts
new file mode 100644
index 0000000..950c2d2
--- /dev/null
+++ b/vitest.config.ts
@@ -0,0 +1,17 @@
+import { defineConfig } from "vitest/config";
+import path from "node:path";
+
+export default defineConfig({
+  test: {
+    environment: "node",
+    include: ["src/**/*.test.ts", "src/**/*.test.tsx"],
+    // Cypress lives under /cypress and uses its own runner; exclude it so the
+    // two harnesses do not collide.
+    exclude: ["node_modules", ".next", "cypress"],
+  },
+  resolve: {
+    alias: {
+      "@": path.resolve(__dirname, "./src"),
+    },
+  },
+});

From 998f36f1df18036b5a23fc7c6fec518e223a120b Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 12:09:51 +0000
Subject: [PATCH 05/25] surface new per-deal workflow fields on HubspotDeal
 type

---
 .../(portfolio)/your-projects/live/page.tsx       | 14 ++++++++++++++
 .../(portfolio)/your-projects/live/types.ts       | 15 +++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx
index aae8d8f..5dbf7ca 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx
@@ -69,12 +69,26 @@ function mapDbRowToHubspotDeal(row: DealRow): HubspotDeal {
     measuresLodgementDate: d.measuresLodgementDate,
     fullLodgementDate: d.lodgementDate,
     confirmedSurveyDate: d.confirmedSurveyDate,
+    confirmedSurveyTime: d.confirmedSurveyTime,
     surveyedDate: d.surveyedDate,
     designType: d.dealType,
     eiScore: d.eiScore,
     eiScorePotential: d.eiScorePotential,
     epcSapScore: d.epcSapScore,
     epcSapScorePotential: d.epcSapScorePotential,
+    // New per-deal workflow fields
+    surveyType: d.surveyType,
+    measuresForPibiOrdered: d.measuresForPibiOrdered,
+    pibiOrderDate: d.pibiOrderDate,
+    pibiCompletedDate: d.pibiCompletedDate,
+    propertyHaltedDate: d.propertyHaltedDate,
+    propertyHaltedReason: d.propertyHaltedReason,
+    technicalApprovedMeasuresForInstall: d.technicalApprovedMeasuresForInstall,
+    // domna_survey_type column does not exist on the schema yet (slice 7) —
+    // surface null and let the drawer fall back to the legacy boolean.
+    domnaSurveyType: null,
+    domnaSurveyRequired: d.domnaSurveyRequired,
+    domnaSurveyDate: d.domnaSurveyDate,
     createdAt: d.createdAt,
     updatedAt: d.updatedAt,
   };
diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/types.ts b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/types.ts
index 63d022b..9b775af 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/types.ts
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/types.ts
@@ -45,6 +45,7 @@ export type HubspotDeal = {
   measuresLodgementDate: Date | null;
   fullLodgementDate: Date | null;
   confirmedSurveyDate: Date | null;
+  confirmedSurveyTime: string | null;
   surveyedDate: Date | null;
   designType: string | null;
   eiScore: string | null;
@@ -52,6 +53,20 @@ export type HubspotDeal = {
   epcSapScore: string | null;
   epcSapScorePotential: string | null;
 
+  // ── New per-deal workflow fields (issue #249 slice) ────────────────────
+  surveyType: string | null;
+  measuresForPibiOrdered: string | null;
+  pibiOrderDate: Date | null;
+  pibiCompletedDate: Date | null;
+  propertyHaltedDate: Date | null;
+  propertyHaltedReason: string | null;
+  technicalApprovedMeasuresForInstall: string | null;
+  // domnaSurveyType is the new text column added in slice 7. It may not yet
+  // exist in the schema; until then the legacy boolean is used as a fallback.
+  domnaSurveyType: string | null;
+  domnaSurveyRequired: boolean | null;
+  domnaSurveyDate: Date | null;
+
   createdAt: Date;
   updatedAt: Date;
 };

From 75c0cde009a613ebe6893b33b382440fa6770386 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 12:09:57 +0000
Subject: [PATCH 06/25] widen drawer and add stage-ordered read-only sections

---
 .../live/PropertyDetailDrawer.tsx             | 185 ++++++++++++++++--
 1 file changed, 171 insertions(+), 14 deletions(-)

diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
index f34cf3e..70f5989 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { X, CheckCircle2, Circle, AlertTriangle, ChevronRight, ChevronDown, Trash2, RotateCcw } from "lucide-react";
 import {
@@ -25,6 +25,17 @@ import {
 } from "@/app/shadcn_components/ui/tooltip";
 import { STAGE_COLORS } from "./types";
 import type { ClassifiedDeal, PortfolioCapabilityType, RemovalRequest } from "./types";
+import { parseMeasures } from "@/app/lib/parseMeasures";
+
+// Sections that the drawer can scroll-focus on initial open. Keep the keys in
+// stable, stage-ordered order so the layout remains predictable.
+export type DrawerSection =
+  | "survey"
+  | "measures"
+  | "pibi"
+  | "domna"
+  | "halted"
+  | "technical";
 
 // -----------------------------------------------------------------------
 // Removal request section
@@ -476,6 +487,34 @@ interface PropertyDetailDrawerProps {
   userRole: string;
   userCapability: PortfolioCapabilityType;
   userEmail: string;
+  /**
+   * If provided, the drawer scrolls the named section into view on open. This
+   * powers entry-points like the Measures table row click that should land
+   * the user inside the Measures section instead of the top of the drawer.
+   */
+  focusSection?: DrawerSection;
+}
+
+// Section metadata — central to keep the on-screen ordering aligned with the
+// stage-ordered acceptance criteria of issue #251.
+const SECTION_TITLES: Record<DrawerSection, string> = {
+  survey: "Survey",
+  measures: "Measures",
+  pibi: "PIBI",
+  domna: "Domna Survey",
+  halted: "Halted",
+  technical: "Technical Approved",
+};
+
+function SectionHeader({ id, label }: { id: DrawerSection; label: string }) {
+  return (
+    <h3
+      data-testid={`drawer-section-${id}`}
+      className="text-xs font-bold uppercase tracking-wider text-gray-400 mb-3"
+    >
+      {label}
+    </h3>
+  );
 }
 
 export default function PropertyDetailDrawer({
@@ -484,13 +523,54 @@ export default function PropertyDetailDrawer({
   onClose,
   userRole,
   userCapability,
+  focusSection,
 }: PropertyDetailDrawerProps) {
   const open = !!deal;
   const [isLogOpen, setIsLogOpen] = useState(false);
 
+  // Refs for each scroll-targetable section.
+  const sectionRefs = useRef<Record<DrawerSection, HTMLDivElement | null>>({
+    survey: null,
+    measures: null,
+    pibi: null,
+    domna: null,
+    halted: null,
+    technical: null,
+  });
+
+  // Scroll the requested section into view once the drawer has rendered.
+  useEffect(() => {
+    if (!open || !focusSection) return;
+    // Defer to next tick so the drawer body has mounted.
+    const t = setTimeout(() => {
+      const el = sectionRefs.current[focusSection];
+      if (el) el.scrollIntoView({ behavior: "smooth", block: "start" });
+    }, 50);
+    return () => clearTimeout(t);
+  }, [open, focusSection, deal?.dealId]);
+
+  // Parsed measure lists used by the new sections.
+  const pibiMeasures = parseMeasures(deal?.measuresForPibiOrdered ?? null);
+  const technicalApprovedMeasures = parseMeasures(
+    deal?.technicalApprovedMeasuresForInstall ?? null,
+  );
+
+  // Domna section: prefer the new text column when present, otherwise fall
+  // back to the legacy boolean ("Required" / "Not required").
+  const domnaSurveyTypeDisplay: string | null = (() => {
+    if (!deal) return null;
+    if (deal.domnaSurveyType) return deal.domnaSurveyType;
+    if (deal.domnaSurveyRequired === true) return "Required";
+    if (deal.domnaSurveyRequired === false) return "Not required";
+    return null;
+  })();
+
   return (
     <Drawer open={open} onOpenChange={(v) => !v && onClose()} direction="right">
-      <DrawerContent className="fixed right-0 top-0 bottom-0 h-full w-[42vw] min-w-80 max-w-lg rounded-l-2xl rounded-r-none mt-0 flex flex-col border-l border-t-0 border-b-0 border-r-0 border-brandblue/10 bg-white shadow-2xl overflow-hidden">
+      <DrawerContent
+        data-testid="property-detail-drawer"
+        className="fixed right-0 top-0 bottom-0 h-full w-[60vw] max-w-5xl rounded-l-2xl rounded-r-none mt-0 flex flex-col border-l border-t-0 border-b-0 border-r-0 border-brandblue/10 bg-white shadow-2xl overflow-hidden"
+      >
         <div className="hidden" />
 
         {deal && (
@@ -547,7 +627,7 @@ export default function PropertyDetailDrawer({
                 </div>
               )}
 
-              {/* Key details */}
+              {/* Property details (general context — kept above stage sections) */}
               <div>
                 <h3 className="text-xs font-bold uppercase tracking-wider text-gray-400 mb-3">Property Details</h3>
                 <div className="divide-y divide-gray-50">
@@ -578,18 +658,95 @@ export default function PropertyDetailDrawer({
                 </div>
               </div>
 
-              {/* Measures */}
-              {(deal.proposedMeasures || deal.approvedPackage || deal.actualMeasuresInstalled) && (
-                <div>
-                  <h3 className="text-xs font-bold uppercase tracking-wider text-gray-400 mb-3">Measures</h3>
-                  <div className="divide-y divide-gray-50">
-                    <InfoRow label="Proposed" value={deal.proposedMeasures} />
-                    <InfoRow label="Approved Package" value={deal.approvedPackage} />
-                    <InfoRow label="Installed" value={deal.actualMeasuresInstalled} />
-                    <InfoRow label="Lodgement Status" value={deal.lodgementStatus} />
-                  </div>
+              {/* Survey section */}
+              <div ref={(el) => { sectionRefs.current.survey = el; }}>
+                <SectionHeader id="survey" label={SECTION_TITLES.survey} />
+                <div className="divide-y divide-gray-50">
+                  <InfoRow label="Survey Type" value={deal.surveyType} />
+                  <InfoRow label="Surveyed Date" value={formatDate(deal.surveyedDate)} />
+                  <InfoRow label="Confirmed Survey Date" value={formatDate(deal.confirmedSurveyDate)} />
+                  <InfoRow label="Confirmed Survey Time" value={deal.confirmedSurveyTime} />
                 </div>
-              )}
+              </div>
+
+              {/* Measures section — keeps existing approval table content */}
+              <div ref={(el) => { sectionRefs.current.measures = el; }}>
+                <SectionHeader id="measures" label={SECTION_TITLES.measures} />
+                <div className="divide-y divide-gray-50">
+                  <InfoRow label="Proposed" value={deal.proposedMeasures} />
+                  <InfoRow label="Approved Package" value={deal.approvedPackage} />
+                  <InfoRow label="Installed" value={deal.actualMeasuresInstalled} />
+                  <InfoRow label="Lodgement Status" value={deal.lodgementStatus} />
+                </div>
+              </div>
+
+              {/* PIBI section */}
+              <div ref={(el) => { sectionRefs.current.pibi = el; }}>
+                <SectionHeader id="pibi" label={SECTION_TITLES.pibi} />
+                <div className="divide-y divide-gray-50">
+                  <InfoRow label="PIBI Order Date" value={formatDate(deal.pibiOrderDate)} />
+                  <InfoRow label="PIBI Completed Date" value={formatDate(deal.pibiCompletedDate)} />
+                  <InfoRow
+                    label="Measures for PIBI"
+                    value={
+                      pibiMeasures.length > 0 ? (
+                        <span className="flex flex-wrap gap-1.5">
+                          {pibiMeasures.map((m) => (
+                            <span
+                              key={m}
+                              className="px-2 py-0.5 rounded-full text-[11px] bg-gray-50 border border-gray-200 text-gray-600"
+                            >
+                              {m}
+                            </span>
+                          ))}
+                        </span>
+                      ) : null
+                    }
+                  />
+                </div>
+              </div>
+
+              {/* Domna Survey section */}
+              <div ref={(el) => { sectionRefs.current.domna = el; }}>
+                <SectionHeader id="domna" label={SECTION_TITLES.domna} />
+                <div className="divide-y divide-gray-50">
+                  <InfoRow label="Domna Survey Type" value={domnaSurveyTypeDisplay} />
+                  <InfoRow label="Domna Survey Date" value={formatDate(deal.domnaSurveyDate)} />
+                </div>
+              </div>
+
+              {/* Halted section */}
+              <div ref={(el) => { sectionRefs.current.halted = el; }}>
+                <SectionHeader id="halted" label={SECTION_TITLES.halted} />
+                <div className="divide-y divide-gray-50">
+                  <InfoRow label="Property Halted Date" value={formatDate(deal.propertyHaltedDate)} />
+                  <InfoRow label="Property Halted Reason" value={deal.propertyHaltedReason} />
+                </div>
+              </div>
+
+              {/* Technical Approved section */}
+              <div ref={(el) => { sectionRefs.current.technical = el; }}>
+                <SectionHeader id="technical" label={SECTION_TITLES.technical} />
+                <div className="divide-y divide-gray-50">
+                  <InfoRow
+                    label="Technical Approved Measures"
+                    value={
+                      technicalApprovedMeasures.length > 0 ? (
+                        <span className="flex flex-wrap gap-1.5">
+                          {technicalApprovedMeasures.map((m) => (
+                            <span
+                              key={m}
+                              className="px-2 py-0.5 rounded-full text-[11px] bg-emerald-50 border border-emerald-200 text-emerald-700"
+                            >
+                              {m}
+                            </span>
+                          ))}
+                        </span>
+                      ) : null
+                    }
+                  />
+                </div>
+              </div>
 
               {/* Timeline */}
               <div>

From 0fe8dd0ac961a690d3e36be043c5eb47499310d9 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 12:10:08 +0000
Subject: [PATCH 07/25] open detail drawer at Measures section on row click

---
 .../your-projects/live/LiveTracker.tsx        | 21 ++++++++++++--
 .../your-projects/live/MeasuresTable.tsx      | 28 +++++++++++++++++--
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/LiveTracker.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/LiveTracker.tsx
index f162c1b..2a6929b 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/LiveTracker.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/LiveTracker.tsx
@@ -22,7 +22,7 @@ import DocumentTable from "./DocumentTable";
 import MeasuresTable from "./MeasuresTable";
 import type { HubspotDeal } from "./types";
 import PropertyDrawer from "./PropertyDrawer";
-import PropertyDetailDrawer from "./PropertyDetailDrawer";
+import PropertyDetailDrawer, { type DrawerSection } from "./PropertyDetailDrawer";
 import AnalyticsView from "./AnalyticsView";
 import type {
   LiveTrackerProps,
@@ -77,6 +77,19 @@ export default function LiveTracker({
 
   // ── Property detail drawer ───────────────────────────────────────────
   const [detailDeal, setDetailDeal] = useState<ClassifiedDeal | null>(null);
+  const [detailFocusSection, setDetailFocusSection] = useState<
+    DrawerSection | undefined
+  >(undefined);
+
+  const openDetailDrawer = (deal: ClassifiedDeal, section?: DrawerSection) => {
+    setDetailFocusSection(section);
+    setDetailDeal(deal);
+  };
+
+  const closeDetailDrawer = () => {
+    setDetailDeal(null);
+    setDetailFocusSection(undefined);
+  };
 
   const handleOpenTable = (
     stage: string,
@@ -230,7 +243,7 @@ export default function LiveTracker({
             <PropertyTable
               data={currentProject?.allDeals ?? []}
               onOpenDrawer={handleOpenDrawer}
-              onOpenDetail={setDetailDeal}
+              onOpenDetail={(deal) => openDetailDrawer(deal)}
               docStatusMap={docStatusMap}
               removalStatusByDeal={removalStatusByDeal}
             />
@@ -310,6 +323,7 @@ export default function LiveTracker({
               userCapability={userCapability}
               approvalsByDeal={approvalsByDeal}
               portfolioId={portfolioId}
+              onOpenDetail={(deal) => openDetailDrawer(deal, "measures")}
             />
           </div>
         </TabsContent>
@@ -427,11 +441,12 @@ export default function LiveTracker({
       {/* ── Property detail drawer ─────────────────────────────────────── */}
       <PropertyDetailDrawer
         deal={detailDeal}
-        onClose={() => setDetailDeal(null)}
+        onClose={closeDetailDrawer}
         portfolioId={portfolioId}
         userRole={userRole}
         userCapability={userCapability}
         userEmail={userEmail}
+        focusSection={detailFocusSection}
       />
     </div>
   );
diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/MeasuresTable.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/MeasuresTable.tsx
index 764a6eb..4ed29e9 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/MeasuresTable.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/MeasuresTable.tsx
@@ -35,6 +35,12 @@ type Props = {
   userCapability: PortfolioCapabilityType;
   approvalsByDeal: ApprovalsByDeal;
   portfolioId: string;
+  /**
+   * Called when a measures row is clicked. The host (LiveTracker) opens the
+   * PropertyDetailDrawer focused on the Measures section. Optional so the
+   * table is still usable in isolation.
+   */
+  onOpenDetail?: (deal: ClassifiedDeal) => void;
 };
 
 function ApprovalStatus({
@@ -155,6 +161,7 @@ export default function MeasuresTable({
   userCapability,
   approvalsByDeal,
   portfolioId,
+  onOpenDetail,
 }: Props) {
   const [search, setSearch] = useState("");
   // pendingChanges: dealId -> desired Set<measureName> (the full intended approved set)
@@ -338,15 +345,31 @@ export default function MeasuresTable({
               const hasPending = pendingChanges[deal.dealId] !== undefined;
               const isExpanded = expandedRows.has(deal.dealId);
 
+              const handleRowClick = () => {
+                if (onOpenDetail) onOpenDetail(deal);
+              };
+              const handleRowKeyDown = (e: React.KeyboardEvent<HTMLTableRowElement>) => {
+                if (!onOpenDetail) return;
+                if (e.key === "Enter" || e.key === " ") {
+                  e.preventDefault();
+                  onOpenDetail(deal);
+                }
+              };
+
               return (
                 <React.Fragment key={deal.dealId}>
                   <TableRow
-                    className={`border-b border-gray-50 hover:bg-gray-50/50 transition-colors ${hasPending ? "bg-amber-50/30" : ""}`}
+                    data-testid="measures-row"
+                    onClick={onOpenDetail ? handleRowClick : undefined}
+                    onKeyDown={onOpenDetail ? handleRowKeyDown : undefined}
+                    tabIndex={onOpenDetail ? 0 : undefined}
+                    role={onOpenDetail ? "button" : undefined}
+                    className={`border-b border-gray-50 hover:bg-gray-50/50 transition-colors ${hasPending ? "bg-amber-50/30" : ""} ${onOpenDetail ? "cursor-pointer" : ""}`}
                   >
                     {/* Expand toggle */}
                     <TableCell className="py-3 pl-3 pr-0 w-6">
                       <button
-                        onClick={() => toggleRowExpand(deal.dealId)}
+                        onClick={(e) => { e.stopPropagation(); toggleRowExpand(deal.dealId); }}
                         className="text-gray-400 hover:text-brandblue transition-colors"
                         aria-label={isExpanded ? "Collapse activity" : "Expand activity"}
                       >
@@ -389,6 +412,7 @@ export default function MeasuresTable({
                             return (
                               <label
                                 key={measure}
+                                onClick={(e) => e.stopPropagation()}
                                 className={`flex items-center gap-1.5 cursor-pointer px-2 py-1 rounded-full text-xs border transition-colors ${
                                   isApproved
                                     ? "bg-emerald-50 border-emerald-200 text-emerald-700"

From f6aaa89c5b9b1ab611b54ce1e4c7b612624fa12d Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 12:10:14 +0000
Subject: [PATCH 08/25] add cypress spec for measures row drawer flow

---
 .../property-detail-drawer.cy.js              | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 cypress/e2e/live-tracking/property-detail-drawer.cy.js

diff --git a/cypress/e2e/live-tracking/property-detail-drawer.cy.js b/cypress/e2e/live-tracking/property-detail-drawer.cy.js
new file mode 100644
index 0000000..4e37908
--- /dev/null
+++ b/cypress/e2e/live-tracking/property-detail-drawer.cy.js
@@ -0,0 +1,55 @@
+/**
+ * Live Tracking — Property Detail Drawer (issue #251)
+ *
+ * Verifies the row-click flow on the Measures tab: clicking a row in the
+ * MeasuresTable opens the PropertyDetailDrawer and all six stage-ordered
+ * sections are visible in the body.
+ *
+ * The spec assumes an authenticated session can be reused (or skipped) the
+ * same way the rest of the suite handles it. Because live tracking is a
+ * portfolio-scoped page, the test reads the target portfolio slug from the
+ * `LIVE_PORTFOLIO_SLUG` Cypress env var so it can run against any seeded
+ * environment without hard-coding an ID.
+ */
+
+const PORTFOLIO_SLUG = Cypress.env("LIVE_PORTFOLIO_SLUG");
+
+const EXPECTED_SECTIONS = [
+  "survey",
+  "measures",
+  "pibi",
+  "domna",
+  "halted",
+  "technical",
+];
+
+describe("Property detail drawer — measures row click", function () {
+  before(function () {
+    if (!PORTFOLIO_SLUG) {
+      // Skip the suite entirely when the env var is absent. The spec still
+      // compiles so CI pipelines that lint Cypress files stay green.
+      cy.log(
+        "LIVE_PORTFOLIO_SLUG env var not set — skipping live tracking specs",
+      );
+      this.skip();
+    }
+  });
+
+  it("opens the drawer focused on Measures and shows all six sections", () => {
+    cy.visit(`/portfolio/${PORTFOLIO_SLUG}/your-projects/live`);
+
+    // Switch to the Measures tab.
+    cy.contains("button, [role=tab]", "Measures").click();
+
+    // Click the first measures row.
+    cy.get("[data-testid=measures-row]").first().click();
+
+    // Drawer is open.
+    cy.get("[data-testid=property-detail-drawer]").should("be.visible");
+
+    // All six sections rendered inside the drawer.
+    EXPECTED_SECTIONS.forEach((section) => {
+      cy.get(`[data-testid=drawer-section-${section}]`).should("exist");
+    });
+  });
+});

From b8befe56fe38975a03e9d71135494026c768e27b Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 14:33:59 +0000
Subject: [PATCH 09/25] add deal-properties PATCH endpoint and update service

---
 .../[portfolioId]/deal-properties/route.ts    | 115 +++++++
 src/app/lib/dealPropertyUpdate.test.ts        | 161 ++++++++++
 src/app/lib/dealPropertyUpdate.ts             | 296 ++++++++++++++++++
 3 files changed, 572 insertions(+)
 create mode 100644 src/app/api/portfolio/[portfolioId]/deal-properties/route.ts
 create mode 100644 src/app/lib/dealPropertyUpdate.test.ts
 create mode 100644 src/app/lib/dealPropertyUpdate.ts

diff --git a/src/app/api/portfolio/[portfolioId]/deal-properties/route.ts b/src/app/api/portfolio/[portfolioId]/deal-properties/route.ts
new file mode 100644
index 0000000..7cfc348
--- /dev/null
+++ b/src/app/api/portfolio/[portfolioId]/deal-properties/route.ts
@@ -0,0 +1,115 @@
+import { NextRequest, NextResponse } from "next/server";
+import { getServerSession } from "next-auth";
+import { and, eq } from "drizzle-orm";
+import { z } from "zod";
+
+import { AuthOptions } from "@/app/api/auth/[...nextauth]/authOptions";
+import { db } from "@/app/db/db";
+import { portfolioUsers } from "@/app/db/schema/portfolio";
+import { user } from "@/app/db/schema/users";
+import { applyDealPropertyUpdate } from "@/app/lib/dealPropertyUpdate";
+
+const patchSchema = z.object({
+  dealId: z.string().min(1, "dealId is required"),
+  fields: z.record(z.unknown()),
+});
+
+/**
+ * PATCH /api/portfolio/[portfolioId]/deal-properties
+ *
+ * Single update path for whitelisted, role-gated fields on
+ * `hubspot_deal_data`. The route is responsible for AuthN + portfolio role
+ * lookup; per-field validation, permission check, DB write and HubSpot
+ * push are delegated to `applyDealPropertyUpdate`.
+ *
+ * Body shape:
+ *   {
+ *     "dealId": "12345",
+ *     "fields": {
+ *       "pibi_order_date":     "2025-03-12T00:00:00.000Z" | null,
+ *       "pibi_completed_date": "2025-04-02T00:00:00.000Z" | null,
+ *       ...
+ *     }
+ *   }
+ *
+ * Response:
+ *   200 { results: { [field]: { ok: true } | { ok: false, error } },
+ *         hubspotSync: "ok" | "failed" | "skipped",
+ *         hubspotError?: string }
+ */
+export async function PATCH(
+  req: NextRequest,
+  props: { params: Promise<{ portfolioId: string }> },
+) {
+  const { portfolioId } = await props.params;
+
+  const session = await getServerSession(AuthOptions);
+  if (!session?.user?.email) {
+    return NextResponse.json({ error: "Unauthorised" }, { status: 401 });
+  }
+
+  let body: unknown;
+  try {
+    body = await req.json();
+  } catch {
+    return NextResponse.json({ error: "Invalid JSON" }, { status: 400 });
+  }
+
+  const parsed = patchSchema.safeParse(body);
+  if (!parsed.success) {
+    return NextResponse.json(
+      { error: parsed.error.flatten() },
+      { status: 400 },
+    );
+  }
+
+  const { dealId, fields } = parsed.data;
+
+  // Look up the calling user's role on this portfolio. The service
+  // enforces per-field permissions but we still need a role string to
+  // pass through.
+  const userRow = await db
+    .select({ id: user.id })
+    .from(user)
+    .where(eq(user.email, session.user.email))
+    .limit(1);
+
+  if (!userRow[0]) {
+    return NextResponse.json({ error: "User not found" }, { status: 404 });
+  }
+
+  const portfolioUserRow = await db
+    .select({ role: portfolioUsers.role })
+    .from(portfolioUsers)
+    .where(
+      and(
+        eq(portfolioUsers.portfolioId, BigInt(portfolioId)),
+        eq(portfolioUsers.userId, userRow[0].id),
+      ),
+    )
+    .limit(1);
+
+  const role = portfolioUserRow[0]?.role;
+  if (!role) {
+    return NextResponse.json(
+      { error: "No portfolio access" },
+      { status: 403 },
+    );
+  }
+
+  try {
+    const outcome = await applyDealPropertyUpdate({
+      dealId,
+      fields,
+      role,
+    });
+
+    return NextResponse.json(outcome);
+  } catch (err) {
+    console.error("[deal-properties PATCH]", err);
+    return NextResponse.json(
+      { error: "Internal server error" },
+      { status: 500 },
+    );
+  }
+}
diff --git a/src/app/lib/dealPropertyUpdate.test.ts b/src/app/lib/dealPropertyUpdate.test.ts
new file mode 100644
index 0000000..b36d807
--- /dev/null
+++ b/src/app/lib/dealPropertyUpdate.test.ts
@@ -0,0 +1,161 @@
+import { describe, expect, it, vi } from "vitest";
+import {
+  applyDealPropertyUpdate,
+  DEAL_PROPERTY_FIELDS,
+  isDealPropertyField,
+  roleAllowedForField,
+} from "./dealPropertyUpdate";
+
+describe("DEAL_PROPERTY_FIELDS registry", () => {
+  it("exposes the two PIBI date fields with write-or-above permissions", () => {
+    expect(isDealPropertyField("pibi_order_date")).toBe(true);
+    expect(isDealPropertyField("pibi_completed_date")).toBe(true);
+    expect(roleAllowedForField("pibi_order_date", "read")).toBe(false);
+    expect(roleAllowedForField("pibi_order_date", "write")).toBe(true);
+    expect(roleAllowedForField("pibi_order_date", "admin")).toBe(true);
+    expect(roleAllowedForField("pibi_order_date", "creator")).toBe(true);
+    expect(roleAllowedForField("pibi_completed_date", "read")).toBe(false);
+    expect(roleAllowedForField("pibi_completed_date", "write")).toBe(true);
+  });
+
+  it("maps each registered field to the matching HubSpot property", () => {
+    expect(DEAL_PROPERTY_FIELDS.pibi_order_date.hubspotProperty).toBe(
+      "pibi_order_date",
+    );
+    expect(DEAL_PROPERTY_FIELDS.pibi_completed_date.hubspotProperty).toBe(
+      "pibi_completed_date",
+    );
+  });
+
+  it("rejects unknown fields", () => {
+    expect(isDealPropertyField("not_a_field")).toBe(false);
+  });
+});
+
+describe("applyDealPropertyUpdate", () => {
+  it("rejects non-whitelisted fields without writing or syncing", async () => {
+    const updateDb = vi.fn();
+    const pushHubspot = vi.fn();
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-1",
+      fields: { unknown_field: "x" },
+      role: "write",
+      deps: { updateDb, pushHubspot },
+    });
+    expect(out.results.unknown_field).toEqual({
+      ok: false,
+      error: "Field not editable",
+    });
+    expect(out.hubspotSync).toBe("skipped");
+    expect(updateDb).not.toHaveBeenCalled();
+    expect(pushHubspot).not.toHaveBeenCalled();
+  });
+
+  it("rejects PIBI fields when the user role is read", async () => {
+    const updateDb = vi.fn();
+    const pushHubspot = vi.fn();
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-1",
+      fields: { pibi_order_date: "2025-01-15" },
+      role: "read",
+      deps: { updateDb, pushHubspot },
+    });
+    expect(out.results.pibi_order_date).toEqual({
+      ok: false,
+      error: "Insufficient permissions",
+    });
+    expect(out.hubspotSync).toBe("skipped");
+    expect(updateDb).not.toHaveBeenCalled();
+    expect(pushHubspot).not.toHaveBeenCalled();
+  });
+
+  it("rejects values that fail validation", async () => {
+    const updateDb = vi.fn();
+    const pushHubspot = vi.fn();
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-1",
+      fields: { pibi_order_date: "not-a-real-date" },
+      role: "write",
+      deps: { updateDb, pushHubspot },
+    });
+    expect(out.results.pibi_order_date.ok).toBe(false);
+    expect(out.hubspotSync).toBe("skipped");
+    expect(updateDb).not.toHaveBeenCalled();
+    expect(pushHubspot).not.toHaveBeenCalled();
+  });
+
+  it("persists valid fields to the DB and pushes them to HubSpot", async () => {
+    const updateDb = vi.fn().mockResolvedValue(undefined);
+    const pushHubspot = vi.fn().mockResolvedValue({ ok: true });
+    const orderIso = "2025-03-12T00:00:00.000Z";
+    const completedIso = "2025-04-02T00:00:00.000Z";
+
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-42",
+      fields: {
+        pibi_order_date: orderIso,
+        pibi_completed_date: completedIso,
+      },
+      role: "write",
+      deps: { updateDb, pushHubspot },
+    });
+
+    expect(out.results.pibi_order_date).toEqual({ ok: true });
+    expect(out.results.pibi_completed_date).toEqual({ ok: true });
+    expect(out.hubspotSync).toBe("ok");
+
+    expect(updateDb).toHaveBeenCalledTimes(1);
+    const [dealIdArg, valuesArg] = updateDb.mock.calls[0];
+    expect(dealIdArg).toBe("deal-42");
+    expect(valuesArg.pibiOrderDate).toBeInstanceOf(Date);
+    expect((valuesArg.pibiOrderDate as Date).toISOString()).toBe(orderIso);
+    expect((valuesArg.pibiCompletedDate as Date).toISOString()).toBe(
+      completedIso,
+    );
+
+    expect(pushHubspot).toHaveBeenCalledTimes(1);
+    const pushArg = pushHubspot.mock.calls[0][0];
+    expect(pushArg.hubspotDealId).toBe("deal-42");
+    // HubSpot expects epoch milliseconds as strings for date properties.
+    expect(pushArg.properties.pibi_order_date).toBe(
+      String(new Date(orderIso).getTime()),
+    );
+    expect(pushArg.properties.pibi_completed_date).toBe(
+      String(new Date(completedIso).getTime()),
+    );
+  });
+
+  it("clears a date when null is supplied (sends empty string to HubSpot)", async () => {
+    const updateDb = vi.fn().mockResolvedValue(undefined);
+    const pushHubspot = vi.fn().mockResolvedValue({ ok: true });
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-7",
+      fields: { pibi_order_date: null },
+      role: "admin",
+      deps: { updateDb, pushHubspot },
+    });
+    expect(out.results.pibi_order_date).toEqual({ ok: true });
+    expect(out.hubspotSync).toBe("ok");
+    expect(updateDb.mock.calls[0][1].pibiOrderDate).toBeNull();
+    expect(pushHubspot.mock.calls[0][0].properties.pibi_order_date).toBe("");
+  });
+
+  it("surfaces HubSpot push failures back to the caller", async () => {
+    const updateDb = vi.fn().mockResolvedValue(undefined);
+    const pushHubspot = vi
+      .fn()
+      .mockResolvedValue({ ok: false, error: "boom" });
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-9",
+      fields: { pibi_order_date: "2025-05-01T00:00:00.000Z" },
+      role: "write",
+      deps: { updateDb, pushHubspot },
+    });
+    expect(out.results.pibi_order_date).toEqual({ ok: true });
+    expect(out.hubspotSync).toBe("failed");
+    expect(out.hubspotError).toBe("boom");
+    // DB update still happened — UI gets the optimistic value, error is
+    // surfaced separately.
+    expect(updateDb).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/src/app/lib/dealPropertyUpdate.ts b/src/app/lib/dealPropertyUpdate.ts
new file mode 100644
index 0000000..0ec2aa4
--- /dev/null
+++ b/src/app/lib/dealPropertyUpdate.ts
@@ -0,0 +1,296 @@
+/**
+ * Deal-property update service (issue #252)
+ *
+ * Centralised, whitelist-driven helper for the
+ * `PATCH /api/portfolio/[portfolioId]/deal-properties` endpoint. Each
+ * editable field on `hubspot_deal_data` is registered here once with:
+ *
+ *   - the role required to write it
+ *   - a Zod parser that validates + coerces the inbound value
+ *   - the matching HubSpot deal property name (used by the sync push)
+ *   - the Drizzle column to update
+ *
+ * Slice 5 (this issue) ships the two PIBI date fields. Slices 6 and 7
+ * (issues #255 / #256) plug the halted state and Domna survey fields into
+ * the same registry without changing the route, the service entry point or
+ * the per-field permission logic.
+ */
+import { z, ZodTypeAny } from "zod";
+import { eq } from "drizzle-orm";
+import { db } from "@/app/db/db";
+import { hubspotDealData } from "@/app/db/schema/crm/hubspot_deal_table";
+import { getHubSpotClient } from "@/app/lib/hubspot/client";
+
+// -----------------------------------------------------------------------
+// Field registry
+// -----------------------------------------------------------------------
+
+/** Roles ordered from most permissive to least. */
+export type DealPropertyRole = "read" | "write" | "admin" | "creator";
+
+/** Roles that satisfy a "write or above" requirement. */
+export const WRITE_OR_ABOVE_ROLES: ReadonlyArray<DealPropertyRole> = [
+  "write",
+  "admin",
+  "creator",
+];
+
+const isoDateSchema = z
+  .union([z.string(), z.null()])
+  .transform((v, ctx) => {
+    if (v === null || v === "") return null;
+    const d = new Date(v);
+    if (Number.isNaN(d.getTime())) {
+      ctx.addIssue({ code: z.ZodIssueCode.custom, message: "Invalid date" });
+      return z.NEVER;
+    }
+    return d;
+  });
+
+type DateColumn = typeof hubspotDealData.pibiOrderDate;
+type TextColumn = typeof hubspotDealData.propertyHaltedReason;
+type BoolColumn = typeof hubspotDealData.domnaSurveyRequired;
+
+type ColumnFor<T> = T extends Date | null
+  ? DateColumn
+  : T extends string | null
+    ? TextColumn
+    : T extends boolean | null
+      ? BoolColumn
+      : never;
+
+interface DealPropertyFieldDef<TParsed = unknown> {
+  /** Schema used to parse the incoming JSON value. */
+  schema: ZodTypeAny;
+  /** Allowed roles. Empty array means "no role can write" (i.e. read-only). */
+  allowedRoles: ReadonlyArray<DealPropertyRole>;
+  /** Property name on the HubSpot deal object. */
+  hubspotProperty: string;
+  /**
+   * Drizzle column to update. Typed loosely because we mix date/text/bool
+   * columns in the same registry; the per-field schema enforces shape.
+   */
+  dbColumn: unknown;
+  /**
+   * Optional renderer that turns the parsed value into the string HubSpot
+   * expects (HubSpot stores dates as epoch-millisecond strings, booleans as
+   * "true" / "false", text as-is). Defaults to the parsed value coerced via
+   * String(...).
+   */
+  toHubspot?: (value: TParsed) => string;
+}
+
+// -- HubSpot value formatters ------------------------------------------------
+const dateToHubspot = (d: Date | null): string =>
+  d === null ? "" : String(d.getTime());
+
+const stringToHubspot = (s: string | null): string => (s === null ? "" : s);
+
+const booleanToHubspot = (b: boolean | null): string =>
+  b === null ? "" : b ? "true" : "false";
+
+// -- Registry ----------------------------------------------------------------
+// Slice 5 ships PIBI dates only. Halted (#255) and Domna (#256) reuse the
+// same registry by adding entries here — no other code path needs to change.
+export const DEAL_PROPERTY_FIELDS = {
+  pibi_order_date: {
+    schema: isoDateSchema,
+    allowedRoles: WRITE_OR_ABOVE_ROLES,
+    hubspotProperty: "pibi_order_date",
+    dbColumn: hubspotDealData.pibiOrderDate,
+    toHubspot: dateToHubspot,
+  } satisfies DealPropertyFieldDef<Date | null>,
+  pibi_completed_date: {
+    schema: isoDateSchema,
+    allowedRoles: WRITE_OR_ABOVE_ROLES,
+    hubspotProperty: "pibi_completed_date",
+    dbColumn: hubspotDealData.pibiCompletedDate,
+    toHubspot: dateToHubspot,
+  } satisfies DealPropertyFieldDef<Date | null>,
+  // -- Slot for issue #255 (halted state) ----------------------------------
+  // property_halted_date / property_halted_reason will plug in here.
+  // -- Slot for issue #256 (Domna survey type / date) ----------------------
+  // domna_survey_type / domna_survey_date will plug in here.
+} as const;
+
+void stringToHubspot;
+void booleanToHubspot;
+
+export type DealPropertyFieldKey = keyof typeof DEAL_PROPERTY_FIELDS;
+
+export function isDealPropertyField(
+  key: string,
+): key is DealPropertyFieldKey {
+  return Object.prototype.hasOwnProperty.call(DEAL_PROPERTY_FIELDS, key);
+}
+
+export function roleAllowedForField(
+  field: DealPropertyFieldKey,
+  role: string | null | undefined,
+): boolean {
+  if (!role) return false;
+  return (DEAL_PROPERTY_FIELDS[field].allowedRoles as ReadonlyArray<string>).includes(role);
+}
+
+// -----------------------------------------------------------------------
+// Update orchestration
+// -----------------------------------------------------------------------
+
+export type DealPropertyResult =
+  | { ok: true }
+  | { ok: false; error: string };
+
+export type DealPropertyUpdateOutcome = {
+  /** Per-field results keyed by the same field name supplied by the caller. */
+  results: Record<string, DealPropertyResult>;
+  /** Overall HubSpot push outcome. `null` if no push attempted. */
+  hubspotSync: "ok" | "failed" | "skipped";
+  hubspotError?: string;
+};
+
+/**
+ * Push the validated, whitelisted property bag to HubSpot, retrying on
+ * `ECONNRESET`. Mirrors the retry pattern already used by
+ * `syncContractorDocUploadToHubSpot` / `syncMeasureApprovalsToHubSpot`.
+ */
+export async function pushDealPropertiesToHubSpot(params: {
+  hubspotDealId: string;
+  properties: Record<string, string>;
+}): Promise<{ ok: true } | { ok: false; error: string }> {
+  const maxAttempts = 3;
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    try {
+      const client = getHubSpotClient();
+      await client.crm.deals.basicApi.update(params.hubspotDealId, {
+        properties: params.properties,
+      });
+      return { ok: true };
+    } catch (err) {
+      const isReset =
+        err instanceof Error &&
+        "code" in err &&
+        (err as NodeJS.ErrnoException).code === "ECONNRESET";
+      if (isReset && attempt < maxAttempts) {
+        await new Promise((resolve) => setTimeout(resolve, 200 * attempt));
+        continue;
+      }
+      const message =
+        err instanceof Error ? err.message : "HubSpot sync failed";
+      console.error("[HubSpot] pushDealPropertiesToHubSpot failed", {
+        dealId: params.hubspotDealId,
+        attempt,
+        error: err,
+      });
+      return { ok: false, error: message };
+    }
+  }
+  return { ok: false, error: "HubSpot sync failed" };
+}
+
+export interface UpdateDealPropertiesInput {
+  /** HubSpot deal id (the value stored on `hubspot_deal_data.deal_id`). */
+  dealId: string;
+  /** Caller-supplied { fieldName: rawValue } map. */
+  fields: Record<string, unknown>;
+  /** Role of the authenticated user making the request. */
+  role: string;
+  /**
+   * Hooks injected by the route so the service can stay environment-free
+   * for unit testing. Defaults are wired in `applyDealPropertyUpdate`.
+   */
+  deps?: {
+    pushHubspot?: typeof pushDealPropertiesToHubSpot;
+    updateDb?: (
+      dealId: string,
+      values: Record<string, unknown>,
+    ) => Promise<void>;
+  };
+}
+
+async function defaultUpdateDb(
+  dealId: string,
+  values: Record<string, unknown>,
+): Promise<void> {
+  if (Object.keys(values).length === 0) return;
+  await db
+    .update(hubspotDealData)
+    .set(values)
+    .where(eq(hubspotDealData.dealId, dealId));
+}
+
+/**
+ * Validate caller-supplied fields, persist the accepted ones to the DB and
+ * push the same set to HubSpot. Returns per-field success / error so the
+ * route can surface partial failures back to the UI.
+ */
+export async function applyDealPropertyUpdate(
+  input: UpdateDealPropertiesInput,
+): Promise<DealPropertyUpdateOutcome> {
+  const results: Record<string, DealPropertyResult> = {};
+  const dbValues: Record<string, unknown> = {};
+  const hubspotProperties: Record<string, string> = {};
+
+  for (const [key, rawValue] of Object.entries(input.fields)) {
+    if (!isDealPropertyField(key)) {
+      results[key] = { ok: false, error: "Field not editable" };
+      continue;
+    }
+    if (!roleAllowedForField(key, input.role)) {
+      results[key] = { ok: false, error: "Insufficient permissions" };
+      continue;
+    }
+    const def = DEAL_PROPERTY_FIELDS[key];
+    const parsed = def.schema.safeParse(rawValue);
+    if (!parsed.success) {
+      results[key] = {
+        ok: false,
+        error: parsed.error.issues[0]?.message ?? "Invalid value",
+      };
+      continue;
+    }
+    results[key] = { ok: true };
+    // The Drizzle column type for date columns accepts Date | null.
+    const columnName = (def.dbColumn as { name?: string }).name;
+    if (columnName) {
+      // Drizzle .set() accepts the JS column key (camelCase). Look it up by
+      // walking the table object so we use the field name on the schema.
+      const tableKey = findColumnKey(def.dbColumn);
+      if (tableKey) dbValues[tableKey] = parsed.data;
+    }
+    const renderer = def.toHubspot as
+      | ((value: unknown) => string)
+      | undefined;
+    hubspotProperties[def.hubspotProperty] = renderer
+      ? renderer(parsed.data)
+      : String(parsed.data ?? "");
+  }
+
+  const updateDb = input.deps?.updateDb ?? defaultUpdateDb;
+  const pushHubspot = input.deps?.pushHubspot ?? pushDealPropertiesToHubSpot;
+
+  // No accepted fields → return early, nothing to sync.
+  if (Object.keys(dbValues).length === 0) {
+    return { results, hubspotSync: "skipped" };
+  }
+
+  await updateDb(input.dealId, dbValues);
+
+  const sync = await pushHubspot({
+    hubspotDealId: input.dealId,
+    properties: hubspotProperties,
+  });
+
+  if (sync.ok) return { results, hubspotSync: "ok" };
+  return { results, hubspotSync: "failed", hubspotError: sync.error };
+}
+
+/**
+ * Look up the JS-side property name on the Drizzle table for a given column
+ * object so we can index `db.update().set({ [key]: value })`.
+ */
+function findColumnKey(column: unknown): string | null {
+  for (const [key, value] of Object.entries(hubspotDealData)) {
+    if (value === column) return key;
+  }
+  return null;
+}

From 3d08a423a6d8881e0dc1efbe27bc9941513cc255 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 14:34:05 +0000
Subject: [PATCH 10/25] add editable PIBI dates section and cypress spec

---
 cypress/e2e/live-tracking/pibi-dates.cy.js    |  98 +++++++
 .../live/PropertyDetailDrawer.tsx             | 264 ++++++++++++++++--
 2 files changed, 341 insertions(+), 21 deletions(-)
 create mode 100644 cypress/e2e/live-tracking/pibi-dates.cy.js

diff --git a/cypress/e2e/live-tracking/pibi-dates.cy.js b/cypress/e2e/live-tracking/pibi-dates.cy.js
new file mode 100644
index 0000000..84098ab
--- /dev/null
+++ b/cypress/e2e/live-tracking/pibi-dates.cy.js
@@ -0,0 +1,98 @@
+/**
+ * Live Tracking — PIBI dates editor (issue #252)
+ *
+ * Verifies the write-role flow on the PIBI section of the property detail
+ * drawer: a `write` user can pick PIBI order and completion dates, hit
+ * Save, and the chosen dates are still reflected after the page is
+ * reloaded (i.e. the values were persisted server-side).
+ *
+ * The spec assumes an authenticated `write` session can be reused (or the
+ * test harness logs in via the same flow as the rest of the suite). The
+ * target portfolio slug + a deal id with PIBI fields editable for the
+ * write user are read from Cypress env vars so the spec stays portable.
+ */
+
+const PORTFOLIO_SLUG = Cypress.env("LIVE_PORTFOLIO_SLUG");
+const TARGET_DEAL_NAME = Cypress.env("LIVE_PIBI_DEAL_NAME");
+
+const ORDER_DATE = "2025-03-12";
+const COMPLETED_DATE = "2025-04-02";
+
+describe("PIBI dates editor — write user flow", function () {
+  before(function () {
+    if (!PORTFOLIO_SLUG) {
+      cy.log(
+        "LIVE_PORTFOLIO_SLUG env var not set — skipping live tracking specs",
+      );
+      this.skip();
+    }
+  });
+
+  function openDrawerForTargetDeal() {
+    cy.visit(`/portfolio/${PORTFOLIO_SLUG}/your-projects/live`);
+
+    // Switch to the Measures tab — the easiest way into the drawer.
+    cy.contains("button, [role=tab]", "Measures").click();
+
+    if (TARGET_DEAL_NAME) {
+      cy.contains("[data-testid=measures-row]", TARGET_DEAL_NAME).click();
+    } else {
+      cy.get("[data-testid=measures-row]").first().click();
+    }
+
+    cy.get("[data-testid=property-detail-drawer]").should("be.visible");
+    cy.get("[data-testid=drawer-section-pibi]").should("exist");
+  }
+
+  it("lets a write user set PIBI order + completion dates and persists them across reload", () => {
+    openDrawerForTargetDeal();
+
+    // Both date inputs render for write+ users.
+    cy.get("[data-testid=pibi-order-date-input]").should("be.visible");
+    cy.get("[data-testid=pibi-completed-date-input]").should("be.visible");
+
+    cy.get("[data-testid=pibi-order-date-input]")
+      .clear()
+      .type(ORDER_DATE);
+    cy.get("[data-testid=pibi-completed-date-input]")
+      .clear()
+      .type(COMPLETED_DATE);
+
+    // Save button should be enabled once values change.
+    cy.get("[data-testid=pibi-save-button]")
+      .should("not.be.disabled")
+      .click();
+
+    // Saving completes — the button label flips back from "Saving…" to
+    // "Save PIBI Dates" and no error banner is shown.
+    cy.get("[data-testid=pibi-save-button]").should(
+      "contain.text",
+      "Save PIBI Dates",
+    );
+    cy.get("[data-testid=pibi-error]").should("not.exist");
+
+    // Optimistic update — the inputs already reflect the new values.
+    cy.get("[data-testid=pibi-order-date-input]").should(
+      "have.value",
+      ORDER_DATE,
+    );
+    cy.get("[data-testid=pibi-completed-date-input]").should(
+      "have.value",
+      COMPLETED_DATE,
+    );
+
+    // Reload the page and reopen the drawer — the persisted values must
+    // still be there.
+    cy.reload();
+    openDrawerForTargetDeal();
+
+    cy.get("[data-testid=pibi-order-date-input]").should(
+      "have.value",
+      ORDER_DATE,
+    );
+    cy.get("[data-testid=pibi-completed-date-input]").should(
+      "have.value",
+      COMPLETED_DATE,
+    );
+  });
+});
diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
index 70f5989..b2c3dea 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { X, CheckCircle2, Circle, AlertTriangle, ChevronRight, ChevronDown, Trash2, RotateCcw } from "lucide-react";
 import {
@@ -477,6 +477,221 @@ function MilestoneTimeline({ deal }: { deal: ClassifiedDeal }) {
   );
 }
 
+// -----------------------------------------------------------------------
+// PIBI section — editable date pickers for write+ users (issue #252)
+// -----------------------------------------------------------------------
+
+/** Renders a `<input type="date">` value (yyyy-mm-dd) from a Date|string|null. */
+function toDateInputValue(d: Date | string | null | undefined): string {
+  if (!d) return "";
+  try {
+    const date = typeof d === "string" ? new Date(d) : d;
+    if (Number.isNaN(date.getTime())) return "";
+    // Use the date components (no timezone shift) so the picker shows the
+    // date the user originally selected.
+    const yyyy = date.getUTCFullYear();
+    const mm = String(date.getUTCMonth() + 1).padStart(2, "0");
+    const dd = String(date.getUTCDate()).padStart(2, "0");
+    return `${yyyy}-${mm}-${dd}`;
+  } catch {
+    return "";
+  }
+}
+
+/**
+ * Convert a yyyy-mm-dd value from the date input into an ISO string at UTC
+ * midnight, or null if the field has been cleared. We anchor to UTC so the
+ * date round-trips cleanly through HubSpot, which uses date-only properties.
+ */
+function dateInputToIso(value: string): string | null {
+  if (!value) return null;
+  return new Date(`${value}T00:00:00.000Z`).toISOString();
+}
+
+interface PibiDatesEditorProps {
+  dealId: string;
+  portfolioId: string;
+  /** Initial (server-provided) values, used when no optimistic update yet. */
+  initialOrderDate: Date | string | null;
+  initialCompletedDate: Date | string | null;
+  /** True when the user can write (creator/admin/write). */
+  canEdit: boolean;
+}
+
+function PibiDatesEditor({
+  dealId,
+  portfolioId,
+  initialOrderDate,
+  initialCompletedDate,
+  canEdit,
+}: PibiDatesEditorProps) {
+  const initialOrder = useMemo(
+    () => toDateInputValue(initialOrderDate),
+    [initialOrderDate],
+  );
+  const initialCompleted = useMemo(
+    () => toDateInputValue(initialCompletedDate),
+    [initialCompletedDate],
+  );
+
+  const [orderValue, setOrderValue] = useState(initialOrder);
+  const [completedValue, setCompletedValue] = useState(initialCompleted);
+  const [savedOrder, setSavedOrder] = useState(initialOrder);
+  const [savedCompleted, setSavedCompleted] = useState(initialCompleted);
+  const [submitting, setSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  // Reset values when the user opens a different deal in the same drawer
+  // session.
+  useEffect(() => {
+    setOrderValue(initialOrder);
+    setSavedOrder(initialOrder);
+  }, [initialOrder]);
+  useEffect(() => {
+    setCompletedValue(initialCompleted);
+    setSavedCompleted(initialCompleted);
+  }, [initialCompleted]);
+
+  const dirty =
+    orderValue !== savedOrder || completedValue !== savedCompleted;
+
+  async function handleSave() {
+    if (!dirty) return;
+    setSubmitting(true);
+    setError(null);
+    const fields: Record<string, string | null> = {};
+    if (orderValue !== savedOrder) {
+      fields.pibi_order_date = dateInputToIso(orderValue);
+    }
+    if (completedValue !== savedCompleted) {
+      fields.pibi_completed_date = dateInputToIso(completedValue);
+    }
+    // Optimistic update — surface the new values immediately.
+    const prevOrder = savedOrder;
+    const prevCompleted = savedCompleted;
+    setSavedOrder(orderValue);
+    setSavedCompleted(completedValue);
+
+    try {
+      const res = await fetch(
+        `/api/portfolio/${portfolioId}/deal-properties`,
+        {
+          method: "PATCH",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ dealId, fields }),
+        },
+      );
+      if (!res.ok) {
+        // Revert on hard failure so the UI stays truthful.
+        setSavedOrder(prevOrder);
+        setSavedCompleted(prevCompleted);
+        setOrderValue(prevOrder);
+        setCompletedValue(prevCompleted);
+        const json = await res.json().catch(() => ({}));
+        setError(
+          typeof json.error === "string"
+            ? json.error
+            : "Failed to update PIBI dates",
+        );
+        return;
+      }
+      const json = (await res.json()) as {
+        results: Record<string, { ok: boolean; error?: string }>;
+        hubspotSync: "ok" | "failed" | "skipped";
+        hubspotError?: string;
+      };
+      // Per-field errors win over a global HubSpot failure.
+      const fieldErrors = Object.entries(json.results ?? {})
+        .filter(([, r]) => !r.ok)
+        .map(([k, r]) => `${k}: ${r.error ?? "rejected"}`);
+      if (fieldErrors.length > 0) {
+        setError(fieldErrors.join("; "));
+      } else if (json.hubspotSync === "failed") {
+        setError(
+          json.hubspotError
+            ? `Saved locally — HubSpot sync failed: ${json.hubspotError}`
+            : "Saved locally — HubSpot sync failed",
+        );
+      }
+    } catch (err) {
+      setSavedOrder(prevOrder);
+      setSavedCompleted(prevCompleted);
+      setOrderValue(prevOrder);
+      setCompletedValue(prevCompleted);
+      setError(err instanceof Error ? err.message : "Failed to update PIBI dates");
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  if (!canEdit) {
+    return (
+      <div className="divide-y divide-gray-50">
+        <InfoRow label="PIBI Order Date" value={formatDate(initialOrderDate)} />
+        <InfoRow
+          label="PIBI Completed Date"
+          value={formatDate(initialCompletedDate)}
+        />
+      </div>
+    );
+  }
+
+  return (
+    <div className="space-y-3">
+      <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
+        <label className="flex flex-col gap-1">
+          <span className="text-xs text-gray-500 font-medium">
+            PIBI Order Date
+          </span>
+          <input
+            type="date"
+            data-testid="pibi-order-date-input"
+            value={orderValue}
+            onChange={(e) => setOrderValue(e.target.value)}
+            disabled={submitting}
+            className="rounded-lg border border-gray-200 px-3 py-1.5 text-xs text-gray-800 focus:outline-none focus:ring-2 focus:ring-blue-200 focus:border-blue-300"
+          />
+        </label>
+        <label className="flex flex-col gap-1">
+          <span className="text-xs text-gray-500 font-medium">
+            PIBI Completed Date
+          </span>
+          <input
+            type="date"
+            data-testid="pibi-completed-date-input"
+            value={completedValue}
+            onChange={(e) => setCompletedValue(e.target.value)}
+            disabled={submitting}
+            className="rounded-lg border border-gray-200 px-3 py-1.5 text-xs text-gray-800 focus:outline-none focus:ring-2 focus:ring-blue-200 focus:border-blue-300"
+          />
+        </label>
+      </div>
+      <div className="flex items-center justify-between gap-3">
+        <p className="text-[11px] text-gray-400">
+          Pick the actual date — leave blank to clear. Changes sync to HubSpot.
+        </p>
+        <button
+          type="button"
+          data-testid="pibi-save-button"
+          onClick={handleSave}
+          disabled={!dirty || submitting}
+          className="text-xs font-medium px-3 py-1.5 rounded-lg bg-brandblue text-white hover:bg-brandmidblue disabled:opacity-50 transition-colors"
+        >
+          {submitting ? "Saving…" : "Save PIBI Dates"}
+        </button>
+      </div>
+      {error && (
+        <p
+          data-testid="pibi-error"
+          className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg"
+        >
+          {error}
+        </p>
+      )}
+    </div>
+  );
+}
+
 // -----------------------------------------------------------------------
 // PropertyDetailDrawer — main component
 // -----------------------------------------------------------------------
@@ -680,29 +895,36 @@ export default function PropertyDetailDrawer({
                 </div>
               </div>
 
-              {/* PIBI section */}
+              {/* PIBI section — editable date pickers for write+ users (issue #252) */}
               <div ref={(el) => { sectionRefs.current.pibi = el; }}>
                 <SectionHeader id="pibi" label={SECTION_TITLES.pibi} />
-                <div className="divide-y divide-gray-50">
-                  <InfoRow label="PIBI Order Date" value={formatDate(deal.pibiOrderDate)} />
-                  <InfoRow label="PIBI Completed Date" value={formatDate(deal.pibiCompletedDate)} />
-                  <InfoRow
-                    label="Measures for PIBI"
-                    value={
-                      pibiMeasures.length > 0 ? (
-                        <span className="flex flex-wrap gap-1.5">
-                          {pibiMeasures.map((m) => (
-                            <span
-                              key={m}
-                              className="px-2 py-0.5 rounded-full text-[11px] bg-gray-50 border border-gray-200 text-gray-600"
-                            >
-                              {m}
-                            </span>
-                          ))}
-                        </span>
-                      ) : null
-                    }
+                <div className="space-y-3">
+                  <PibiDatesEditor
+                    dealId={deal.dealId}
+                    portfolioId={portfolioId}
+                    initialOrderDate={deal.pibiOrderDate}
+                    initialCompletedDate={deal.pibiCompletedDate}
+                    canEdit={WRITE_ROLES.includes(userRole)}
                   />
+                  {pibiMeasures.length > 0 && (
+                    <div className="divide-y divide-gray-50">
+                      <InfoRow
+                        label="Measures for PIBI"
+                        value={
+                          <span className="flex flex-wrap gap-1.5">
+                            {pibiMeasures.map((m) => (
+                              <span
+                                key={m}
+                                className="px-2 py-0.5 rounded-full text-[11px] bg-gray-50 border border-gray-200 text-gray-600"
+                              >
+                                {m}
+                              </span>
+                            ))}
+                          </span>
+                        }
+                      />
+                    </div>
+                  )}
                 </div>
               </div>
 

From e020b3fd835f10e670268f0a0aee5adaaf8b3704 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 18:24:43 +0000
Subject: [PATCH 11/25] add halted state fields and approver capability gate

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../[portfolioId]/deal-properties/route.ts    |  19 ++-
 src/app/lib/dealPropertyUpdate.test.ts        | 148 ++++++++++++++++++
 src/app/lib/dealPropertyUpdate.ts             |  75 ++++++++-
 3 files changed, 233 insertions(+), 9 deletions(-)

diff --git a/src/app/api/portfolio/[portfolioId]/deal-properties/route.ts b/src/app/api/portfolio/[portfolioId]/deal-properties/route.ts
index 7cfc348..f85b772 100644
--- a/src/app/api/portfolio/[portfolioId]/deal-properties/route.ts
+++ b/src/app/api/portfolio/[portfolioId]/deal-properties/route.ts
@@ -5,7 +5,10 @@ import { z } from "zod";
 
 import { AuthOptions } from "@/app/api/auth/[...nextauth]/authOptions";
 import { db } from "@/app/db/db";
-import { portfolioUsers } from "@/app/db/schema/portfolio";
+import {
+  portfolioCapabilities,
+  portfolioUsers,
+} from "@/app/db/schema/portfolio";
 import { user } from "@/app/db/schema/users";
 import { applyDealPropertyUpdate } from "@/app/lib/dealPropertyUpdate";
 
@@ -97,11 +100,25 @@ export async function PATCH(
     );
   }
 
+  // Capabilities are orthogonal to role — used by approver-gated fields
+  // (e.g. property_halted_date / _reason in issue #255).
+  const capabilityRows = await db
+    .select({ capability: portfolioCapabilities.capability })
+    .from(portfolioCapabilities)
+    .where(
+      and(
+        eq(portfolioCapabilities.portfolioId, BigInt(portfolioId)),
+        eq(portfolioCapabilities.userId, userRow[0].id),
+      ),
+    );
+  const capabilities = capabilityRows.map((r) => r.capability);
+
   try {
     const outcome = await applyDealPropertyUpdate({
       dealId,
       fields,
       role,
+      capabilities,
     });
 
     return NextResponse.json(outcome);
diff --git a/src/app/lib/dealPropertyUpdate.test.ts b/src/app/lib/dealPropertyUpdate.test.ts
index b36d807..0eb72bc 100644
--- a/src/app/lib/dealPropertyUpdate.test.ts
+++ b/src/app/lib/dealPropertyUpdate.test.ts
@@ -18,6 +18,28 @@ describe("DEAL_PROPERTY_FIELDS registry", () => {
     expect(roleAllowedForField("pibi_completed_date", "write")).toBe(true);
   });
 
+  it("exposes the halted fields gated on the approver capability", () => {
+    expect(isDealPropertyField("property_halted_date")).toBe(true);
+    expect(isDealPropertyField("property_halted_reason")).toBe(true);
+    // Plain roles — even the most permissive — never satisfy the approver
+    // gate on their own.
+    for (const role of ["read", "write", "admin", "creator"]) {
+      expect(roleAllowedForField("property_halted_date", role)).toBe(false);
+      expect(roleAllowedForField("property_halted_reason", role)).toBe(false);
+    }
+    // Capability list grants access regardless of role tier.
+    expect(
+      roleAllowedForField("property_halted_date", "read", ["approver"]),
+    ).toBe(true);
+    expect(
+      roleAllowedForField("property_halted_reason", "write", ["approver"]),
+    ).toBe(true);
+    // Other capabilities should not unlock the field.
+    expect(
+      roleAllowedForField("property_halted_date", "write", ["contractor"]),
+    ).toBe(false);
+  });
+
   it("maps each registered field to the matching HubSpot property", () => {
     expect(DEAL_PROPERTY_FIELDS.pibi_order_date.hubspotProperty).toBe(
       "pibi_order_date",
@@ -25,6 +47,12 @@ describe("DEAL_PROPERTY_FIELDS registry", () => {
     expect(DEAL_PROPERTY_FIELDS.pibi_completed_date.hubspotProperty).toBe(
       "pibi_completed_date",
     );
+    expect(DEAL_PROPERTY_FIELDS.property_halted_date.hubspotProperty).toBe(
+      "property_halted_date",
+    );
+    expect(DEAL_PROPERTY_FIELDS.property_halted_reason.hubspotProperty).toBe(
+      "property_halted_reason",
+    );
   });
 
   it("rejects unknown fields", () => {
@@ -140,6 +168,126 @@ describe("applyDealPropertyUpdate", () => {
     expect(pushHubspot.mock.calls[0][0].properties.pibi_order_date).toBe("");
   });
 
+  it("rejects halted fields when the caller lacks approver capability", async () => {
+    const updateDb = vi.fn();
+    const pushHubspot = vi.fn();
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-h1",
+      fields: {
+        property_halted_date: "2025-06-01T00:00:00.000Z",
+        property_halted_reason: "Awaiting access",
+      },
+      // Even creator role alone is not enough — capability is orthogonal.
+      role: "creator",
+      capabilities: [],
+      deps: { updateDb, pushHubspot },
+    });
+    expect(out.results.property_halted_date).toEqual({
+      ok: false,
+      error: "Insufficient permissions",
+    });
+    expect(out.results.property_halted_reason).toEqual({
+      ok: false,
+      error: "Insufficient permissions",
+    });
+    expect(out.hubspotSync).toBe("skipped");
+    expect(updateDb).not.toHaveBeenCalled();
+    expect(pushHubspot).not.toHaveBeenCalled();
+  });
+
+  it("persists halted date + reason for an approver and pushes them to HubSpot", async () => {
+    const updateDb = vi.fn().mockResolvedValue(undefined);
+    const pushHubspot = vi.fn().mockResolvedValue({ ok: true });
+    const haltedIso = "2025-06-01T00:00:00.000Z";
+    const reason = "Awaiting roof access";
+
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-h2",
+      fields: {
+        property_halted_date: haltedIso,
+        property_halted_reason: reason,
+      },
+      role: "read",
+      capabilities: ["approver"],
+      deps: { updateDb, pushHubspot },
+    });
+
+    expect(out.results.property_halted_date).toEqual({ ok: true });
+    expect(out.results.property_halted_reason).toEqual({ ok: true });
+    expect(out.hubspotSync).toBe("ok");
+
+    const dbValues = updateDb.mock.calls[0][1];
+    expect(dbValues.propertyHaltedDate).toBeInstanceOf(Date);
+    expect((dbValues.propertyHaltedDate as Date).toISOString()).toBe(haltedIso);
+    expect(dbValues.propertyHaltedReason).toBe(reason);
+
+    const props = pushHubspot.mock.calls[0][0].properties;
+    expect(props.property_halted_date).toBe(
+      String(new Date(haltedIso).getTime()),
+    );
+    expect(props.property_halted_reason).toBe(reason);
+  });
+
+  it("validates the halted date format", async () => {
+    const updateDb = vi.fn();
+    const pushHubspot = vi.fn();
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-h3",
+      fields: { property_halted_date: "definitely-not-a-date" },
+      role: "read",
+      capabilities: ["approver"],
+      deps: { updateDb, pushHubspot },
+    });
+    expect(out.results.property_halted_date.ok).toBe(false);
+    expect(updateDb).not.toHaveBeenCalled();
+    expect(pushHubspot).not.toHaveBeenCalled();
+  });
+
+  it("collapses an empty halted reason to null on save", async () => {
+    const updateDb = vi.fn().mockResolvedValue(undefined);
+    const pushHubspot = vi.fn().mockResolvedValue({ ok: true });
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-h4",
+      fields: { property_halted_reason: "" },
+      role: "read",
+      capabilities: ["approver"],
+      deps: { updateDb, pushHubspot },
+    });
+    expect(out.results.property_halted_reason).toEqual({ ok: true });
+    expect(updateDb.mock.calls[0][1].propertyHaltedReason).toBeNull();
+    expect(pushHubspot.mock.calls[0][0].properties.property_halted_reason).toBe(
+      "",
+    );
+  });
+
+  it("resume clears the halted date and leaves the reason untouched in DB + HubSpot payload", async () => {
+    const updateDb = vi.fn().mockResolvedValue(undefined);
+    const pushHubspot = vi.fn().mockResolvedValue({ ok: true });
+    // The drawer's "Resume" action only sends `property_halted_date: null`.
+    // The reason field is omitted entirely so the existing value is
+    // preserved.
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-h5",
+      fields: { property_halted_date: null },
+      role: "read",
+      capabilities: ["approver"],
+      deps: { updateDb, pushHubspot },
+    });
+    expect(out.results.property_halted_date).toEqual({ ok: true });
+    expect(out.results.property_halted_reason).toBeUndefined();
+    expect(out.hubspotSync).toBe("ok");
+
+    const dbValues = updateDb.mock.calls[0][1];
+    expect(dbValues.propertyHaltedDate).toBeNull();
+    // No reason key at all → reason column not touched.
+    expect("propertyHaltedReason" in dbValues).toBe(false);
+
+    const props = pushHubspot.mock.calls[0][0].properties;
+    expect(props.property_halted_date).toBe("");
+    // No reason key in the HubSpot payload → reason not pushed.
+    expect("property_halted_reason" in props).toBe(false);
+  });
+
   it("surfaces HubSpot push failures back to the caller", async () => {
     const updateDb = vi.fn().mockResolvedValue(undefined);
     const pushHubspot = vi
diff --git a/src/app/lib/dealPropertyUpdate.ts b/src/app/lib/dealPropertyUpdate.ts
index 0ec2aa4..f674bda 100644
--- a/src/app/lib/dealPropertyUpdate.ts
+++ b/src/app/lib/dealPropertyUpdate.ts
@@ -25,8 +25,19 @@ import { getHubSpotClient } from "@/app/lib/hubspot/client";
 // Field registry
 // -----------------------------------------------------------------------
 
-/** Roles ordered from most permissive to least. */
-export type DealPropertyRole = "read" | "write" | "admin" | "creator";
+/**
+ * Access tokens that gate a field. These are a flat union of the portfolio
+ * role hierarchy ("read" | "write" | "admin" | "creator") plus any
+ * orthogonal capability tokens (currently just "approver"). The service
+ * checks the caller against this set, so a field can require either a
+ * write-or-above role *or* a specific capability.
+ */
+export type DealPropertyRole =
+  | "read"
+  | "write"
+  | "admin"
+  | "creator"
+  | "approver";
 
 /** Roles that satisfy a "write or above" requirement. */
 export const WRITE_OR_ABOVE_ROLES: ReadonlyArray<DealPropertyRole> = [
@@ -35,6 +46,13 @@ export const WRITE_OR_ABOVE_ROLES: ReadonlyArray<DealPropertyRole> = [
   "creator",
 ];
 
+/**
+ * Roles allowed to edit fields gated on "approver capability". An approver
+ * may not have a write role on the portfolio, but the capability is granted
+ * orthogonally — see `portfolio_capabilities` table.
+ */
+export const APPROVER_ROLES: ReadonlyArray<DealPropertyRole> = ["approver"];
+
 const isoDateSchema = z
   .union([z.string(), z.null()])
   .transform((v, ctx) => {
@@ -47,6 +65,15 @@ const isoDateSchema = z
     return d;
   });
 
+/**
+ * String-or-null schema — empty strings collapse to null so the UI can
+ * "clear" a free-text field by sending an empty value, mirroring how the
+ * date schema treats "" as null.
+ */
+const stringOrNullSchema = z
+  .union([z.string(), z.null()])
+  .transform((v) => (v === null || v === "" ? null : v));
+
 type DateColumn = typeof hubspotDealData.pibiOrderDate;
 type TextColumn = typeof hubspotDealData.propertyHaltedReason;
 type BoolColumn = typeof hubspotDealData.domnaSurveyRequired;
@@ -107,13 +134,26 @@ export const DEAL_PROPERTY_FIELDS = {
     dbColumn: hubspotDealData.pibiCompletedDate,
     toHubspot: dateToHubspot,
   } satisfies DealPropertyFieldDef<Date | null>,
-  // -- Slot for issue #255 (halted state) ----------------------------------
-  // property_halted_date / property_halted_reason will plug in here.
+  // -- Halted state (issue #255) -------------------------------------------
+  // Approver capability gates these — write role alone is not sufficient.
+  property_halted_date: {
+    schema: isoDateSchema,
+    allowedRoles: APPROVER_ROLES,
+    hubspotProperty: "property_halted_date",
+    dbColumn: hubspotDealData.propertyHaltedDate,
+    toHubspot: dateToHubspot,
+  } satisfies DealPropertyFieldDef<Date | null>,
+  property_halted_reason: {
+    schema: stringOrNullSchema,
+    allowedRoles: APPROVER_ROLES,
+    hubspotProperty: "property_halted_reason",
+    dbColumn: hubspotDealData.propertyHaltedReason,
+    toHubspot: stringToHubspot,
+  } satisfies DealPropertyFieldDef<string | null>,
   // -- Slot for issue #256 (Domna survey type / date) ----------------------
   // domna_survey_type / domna_survey_date will plug in here.
 } as const;
 
-void stringToHubspot;
 void booleanToHubspot;
 
 export type DealPropertyFieldKey = keyof typeof DEAL_PROPERTY_FIELDS;
@@ -124,12 +164,24 @@ export function isDealPropertyField(
   return Object.prototype.hasOwnProperty.call(DEAL_PROPERTY_FIELDS, key);
 }
 
+/**
+ * Check whether the caller is allowed to write `field`, given their
+ * portfolio role and any orthogonal capabilities (e.g. "approver"). The
+ * field passes if any one of the caller's tokens is on the field's
+ * allow-list.
+ */
 export function roleAllowedForField(
   field: DealPropertyFieldKey,
   role: string | null | undefined,
+  capabilities: ReadonlyArray<string> = [],
 ): boolean {
-  if (!role) return false;
-  return (DEAL_PROPERTY_FIELDS[field].allowedRoles as ReadonlyArray<string>).includes(role);
+  const allowed = DEAL_PROPERTY_FIELDS[field]
+    .allowedRoles as ReadonlyArray<string>;
+  if (role && allowed.includes(role)) return true;
+  for (const cap of capabilities) {
+    if (allowed.includes(cap)) return true;
+  }
+  return false;
 }
 
 // -----------------------------------------------------------------------
@@ -194,6 +246,13 @@ export interface UpdateDealPropertiesInput {
   fields: Record<string, unknown>;
   /** Role of the authenticated user making the request. */
   role: string;
+  /**
+   * Orthogonal capability tokens (e.g. `"approver"`). Used by fields whose
+   * `allowedRoles` list a capability rather than a role tier. Optional so
+   * existing call sites that only need role-based gating do not have to
+   * supply it.
+   */
+  capabilities?: ReadonlyArray<string>;
   /**
    * Hooks injected by the route so the service can stay environment-free
    * for unit testing. Defaults are wired in `applyDealPropertyUpdate`.
@@ -235,7 +294,7 @@ export async function applyDealPropertyUpdate(
       results[key] = { ok: false, error: "Field not editable" };
       continue;
     }
-    if (!roleAllowedForField(key, input.role)) {
+    if (!roleAllowedForField(key, input.role, input.capabilities)) {
       results[key] = { ok: false, error: "Insufficient permissions" };
       continue;
     }

From 3070f2c763f3ed5b84acbabd7bd72c2cde527144 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 18:26:18 +0000
Subject: [PATCH 12/25] add editable halted state section and cypress spec

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 cypress/e2e/live-tracking/halted-state.cy.js  | 107 ++++++++
 .../live/PropertyDetailDrawer.tsx             | 251 +++++++++++++++++-
 2 files changed, 353 insertions(+), 5 deletions(-)
 create mode 100644 cypress/e2e/live-tracking/halted-state.cy.js

diff --git a/cypress/e2e/live-tracking/halted-state.cy.js b/cypress/e2e/live-tracking/halted-state.cy.js
new file mode 100644
index 0000000..8249ebe
--- /dev/null
+++ b/cypress/e2e/live-tracking/halted-state.cy.js
@@ -0,0 +1,107 @@
+/**
+ * Live Tracking — Halted state editor (issue #255)
+ *
+ * Verifies the approver flow on the Halted section of the property detail
+ * drawer:
+ *   1. an approver can set a halted date + free-text reason and save them,
+ *   2. the drawer reflects the halted state (badge + persisted values),
+ *   3. clicking Resume clears the date but keeps the reason as the
+ *      last-set value, both in the input and after a reload.
+ *
+ * Mirrors `pibi-dates.cy.js`. Assumes an authenticated approver session
+ * is reusable by the test harness; the target portfolio + a deal whose
+ * Halted section is editable by the current user are read from Cypress
+ * env vars so the spec stays portable.
+ */
+
+const PORTFOLIO_SLUG = Cypress.env("LIVE_PORTFOLIO_SLUG");
+const TARGET_DEAL_NAME = Cypress.env("LIVE_HALTED_DEAL_NAME");
+
+const HALTED_DATE = "2025-06-01";
+const HALTED_REASON = "Awaiting roof access from landlord";
+
+describe("Halted state editor — approver flow", function () {
+  before(function () {
+    if (!PORTFOLIO_SLUG) {
+      cy.log(
+        "LIVE_PORTFOLIO_SLUG env var not set — skipping live tracking specs",
+      );
+      this.skip();
+    }
+  });
+
+  function openDrawerForTargetDeal() {
+    cy.visit(`/portfolio/${PORTFOLIO_SLUG}/your-projects/live`);
+
+    // Switch to the Measures tab — the easiest way into the drawer.
+    cy.contains("button, [role=tab]", "Measures").click();
+
+    if (TARGET_DEAL_NAME) {
+      cy.contains("[data-testid=measures-row]", TARGET_DEAL_NAME).click();
+    } else {
+      cy.get("[data-testid=measures-row]").first().click();
+    }
+
+    cy.get("[data-testid=property-detail-drawer]").should("be.visible");
+    cy.get("[data-testid=drawer-section-halted]").should("exist");
+  }
+
+  it("lets an approver halt a property and resume it while preserving the reason", () => {
+    openDrawerForTargetDeal();
+
+    // Approver sees editable inputs.
+    cy.get("[data-testid=halted-date-input]").should("be.visible");
+    cy.get("[data-testid=halted-reason-input]").should("be.visible");
+
+    // Set halted date + reason.
+    cy.get("[data-testid=halted-date-input]").clear().type(HALTED_DATE);
+    cy.get("[data-testid=halted-reason-input]")
+      .clear()
+      .type(HALTED_REASON);
+
+    cy.get("[data-testid=halted-save-button]")
+      .should("not.be.disabled")
+      .click();
+
+    // Save completes — button label flips back, no error banner.
+    cy.get("[data-testid=halted-save-button]").should(
+      "contain.text",
+      "Save Halted State",
+    );
+    cy.get("[data-testid=halted-error]").should("not.exist");
+
+    // Drawer reflects halted state via the status badge + persisted values.
+    cy.get("[data-testid=halted-status-badge]").should("contain.text", "Halted");
+    cy.get("[data-testid=halted-date-input]").should("have.value", HALTED_DATE);
+    cy.get("[data-testid=halted-reason-input]").should(
+      "have.value",
+      HALTED_REASON,
+    );
+
+    // Now resume — date clears, reason stays.
+    cy.get("[data-testid=halted-resume-button]")
+      .should("be.visible")
+      .click();
+
+    // Once resumed the badge + resume button disappear, but the reason is
+    // still visible in the textarea.
+    cy.get("[data-testid=halted-status-badge]").should("not.exist");
+    cy.get("[data-testid=halted-resume-button]").should("not.exist");
+    cy.get("[data-testid=halted-date-input]").should("have.value", "");
+    cy.get("[data-testid=halted-reason-input]").should(
+      "have.value",
+      HALTED_REASON,
+    );
+
+    // Reload the page — the cleared date and preserved reason persist
+    // server-side.
+    cy.reload();
+    openDrawerForTargetDeal();
+
+    cy.get("[data-testid=halted-date-input]").should("have.value", "");
+    cy.get("[data-testid=halted-reason-input]").should(
+      "have.value",
+      HALTED_REASON,
+    );
+  });
+});
diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
index b2c3dea..43a3a0e 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
@@ -692,6 +692,244 @@ function PibiDatesEditor({
   );
 }
 
+// -----------------------------------------------------------------------
+// Halted section — editable for approvers (issue #255)
+// -----------------------------------------------------------------------
+interface HaltedEditorProps {
+  dealId: string;
+  portfolioId: string;
+  initialHaltedDate: Date | string | null;
+  initialHaltedReason: string | null;
+  /** True when the user has the approver capability on this portfolio. */
+  canEdit: boolean;
+}
+
+function HaltedEditor({
+  dealId,
+  portfolioId,
+  initialHaltedDate,
+  initialHaltedReason,
+  canEdit,
+}: HaltedEditorProps) {
+  const initialDate = useMemo(
+    () => toDateInputValue(initialHaltedDate),
+    [initialHaltedDate],
+  );
+  const initialReason = initialHaltedReason ?? "";
+
+  const [dateValue, setDateValue] = useState(initialDate);
+  const [reasonValue, setReasonValue] = useState(initialReason);
+  const [savedDate, setSavedDate] = useState(initialDate);
+  const [savedReason, setSavedReason] = useState(initialReason);
+  const [submitting, setSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  // Reset state when the drawer switches deals.
+  useEffect(() => {
+    setDateValue(initialDate);
+    setSavedDate(initialDate);
+  }, [initialDate]);
+  useEffect(() => {
+    setReasonValue(initialReason);
+    setSavedReason(initialReason);
+  }, [initialReason]);
+
+  const dirty = dateValue !== savedDate || reasonValue !== savedReason;
+  const isHalted = !!savedDate;
+
+  /**
+   * Send the supplied delta to the deal-properties endpoint. Used both by
+   * Save (sends only changed fields) and Resume (sends only the date null).
+   */
+  async function patchFields(fields: Record<string, string | null>) {
+    setSubmitting(true);
+    setError(null);
+    try {
+      const res = await fetch(
+        `/api/portfolio/${portfolioId}/deal-properties`,
+        {
+          method: "PATCH",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ dealId, fields }),
+        },
+      );
+      if (!res.ok) {
+        const json = await res.json().catch(() => ({}));
+        return {
+          ok: false as const,
+          error:
+            typeof json.error === "string"
+              ? json.error
+              : "Failed to update halted state",
+        };
+      }
+      const json = (await res.json()) as {
+        results: Record<string, { ok: boolean; error?: string }>;
+        hubspotSync: "ok" | "failed" | "skipped";
+        hubspotError?: string;
+      };
+      const fieldErrors = Object.entries(json.results ?? {})
+        .filter(([, r]) => !r.ok)
+        .map(([k, r]) => `${k}: ${r.error ?? "rejected"}`);
+      if (fieldErrors.length > 0) {
+        return { ok: false as const, error: fieldErrors.join("; ") };
+      }
+      if (json.hubspotSync === "failed") {
+        return {
+          ok: true as const,
+          warning: json.hubspotError
+            ? `Saved locally — HubSpot sync failed: ${json.hubspotError}`
+            : "Saved locally — HubSpot sync failed",
+        };
+      }
+      return { ok: true as const };
+    } catch (err) {
+      return {
+        ok: false as const,
+        error:
+          err instanceof Error ? err.message : "Failed to update halted state",
+      };
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  async function handleSave() {
+    if (!dirty) return;
+    const fields: Record<string, string | null> = {};
+    if (dateValue !== savedDate) {
+      fields.property_halted_date = dateInputToIso(dateValue);
+    }
+    if (reasonValue !== savedReason) {
+      fields.property_halted_reason = reasonValue.trim() === "" ? null : reasonValue;
+    }
+    // Optimistic update.
+    const prevDate = savedDate;
+    const prevReason = savedReason;
+    setSavedDate(dateValue);
+    setSavedReason(reasonValue);
+
+    const result = await patchFields(fields);
+    if (!result.ok) {
+      setSavedDate(prevDate);
+      setSavedReason(prevReason);
+      setDateValue(prevDate);
+      setReasonValue(prevReason);
+      setError(result.error);
+      return;
+    }
+    if (result.warning) setError(result.warning);
+  }
+
+  async function handleResume() {
+    // Resume clears only the date — reason is preserved as the last-set
+    // value per acceptance criteria.
+    const prevDate = savedDate;
+    setSavedDate("");
+    setDateValue("");
+
+    const result = await patchFields({ property_halted_date: null });
+    if (!result.ok) {
+      setSavedDate(prevDate);
+      setDateValue(prevDate);
+      setError(result.error);
+      return;
+    }
+    if (result.warning) setError(result.warning);
+  }
+
+  if (!canEdit) {
+    return (
+      <div className="divide-y divide-gray-50">
+        <InfoRow
+          label="Property Halted Date"
+          value={formatDate(initialHaltedDate)}
+        />
+        <InfoRow label="Property Halted Reason" value={initialHaltedReason} />
+      </div>
+    );
+  }
+
+  return (
+    <div className="space-y-3">
+      {isHalted && (
+        <div
+          data-testid="halted-status-badge"
+          className="inline-flex items-center gap-1.5 px-2.5 py-1 rounded-full text-xs font-semibold border bg-amber-50 text-amber-700 border-amber-200"
+        >
+          <AlertTriangle className="h-3.5 w-3.5" />
+          Halted
+        </div>
+      )}
+      <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
+        <label className="flex flex-col gap-1">
+          <span className="text-xs text-gray-500 font-medium">
+            Property Halted Date
+          </span>
+          <input
+            type="date"
+            data-testid="halted-date-input"
+            value={dateValue}
+            onChange={(e) => setDateValue(e.target.value)}
+            disabled={submitting}
+            className="rounded-lg border border-gray-200 px-3 py-1.5 text-xs text-gray-800 focus:outline-none focus:ring-2 focus:ring-amber-200 focus:border-amber-300"
+          />
+        </label>
+      </div>
+      <label className="flex flex-col gap-1">
+        <span className="text-xs text-gray-500 font-medium">
+          Reason
+        </span>
+        <textarea
+          data-testid="halted-reason-input"
+          value={reasonValue}
+          onChange={(e) => setReasonValue(e.target.value)}
+          disabled={submitting}
+          rows={3}
+          className="rounded-lg border border-gray-200 px-3 py-2 text-xs text-gray-800 placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-amber-200 focus:border-amber-300 resize-none"
+          placeholder="Free-text reason for halting this property"
+        />
+      </label>
+      <div className="flex flex-wrap items-center justify-between gap-3">
+        <p className="text-[11px] text-gray-400">
+          Setting a date marks the property as halted. Resume clears the date
+          but keeps the reason.
+        </p>
+        <div className="flex items-center gap-2">
+          {isHalted && (
+            <button
+              type="button"
+              data-testid="halted-resume-button"
+              onClick={handleResume}
+              disabled={submitting}
+              className="text-xs font-medium px-3 py-1.5 rounded-lg border border-emerald-200 text-emerald-700 bg-white hover:bg-emerald-50 disabled:opacity-50 transition-colors"
+            >
+              {submitting ? "Working…" : "Resume"}
+            </button>
+          )}
+          <button
+            type="button"
+            data-testid="halted-save-button"
+            onClick={handleSave}
+            disabled={!dirty || submitting}
+            className="text-xs font-medium px-3 py-1.5 rounded-lg bg-brandblue text-white hover:bg-brandmidblue disabled:opacity-50 transition-colors"
+          >
+            {submitting ? "Saving…" : "Save Halted State"}
+          </button>
+        </div>
+      </div>
+      {error && (
+        <p
+          data-testid="halted-error"
+          className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg"
+        >
+          {error}
+        </p>
+      )}
+    </div>
+  );
+}
+
 // -----------------------------------------------------------------------
 // PropertyDetailDrawer — main component
 // -----------------------------------------------------------------------
@@ -937,13 +1175,16 @@ export default function PropertyDetailDrawer({
                 </div>
               </div>
 
-              {/* Halted section */}
+              {/* Halted section — editable for approvers (issue #255) */}
               <div ref={(el) => { sectionRefs.current.halted = el; }}>
                 <SectionHeader id="halted" label={SECTION_TITLES.halted} />
-                <div className="divide-y divide-gray-50">
-                  <InfoRow label="Property Halted Date" value={formatDate(deal.propertyHaltedDate)} />
-                  <InfoRow label="Property Halted Reason" value={deal.propertyHaltedReason} />
-                </div>
+                <HaltedEditor
+                  dealId={deal.dealId}
+                  portfolioId={portfolioId}
+                  initialHaltedDate={deal.propertyHaltedDate}
+                  initialHaltedReason={deal.propertyHaltedReason ?? null}
+                  canEdit={userCapability.includes("approver")}
+                />
               </div>
 
               {/* Technical Approved section */}

From 73a365468a59604376f9aba4acf95a52065f8cde Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 18:37:38 +0000
Subject: [PATCH 13/25] migrate domna_survey_required -> domna_survey_type

Drops the too-coarse boolean column and adds a free-text
`domna_survey_type` column on hubspot_deal_data so an approver can record
the survey kind directly. Updates the Drizzle schema, the HubspotDeal
type, and the live-tracking page mapping to expose the new column.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../db/migrations/0193_domna_survey_type.sql  |    2 +
 src/app/db/migrations/meta/0193_snapshot.json | 8746 +++++++++++++++++
 src/app/db/migrations/meta/_journal.json      |    7 +
 src/app/db/schema/crm/hubspot_deal_table.ts   |    4 +-
 .../(portfolio)/your-projects/live/page.tsx   |    5 +-
 .../(portfolio)/your-projects/live/types.ts   |    3 -
 6 files changed, 8758 insertions(+), 9 deletions(-)
 create mode 100644 src/app/db/migrations/0193_domna_survey_type.sql
 create mode 100644 src/app/db/migrations/meta/0193_snapshot.json

diff --git a/src/app/db/migrations/0193_domna_survey_type.sql b/src/app/db/migrations/0193_domna_survey_type.sql
new file mode 100644
index 0000000..d2604eb
--- /dev/null
+++ b/src/app/db/migrations/0193_domna_survey_type.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "hubspot_deal_data" DROP COLUMN IF EXISTS "domna_survey_required";--> statement-breakpoint
+ALTER TABLE "hubspot_deal_data" ADD COLUMN "domna_survey_type" text;
diff --git a/src/app/db/migrations/meta/0193_snapshot.json b/src/app/db/migrations/meta/0193_snapshot.json
new file mode 100644
index 0000000..49d5f06
--- /dev/null
+++ b/src/app/db/migrations/meta/0193_snapshot.json
@@ -0,0 +1,8746 @@
+{
+  "id": "afc1f91a-1613-48af-9491-8dd0bdfbb203",
+  "prevId": "63afd309-de11-41aa-b6cc-4f314ea783b1",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.postcode_search": {
+      "name": "postcode_search",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "postcode": {
+          "name": "postcode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "result_data": {
+          "name": "result_data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "last_updated_at": {
+          "name": "last_updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "postcode_search_postcode_unique": {
+          "name": "postcode_search_postcode_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "postcode"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.deal_measure_approval_events": {
+      "name": "deal_measure_approval_events",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "hubspot_deal_id": {
+          "name": "hubspot_deal_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "measure_name": {
+          "name": "measure_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "action": {
+          "name": "action",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "acted_by": {
+          "name": "acted_by",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "acted_at": {
+          "name": "acted_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "idx_deal_measure_events_deal_id": {
+          "name": "idx_deal_measure_events_deal_id",
+          "columns": [
+            {
+              "expression": "hubspot_deal_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_deal_measure_events_acted_at": {
+          "name": "idx_deal_measure_events_acted_at",
+          "columns": [
+            {
+              "expression": "acted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "deal_measure_approval_events_acted_by_user_id_fk": {
+          "name": "deal_measure_approval_events_acted_by_user_id_fk",
+          "tableFrom": "deal_measure_approval_events",
+          "tableTo": "user",
+          "columnsFrom": [
+            "acted_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.deal_measure_approvals": {
+      "name": "deal_measure_approvals",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "hubspot_deal_id": {
+          "name": "hubspot_deal_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "measure_name": {
+          "name": "measure_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_approved": {
+          "name": "is_approved",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "approved_by": {
+          "name": "approved_by",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "approved_at": {
+          "name": "approved_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "idx_deal_measure_approvals_deal_id": {
+          "name": "idx_deal_measure_approvals_deal_id",
+          "columns": [
+            {
+              "expression": "hubspot_deal_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "deal_measure_approvals_approved_by_user_id_fk": {
+          "name": "deal_measure_approvals_approved_by_user_id_fk",
+          "tableFrom": "deal_measure_approvals",
+          "tableTo": "user",
+          "columnsFrom": [
+            "approved_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "uq_deal_measure": {
+          "name": "uq_deal_measure",
+          "nullsNotDistinct": false,
+          "columns": [
+            "hubspot_deal_id",
+            "measure_name"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.bulk_address_uploads": {
+      "name": "bulk_address_uploads",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "s3_bucket": {
+          "name": "s3_bucket",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "s3_key": {
+          "name": "s3_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "filename": {
+          "name": "filename",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'ready_for_processing'"
+        },
+        "source_headers": {
+          "name": "source_headers",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "column_mapping": {
+          "name": "column_mapping",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "combined_output_s3_uri": {
+          "name": "combined_output_s3_uri",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.aspect_condition": {
+      "name": "aspect_condition",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "element_id": {
+          "name": "element_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "aspect_type": {
+          "name": "aspect_type",
+          "type": "aspect_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "aspect_instance": {
+          "name": "aspect_instance",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "quantity": {
+          "name": "quantity",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "install_date": {
+          "name": "install_date",
+          "type": "date",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "renewal_year": {
+          "name": "renewal_year",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "comments": {
+          "name": "comments",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "aspect_condition_element_id_element_id_fk": {
+          "name": "aspect_condition_element_id_element_id_fk",
+          "tableFrom": "aspect_condition",
+          "tableTo": "element",
+          "columnsFrom": [
+            "element_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.element": {
+      "name": "element",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "survey_id": {
+          "name": "survey_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "element_type": {
+          "name": "element_type",
+          "type": "element_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "element_instance": {
+          "name": "element_instance",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "element_survey_id_property_condition_survey_id_fk": {
+          "name": "element_survey_id_property_condition_survey_id_fk",
+          "tableFrom": "element",
+          "tableTo": "property_condition_survey",
+          "columnsFrom": [
+            "survey_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property_condition_survey": {
+      "name": "property_condition_survey",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "date": {
+          "name": "date",
+          "type": "date",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source": {
+          "name": "source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.hubspot_company_data": {
+      "name": "hubspot_company_data",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "company_id": {
+          "name": "company_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "company_name": {
+          "name": "company_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "group_id": {
+          "name": "group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.hubspot_deal_data": {
+      "name": "hubspot_deal_data",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "deal_id": {
+          "name": "deal_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "dealname": {
+          "name": "dealname",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "dealstage": {
+          "name": "dealstage",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "company_id": {
+          "name": "company_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "project_code": {
+          "name": "project_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "landlord_property_id": {
+          "name": "landlord_property_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "listing_id": {
+          "name": "listing_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "outcome": {
+          "name": "outcome",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "outcome_notes": {
+          "name": "outcome_notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "major_condition_issue_description": {
+          "name": "major_condition_issue_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "major_condition_issue_photos": {
+          "name": "major_condition_issue_photos",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "major_condition_issue_evidence_s3_url": {
+          "name": "major_condition_issue_evidence_s3_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "coordination_status": {
+          "name": "coordination_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "design_status": {
+          "name": "design_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pashub_link": {
+          "name": "pashub_link",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sharepoint_link": {
+          "name": "sharepoint_link",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "dampmould_growth": {
+          "name": "dampmould_growth",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pre_sap": {
+          "name": "pre_sap",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "coordinator": {
+          "name": "coordinator",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mtp_completion_date": {
+          "name": "mtp_completion_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mtp_re_model_completion_date": {
+          "name": "mtp_re_model_completion_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ioe_v3_completion_date": {
+          "name": "ioe_v3_completion_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "proposed_measures": {
+          "name": "proposed_measures",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "approved_package": {
+          "name": "approved_package",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "designer": {
+          "name": "designer",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "design_type": {
+          "name": "design_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "design_completion_date": {
+          "name": "design_completion_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actual_measures_installed": {
+          "name": "actual_measures_installed",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installer": {
+          "name": "installer",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installer_handover": {
+          "name": "installer_handover",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lodgement_status": {
+          "name": "lodgement_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "measures_lodgement_date": {
+          "name": "measures_lodgement_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lodgement_date": {
+          "name": "lodgement_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expected_commencement_date": {
+          "name": "expected_commencement_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "coordination_comments": {
+          "name": "coordination_comments",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "surveyor": {
+          "name": "surveyor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "damp_mould_and_repairs_comments": {
+          "name": "damp_mould_and_repairs_comments",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "batch": {
+          "name": "batch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "block_reference": {
+          "name": "block_reference",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_prn": {
+          "name": "epc_prn",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "potential_post_sap_score_dropdown": {
+          "name": "potential_post_sap_score_dropdown",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ei_score": {
+          "name": "ei_score",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ei_score__potential_": {
+          "name": "ei_score__potential_",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_sap_score": {
+          "name": "epc_sap_score",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_sap_score__potential_": {
+          "name": "epc_sap_score__potential_",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "confirmed_survey_date": {
+          "name": "confirmed_survey_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "confirmed_survey_time": {
+          "name": "confirmed_survey_time",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "surveyed_date": {
+          "name": "surveyed_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "survey_type": {
+          "name": "survey_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "measures_for_pibi_ordered": {
+          "name": "measures_for_pibi_ordered",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pibi_order_date": {
+          "name": "pibi_order_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pibi_completed_date": {
+          "name": "pibi_completed_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "property_halted_date": {
+          "name": "property_halted_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "property_halted_reason": {
+          "name": "property_halted_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "technical_approved_measures_for_install": {
+          "name": "technical_approved_measures_for_install",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sent_to_installer_for_pricing": {
+          "name": "sent_to_installer_for_pricing",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "domna_survey_type": {
+          "name": "domna_survey_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "domna_survey_date": {
+          "name": "domna_survey_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.hubspot_users": {
+      "name": "hubspot_users",
+      "schema": "",
+      "columns": {
+        "hubspot_owner_id": {
+          "name": "hubspot_owner_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "first_name": {
+          "name": "first_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_name": {
+          "name": "last_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property_status_tracker": {
+      "name": "property_status_tracker",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "hubspot_deal_id": {
+          "name": "hubspot_deal_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "property_status_tracker_property_id_property_id_fk": {
+          "name": "property_status_tracker_property_id_property_id_fk",
+          "tableFrom": "property_status_tracker",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "property_status_tracker_portfolio_id_portfolio_id_fk": {
+          "name": "property_status_tracker_portfolio_id_portfolio_id_fk",
+          "tableFrom": "property_status_tracker",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.energy_assessments": {
+      "name": "energy_assessments",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uprn_source": {
+          "name": "uprn_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "property_type": {
+          "name": "property_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "building_reference_number": {
+          "name": "building_reference_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_energy_efficiency": {
+          "name": "current_energy_efficiency",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "current_energy_rating": {
+          "name": "current_energy_rating",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "address1": {
+          "name": "address1",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "address2": {
+          "name": "address2",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "address3": {
+          "name": "address3",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "posttown": {
+          "name": "posttown",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "postcode": {
+          "name": "postcode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "address": {
+          "name": "address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "county": {
+          "name": "county",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "constituency": {
+          "name": "constituency",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "constituency_label": {
+          "name": "constituency_label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "low_energy_fixed_light_count": {
+          "name": "low_energy_fixed_light_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "construction_age_band": {
+          "name": "construction_age_band",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheat_energy_eff": {
+          "name": "mainheat_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "windows_env_eff": {
+          "name": "windows_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_energy_eff": {
+          "name": "lighting_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "environment_impact_potential": {
+          "name": "environment_impact_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheatcont_description": {
+          "name": "mainheatcont_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sheating_energy_eff": {
+          "name": "sheating_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "local_authority": {
+          "name": "local_authority",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "local_authority_label": {
+          "name": "local_authority_label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "fixed_lighting_outlets_count": {
+          "name": "fixed_lighting_outlets_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_tariff": {
+          "name": "energy_tariff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mechanical_ventilation": {
+          "name": "mechanical_ventilation",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "solar_water_heating_flag": {
+          "name": "solar_water_heating_flag",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "co2_emissions_potential": {
+          "name": "co2_emissions_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_heated_rooms": {
+          "name": "number_heated_rooms",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_description": {
+          "name": "floor_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_consumption_potential": {
+          "name": "energy_consumption_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "built_form": {
+          "name": "built_form",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_open_fireplaces": {
+          "name": "number_open_fireplaces",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "windows_description": {
+          "name": "windows_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "glazed_area": {
+          "name": "glazed_area",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "inspection_date": {
+          "name": "inspection_date",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mains_gas_flag": {
+          "name": "mains_gas_flag",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "co2_emiss_curr_per_floor_area": {
+          "name": "co2_emiss_curr_per_floor_area",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heat_loss_corridor": {
+          "name": "heat_loss_corridor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "unheated_corridor_length": {
+          "name": "unheated_corridor_length",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "flat_storey_count": {
+          "name": "flat_storey_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof_energy_eff": {
+          "name": "roof_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_floor_area": {
+          "name": "total_floor_area",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "environment_impact_current": {
+          "name": "environment_impact_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "roof_description": {
+          "name": "roof_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_energy_eff": {
+          "name": "floor_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_habitable_rooms": {
+          "name": "number_habitable_rooms",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hot_water_env_eff": {
+          "name": "hot_water_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheatc_energy_eff": {
+          "name": "mainheatc_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "main_fuel": {
+          "name": "main_fuel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_env_eff": {
+          "name": "lighting_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "windows_energy_eff": {
+          "name": "windows_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_env_eff": {
+          "name": "floor_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sheating_env_eff": {
+          "name": "sheating_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_description": {
+          "name": "lighting_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "roof_env_eff": {
+          "name": "roof_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "walls_energy_eff": {
+          "name": "walls_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "photo_supply": {
+          "name": "photo_supply",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_cost_potential": {
+          "name": "lighting_cost_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheat_env_eff": {
+          "name": "mainheat_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "multi_glaze_proportion": {
+          "name": "multi_glaze_proportion",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "main_heating_controls": {
+          "name": "main_heating_controls",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "flat_top_storey": {
+          "name": "flat_top_storey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "secondheat_description": {
+          "name": "secondheat_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "walls_env_eff": {
+          "name": "walls_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "transaction_type": {
+          "name": "transaction_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "extension_count": {
+          "name": "extension_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheatc_env_eff": {
+          "name": "mainheatc_env_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lmk_key": {
+          "name": "lmk_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "wind_turbine_count": {
+          "name": "wind_turbine_count",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "tenure": {
+          "name": "tenure",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_level": {
+          "name": "floor_level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "potential_energy_efficiency": {
+          "name": "potential_energy_efficiency",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "potential_energy_rating": {
+          "name": "potential_energy_rating",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hot_water_energy_eff": {
+          "name": "hot_water_energy_eff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "low_energy_lighting": {
+          "name": "low_energy_lighting",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "walls_description": {
+          "name": "walls_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hotwater_description": {
+          "name": "hotwater_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "co2_emissions_current": {
+          "name": "co2_emissions_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heating_cost_current": {
+          "name": "heating_cost_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heating_cost_potential": {
+          "name": "heating_cost_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hot_water_cost_current": {
+          "name": "hot_water_cost_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "hot_water_cost_potential": {
+          "name": "hot_water_cost_potential",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lighting_cost_current": {
+          "name": "lighting_cost_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_consumption_current": {
+          "name": "energy_consumption_current",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lodgement_date": {
+          "name": "lodgement_date",
+          "type": "date",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lodgement_datetime": {
+          "name": "lodgement_datetime",
+          "type": "timestamp (6)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mainheat_description": {
+          "name": "mainheat_description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_height": {
+          "name": "floor_height",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "glazed_type": {
+          "name": "glazed_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "file_location": {
+          "name": "file_location",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "surveyor_name": {
+          "name": "surveyor_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "surveyor_company": {
+          "name": "surveyor_company",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "space_heating_kwh": {
+          "name": "space_heating_kwh",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "water_heating_kwh": {
+          "name": "water_heating_kwh",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_of_doors": {
+          "name": "number_of_doors",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_of_insulated_doors": {
+          "name": "number_of_insulated_doors",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_of_floors": {
+          "name": "number_of_floors",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "insulation_wall_area": {
+          "name": "insulation_wall_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heat_loss_perimeter": {
+          "name": "heat_loss_perimeter",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "party_wall_length": {
+          "name": "party_wall_length",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "perimeter": {
+          "name": "perimeter",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "rooms_with_bath_and_or_shower": {
+          "name": "rooms_with_bath_and_or_shower",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rooms_with_mixer_shower_no_bath": {
+          "name": "rooms_with_mixer_shower_no_bath",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "room_with_bath_and_mixer_shower": {
+          "name": "room_with_bath_and_mixer_shower",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "percent_draftproofed": {
+          "name": "percent_draftproofed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_hot_water_cylinder": {
+          "name": "has_hot_water_cylinder",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cylinder_insulation_type": {
+          "name": "cylinder_insulation_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cylinder_insulation_thickness": {
+          "name": "cylinder_insulation_thickness",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cylinder_thermostat": {
+          "name": "cylinder_thermostat",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "main_dwelling_ground_floor_area": {
+          "name": "main_dwelling_ground_floor_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_windows": {
+          "name": "number_of_windows",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "windows_area": {
+          "name": "windows_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.energy_assessment_documents": {
+      "name": "energy_assessment_documents",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_assessment_id": {
+          "name": "energy_assessment_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "document_type": {
+          "name": "document_type",
+          "type": "document_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "document_location": {
+          "name": "document_location",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "scenario_id": {
+          "name": "scenario_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "energy_assessment_documents_energy_assessment_id_energy_assessments_id_fk": {
+          "name": "energy_assessment_documents_energy_assessment_id_energy_assessments_id_fk",
+          "tableFrom": "energy_assessment_documents",
+          "tableTo": "energy_assessments",
+          "columnsFrom": [
+            "energy_assessment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "energy_assessment_documents_scenario_id_energy_assessment_scenarios_id_fk": {
+          "name": "energy_assessment_documents_scenario_id_energy_assessment_scenarios_id_fk",
+          "tableFrom": "energy_assessment_documents",
+          "tableTo": "energy_assessment_scenarios",
+          "columnsFrom": [
+            "scenario_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.energy_assessment_scenarios": {
+      "name": "energy_assessment_scenarios",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "scenario_name": {
+          "name": "scenario_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_assessment_id": {
+          "name": "energy_assessment_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "energy_assessment_scenarios_energy_assessment_id_energy_assessments_id_fk": {
+          "name": "energy_assessment_scenarios_energy_assessment_id_energy_assessments_id_fk",
+          "tableFrom": "energy_assessment_scenarios",
+          "tableTo": "energy_assessments",
+          "columnsFrom": [
+            "energy_assessment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.epc_store": {
+      "name": "epc_store",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_api_created_at": {
+          "name": "epc_api_created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_api": {
+          "name": "epc_api",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_page_created_at": {
+          "name": "epc_page_created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_page": {
+          "name": "epc_page",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_page_rrn": {
+          "name": "epc_page_rrn",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "uq_epc_store_uprn": {
+          "name": "uq_epc_store_uprn",
+          "columns": [
+            {
+              "expression": "uprn",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.files_from_surveyor": {
+      "name": "files_from_surveyor",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "s3_json_url": {
+          "name": "s3_json_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "files_from_surveyor_portfolio_id_portfolio_id_fk": {
+          "name": "files_from_surveyor_portfolio_id_portfolio_id_fk",
+          "tableFrom": "files_from_surveyor",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "files_from_surveyor_property_id_property_id_fk": {
+          "name": "files_from_surveyor_property_id_property_id_fk",
+          "tableFrom": "files_from_surveyor",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.funding_package": {
+      "name": "funding_package",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "plan_id": {
+          "name": "plan_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scheme": {
+          "name": "scheme",
+          "type": "scheme",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "project_funding": {
+          "name": "project_funding",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_uplift": {
+          "name": "total_uplift",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "full_project_score": {
+          "name": "full_project_score",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "partial_project_score": {
+          "name": "partial_project_score",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uplift_project_score": {
+          "name": "uplift_project_score",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "funding_package_plan_id_plan_id_fk": {
+          "name": "funding_package_plan_id_plan_id_fk",
+          "tableFrom": "funding_package",
+          "tableTo": "plan",
+          "columnsFrom": [
+            "plan_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.funding_package_measures": {
+      "name": "funding_package_measures",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "funding_package_id": {
+          "name": "funding_package_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "measure": {
+          "name": "measure",
+          "type": "type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "material_id": {
+          "name": "material_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "innovation_uplift": {
+          "name": "innovation_uplift",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "partial_project_score": {
+          "name": "partial_project_score",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uplift_project_score": {
+          "name": "uplift_project_score",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "funding_package_measures_funding_package_id_funding_package_id_fk": {
+          "name": "funding_package_measures_funding_package_id_funding_package_id_fk",
+          "tableFrom": "funding_package_measures",
+          "tableTo": "funding_package",
+          "columnsFrom": [
+            "funding_package_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "funding_package_measures_material_id_material_id_fk": {
+          "name": "funding_package_measures_material_id_material_id_fk",
+          "tableFrom": "funding_package_measures",
+          "tableTo": "material",
+          "columnsFrom": [
+            "material_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.inspections": {
+      "name": "inspections",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "archetype": {
+          "name": "archetype",
+          "type": "inspection_archetype",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "archetype_2": {
+          "name": "archetype_2",
+          "type": "inspection_archetype_2",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "wall_construction": {
+          "name": "wall_construction",
+          "type": "inspections_wall_construction",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "insulation": {
+          "name": "insulation",
+          "type": "inspections_wall_insulation",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "insulation_material": {
+          "name": "insulation_material",
+          "type": "inspections_insulation_material",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "borescoped": {
+          "name": "borescoped",
+          "type": "inspection_borescoped",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof_orientation": {
+          "name": "roof_orientation",
+          "type": "inspections_roof_orientation",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tile_hung": {
+          "name": "tile_hung",
+          "type": "inspections_tile_hung",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rendered": {
+          "name": "rendered",
+          "type": "inspections_rendered",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cladding": {
+          "name": "cladding",
+          "type": "inspections_cladding",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_issues": {
+          "name": "access_issues",
+          "type": "inspections_access_issues",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "surveyor_name": {
+          "name": "surveyor_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "inspections_property_id_property_id_fk": {
+          "name": "inspections_property_id_property_id_fk",
+          "tableFrom": "inspections",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.material": {
+      "name": "material",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "depth": {
+          "name": "depth",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "depth_unit": {
+          "name": "depth_unit",
+          "type": "depth_unit",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_unit": {
+          "name": "cost_unit",
+          "type": "cost_unit",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "r_value_per_mm": {
+          "name": "r_value_per_mm",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "r_value_unit": {
+          "name": "r_value_unit",
+          "type": "r_value_unit",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "thermal_conductivity": {
+          "name": "thermal_conductivity",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "thermal_conductivity_unit": {
+          "name": "thermal_conductivity_unit",
+          "type": "thermal_conductivity_unit",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "link": {
+          "name": "link",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "prime_material_cost": {
+          "name": "prime_material_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "material_cost": {
+          "name": "material_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_cost": {
+          "name": "labour_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_hours_per_unit": {
+          "name": "labour_hours_per_unit",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "plant_cost": {
+          "name": "plant_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_cost": {
+          "name": "total_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost": {
+          "name": "cost",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "notes": {
+          "name": "notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_installer_quote": {
+          "name": "is_installer_quote",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "innovation_rate": {
+          "name": "innovation_rate",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "size": {
+          "name": "size",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "size_unit": {
+          "name": "size_unit",
+          "type": "size_unit",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "includes_scaffolding": {
+          "name": "includes_scaffolding",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "includes_battery": {
+          "name": "includes_battery",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "battery_size": {
+          "name": "battery_size",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.organisation": {
+      "name": "organisation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "hubspot_company_id": {
+          "name": "hubspot_company_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.portfolio_organisation": {
+      "name": "portfolio_organisation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organisation_id": {
+          "name": "organisation_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "portfolio_organisation_portfolio_id_portfolio_id_fk": {
+          "name": "portfolio_organisation_portfolio_id_portfolio_id_fk",
+          "tableFrom": "portfolio_organisation",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "portfolio_organisation_organisation_id_organisation_id_fk": {
+          "name": "portfolio_organisation_organisation_id_organisation_id_fk",
+          "tableFrom": "portfolio_organisation",
+          "tableTo": "organisation",
+          "columnsFrom": [
+            "organisation_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "portfolio_organisation_portfolio_id_unique": {
+          "name": "portfolio_organisation_portfolio_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "portfolio_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.portfolio": {
+      "name": "portfolio",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "budget": {
+          "name": "budget",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "goal": {
+          "name": "goal",
+          "type": "goal",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "cost": {
+          "name": "cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_properties": {
+          "name": "number_of_properties",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_equivalent_savings": {
+          "name": "co2_equivalent_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_savings": {
+          "name": "energy_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_cost_savings": {
+          "name": "energy_cost_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "property_valuation_increase": {
+          "name": "property_valuation_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rental_yield_increase": {
+          "name": "rental_yield_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_work_hours": {
+          "name": "total_work_hours",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_days": {
+          "name": "labour_days",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "epc_breakdown_pre_retrofit": {
+          "name": "epc_breakdown_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_breakdown_post_retrofit": {
+          "name": "epc_breakdown_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "n_units_to_retrofit": {
+          "name": "n_units_to_retrofit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_per_unit_pre_retrofit": {
+          "name": "co2_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_per_unit_post_retrofit": {
+          "name": "co2_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_per_unit_pre_retrofit": {
+          "name": "energy_bill_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_per_unit_post_retrofit": {
+          "name": "energy_bill_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_per_unit_pre_retrofit": {
+          "name": "energy_consumption_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_per_unit_post_retrofit": {
+          "name": "energy_consumption_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_improvement_per_unit": {
+          "name": "valuation_improvement_per_unit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_unit": {
+          "name": "cost_per_unit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_co2_saved": {
+          "name": "cost_per_co2_saved",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_sap_point": {
+          "name": "cost_per_sap_point",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_return_on_investment": {
+          "name": "valuation_return_on_investment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.portfolio_capabilities": {
+      "name": "portfolio_capabilities",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "capability": {
+          "name": "capability",
+          "type": "portfolio_capability",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "portfolio_capabilities_user_id_user_id_fk": {
+          "name": "portfolio_capabilities_user_id_user_id_fk",
+          "tableFrom": "portfolio_capabilities",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "portfolio_capabilities_portfolio_id_portfolio_id_fk": {
+          "name": "portfolio_capabilities_portfolio_id_portfolio_id_fk",
+          "tableFrom": "portfolio_capabilities",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "portfolio_capabilities_user_id_portfolio_id_capability_unique": {
+          "name": "portfolio_capabilities_user_id_portfolio_id_capability_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "user_id",
+            "portfolio_id",
+            "capability"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.portfolioUsers": {
+      "name": "portfolioUsers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "role",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "portfolioUsers_user_id_user_id_fk": {
+          "name": "portfolioUsers_user_id_user_id_fk",
+          "tableFrom": "portfolioUsers",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "portfolioUsers_portfolio_id_portfolio_id_fk": {
+          "name": "portfolioUsers_portfolio_id_portfolio_id_fk",
+          "tableFrom": "portfolioUsers",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.epc_building_part": {
+      "name": "epc_building_part",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "epc_property_id": {
+          "name": "epc_property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "construction_age_band": {
+          "name": "construction_age_band",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "wall_construction": {
+          "name": "wall_construction",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "wall_insulation_type": {
+          "name": "wall_insulation_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "wall_thickness_measured": {
+          "name": "wall_thickness_measured",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "party_wall_construction": {
+          "name": "party_wall_construction",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "building_part_number": {
+          "name": "building_part_number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "wall_dry_lined": {
+          "name": "wall_dry_lined",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "wall_thickness_mm": {
+          "name": "wall_thickness_mm",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "wall_insulation_thickness": {
+          "name": "wall_insulation_thickness",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor_heat_loss": {
+          "name": "floor_heat_loss",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor_insulation_thickness": {
+          "name": "floor_insulation_thickness",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "flat_roof_insulation_thickness": {
+          "name": "flat_roof_insulation_thickness",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor_type": {
+          "name": "floor_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor_construction_type": {
+          "name": "floor_construction_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor_insulation_type_str": {
+          "name": "floor_insulation_type_str",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor_u_value_known": {
+          "name": "floor_u_value_known",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof_construction": {
+          "name": "roof_construction",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof_insulation_location": {
+          "name": "roof_insulation_location",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof_insulation_thickness": {
+          "name": "roof_insulation_thickness",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "room_in_roof_floor_area": {
+          "name": "room_in_roof_floor_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "room_in_roof_construction_age_band": {
+          "name": "room_in_roof_construction_age_band",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alt_wall_1_area": {
+          "name": "alt_wall_1_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alt_wall_1_dry_lined": {
+          "name": "alt_wall_1_dry_lined",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alt_wall_1_construction": {
+          "name": "alt_wall_1_construction",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alt_wall_1_insulation_type": {
+          "name": "alt_wall_1_insulation_type",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alt_wall_1_thickness_measured": {
+          "name": "alt_wall_1_thickness_measured",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alt_wall_1_insulation_thickness": {
+          "name": "alt_wall_1_insulation_thickness",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alt_wall_2_area": {
+          "name": "alt_wall_2_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alt_wall_2_dry_lined": {
+          "name": "alt_wall_2_dry_lined",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alt_wall_2_construction": {
+          "name": "alt_wall_2_construction",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alt_wall_2_insulation_type": {
+          "name": "alt_wall_2_insulation_type",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alt_wall_2_thickness_measured": {
+          "name": "alt_wall_2_thickness_measured",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "alt_wall_2_insulation_thickness": {
+          "name": "alt_wall_2_insulation_thickness",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "epc_building_part_epc_property_id_epc_property_id_fk": {
+          "name": "epc_building_part_epc_property_id_epc_property_id_fk",
+          "tableFrom": "epc_building_part",
+          "tableTo": "epc_property",
+          "columnsFrom": [
+            "epc_property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.epc_energy_element": {
+      "name": "epc_energy_element",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "epc_property_id": {
+          "name": "epc_property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "element_type": {
+          "name": "element_type",
+          "type": "energy_element_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_efficiency_rating": {
+          "name": "energy_efficiency_rating",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "environmental_efficiency_rating": {
+          "name": "environmental_efficiency_rating",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "epc_energy_element_epc_property_id_epc_property_id_fk": {
+          "name": "epc_energy_element_epc_property_id_epc_property_id_fk",
+          "tableFrom": "epc_energy_element",
+          "tableTo": "epc_property",
+          "columnsFrom": [
+            "epc_property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.epc_flat_details": {
+      "name": "epc_flat_details",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "epc_property_id": {
+          "name": "epc_property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "level": {
+          "name": "level",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "top_storey": {
+          "name": "top_storey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "flat_location": {
+          "name": "flat_location",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heat_loss_corridor": {
+          "name": "heat_loss_corridor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "storey_count": {
+          "name": "storey_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "unheated_corridor_length_m": {
+          "name": "unheated_corridor_length_m",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "epc_flat_details_epc_property_id_epc_property_id_fk": {
+          "name": "epc_flat_details_epc_property_id_epc_property_id_fk",
+          "tableFrom": "epc_flat_details",
+          "tableTo": "epc_property",
+          "columnsFrom": [
+            "epc_property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "epc_flat_details_epc_property_id_unique": {
+          "name": "epc_flat_details_epc_property_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "epc_property_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.epc_floor_dimension": {
+      "name": "epc_floor_dimension",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "epc_building_part_id": {
+          "name": "epc_building_part_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor": {
+          "name": "floor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "room_height_m": {
+          "name": "room_height_m",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_floor_area_m2": {
+          "name": "total_floor_area_m2",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "party_wall_length_m": {
+          "name": "party_wall_length_m",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heat_loss_perimeter_m": {
+          "name": "heat_loss_perimeter_m",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "floor_insulation": {
+          "name": "floor_insulation",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor_construction": {
+          "name": "floor_construction",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "epc_floor_dimension_epc_building_part_id_epc_building_part_id_fk": {
+          "name": "epc_floor_dimension_epc_building_part_id_epc_building_part_id_fk",
+          "tableFrom": "epc_floor_dimension",
+          "tableTo": "epc_building_part",
+          "columnsFrom": [
+            "epc_building_part_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.epc_main_heating_detail": {
+      "name": "epc_main_heating_detail",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "epc_property_id": {
+          "name": "epc_property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "has_fghrs": {
+          "name": "has_fghrs",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "main_fuel_type": {
+          "name": "main_fuel_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heat_emitter_type": {
+          "name": "heat_emitter_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "emitter_temperature": {
+          "name": "emitter_temperature",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "main_heating_control": {
+          "name": "main_heating_control",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "fan_flue_present": {
+          "name": "fan_flue_present",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boiler_flue_type": {
+          "name": "boiler_flue_type",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "boiler_ignition_type": {
+          "name": "boiler_ignition_type",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "central_heating_pump_age": {
+          "name": "central_heating_pump_age",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "central_heating_pump_age_str": {
+          "name": "central_heating_pump_age_str",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "main_heating_index_number": {
+          "name": "main_heating_index_number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sap_main_heating_code": {
+          "name": "sap_main_heating_code",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "main_heating_number": {
+          "name": "main_heating_number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "main_heating_category": {
+          "name": "main_heating_category",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "main_heating_fraction": {
+          "name": "main_heating_fraction",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "main_heating_data_source": {
+          "name": "main_heating_data_source",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "condensing": {
+          "name": "condensing",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "weather_compensator": {
+          "name": "weather_compensator",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "epc_main_heating_detail_epc_property_id_epc_property_id_fk": {
+          "name": "epc_main_heating_detail_epc_property_id_epc_property_id_fk",
+          "tableFrom": "epc_main_heating_detail",
+          "tableTo": "epc_property",
+          "columnsFrom": [
+            "epc_property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.epc_property": {
+      "name": "epc_property",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_file_id": {
+          "name": "uploaded_file_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uprn_source": {
+          "name": "uprn_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "report_reference": {
+          "name": "report_reference",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "report_type": {
+          "name": "report_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "assessment_type": {
+          "name": "assessment_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sap_version": {
+          "name": "sap_version",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "schema_type": {
+          "name": "schema_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "schema_versions_original": {
+          "name": "schema_versions_original",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "calculation_software_version": {
+          "name": "calculation_software_version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "address_line_1": {
+          "name": "address_line_1",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "address_line_2": {
+          "name": "address_line_2",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "post_town": {
+          "name": "post_town",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "postcode": {
+          "name": "postcode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "region_code": {
+          "name": "region_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "country_code": {
+          "name": "country_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "language_code": {
+          "name": "language_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "dwelling_type": {
+          "name": "dwelling_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "property_type": {
+          "name": "property_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "built_form": {
+          "name": "built_form",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tenure": {
+          "name": "tenure",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "transaction_type": {
+          "name": "transaction_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "inspection_date": {
+          "name": "inspection_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "completion_date": {
+          "name": "completion_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "registration_date": {
+          "name": "registration_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_floor_area_m2": {
+          "name": "total_floor_area_m2",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "measurement_type": {
+          "name": "measurement_type",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "solar_water_heating": {
+          "name": "solar_water_heating",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "has_hot_water_cylinder": {
+          "name": "has_hot_water_cylinder",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "has_fixed_air_conditioning": {
+          "name": "has_fixed_air_conditioning",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "has_conservatory": {
+          "name": "has_conservatory",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_heated_separate_conservatory": {
+          "name": "has_heated_separate_conservatory",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "conservatory_type": {
+          "name": "conservatory_type",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "door_count": {
+          "name": "door_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "wet_rooms_count": {
+          "name": "wet_rooms_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "extensions_count": {
+          "name": "extensions_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "heated_rooms_count": {
+          "name": "heated_rooms_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "open_chimneys_count": {
+          "name": "open_chimneys_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "habitable_rooms_count": {
+          "name": "habitable_rooms_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "insulated_door_count": {
+          "name": "insulated_door_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "cfl_fixed_lighting_bulbs_count": {
+          "name": "cfl_fixed_lighting_bulbs_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "led_fixed_lighting_bulbs_count": {
+          "name": "led_fixed_lighting_bulbs_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "incandescent_fixed_lighting_bulbs_count": {
+          "name": "incandescent_fixed_lighting_bulbs_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "blocked_chimneys_count": {
+          "name": "blocked_chimneys_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "draughtproofed_door_count": {
+          "name": "draughtproofed_door_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_rating_average": {
+          "name": "energy_rating_average",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "low_energy_fixed_lighting_bulbs_count": {
+          "name": "low_energy_fixed_lighting_bulbs_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "fixed_lighting_outlets_count": {
+          "name": "fixed_lighting_outlets_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "low_energy_fixed_lighting_outlets_count": {
+          "name": "low_energy_fixed_lighting_outlets_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_storeys": {
+          "name": "number_of_storeys",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "any_unheated_rooms": {
+          "name": "any_unheated_rooms",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hydro": {
+          "name": "hydro",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "photovoltaic_array": {
+          "name": "photovoltaic_array",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "waste_water_heat_recovery": {
+          "name": "waste_water_heat_recovery",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pressure_test": {
+          "name": "pressure_test",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "pressure_test_certificate_number": {
+          "name": "pressure_test_certificate_number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "percent_draughtproofed": {
+          "name": "percent_draughtproofed",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "insulated_door_u_value": {
+          "name": "insulated_door_u_value",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "multiple_glazed_proportion": {
+          "name": "multiple_glazed_proportion",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "windows_transmission_u_value": {
+          "name": "windows_transmission_u_value",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "windows_transmission_data_source": {
+          "name": "windows_transmission_data_source",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "windows_transmission_solar_transmittance": {
+          "name": "windows_transmission_solar_transmittance",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_mains_gas": {
+          "name": "energy_mains_gas",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_meter_type": {
+          "name": "energy_meter_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_pv_battery_count": {
+          "name": "energy_pv_battery_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_wind_turbines_count": {
+          "name": "energy_wind_turbines_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_gas_smart_meter_present": {
+          "name": "energy_gas_smart_meter_present",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_is_dwelling_export_capable": {
+          "name": "energy_is_dwelling_export_capable",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_wind_turbines_terrain_type": {
+          "name": "energy_wind_turbines_terrain_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_electricity_smart_meter_present": {
+          "name": "energy_electricity_smart_meter_present",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_pv_connection": {
+          "name": "energy_pv_connection",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_pv_percent_roof_area": {
+          "name": "energy_pv_percent_roof_area",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_pv_battery_capacity": {
+          "name": "energy_pv_battery_capacity",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_wind_turbine_hub_height": {
+          "name": "energy_wind_turbine_hub_height",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_wind_turbine_rotor_diameter": {
+          "name": "energy_wind_turbine_rotor_diameter",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_cylinder_size": {
+          "name": "heating_cylinder_size",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_water_heating_code": {
+          "name": "heating_water_heating_code",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_water_heating_fuel": {
+          "name": "heating_water_heating_fuel",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_immersion_heating_type": {
+          "name": "heating_immersion_heating_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_cylinder_insulation_type": {
+          "name": "heating_cylinder_insulation_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_cylinder_thermostat": {
+          "name": "heating_cylinder_thermostat",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_secondary_fuel_type": {
+          "name": "heating_secondary_fuel_type",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_secondary_heating_type": {
+          "name": "heating_secondary_heating_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_cylinder_insulation_thickness_mm": {
+          "name": "heating_cylinder_insulation_thickness_mm",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_wwhrs_index_number_1": {
+          "name": "heating_wwhrs_index_number_1",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_wwhrs_index_number_2": {
+          "name": "heating_wwhrs_index_number_2",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_shower_outlet_type": {
+          "name": "heating_shower_outlet_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_shower_wwhrs": {
+          "name": "heating_shower_wwhrs",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation_type": {
+          "name": "ventilation_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation_draught_lobby": {
+          "name": "ventilation_draught_lobby",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation_pressure_test": {
+          "name": "ventilation_pressure_test",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation_open_flues_count": {
+          "name": "ventilation_open_flues_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation_closed_flues_count": {
+          "name": "ventilation_closed_flues_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation_boiler_flues_count": {
+          "name": "ventilation_boiler_flues_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation_other_flues_count": {
+          "name": "ventilation_other_flues_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation_extract_fans_count": {
+          "name": "ventilation_extract_fans_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation_passive_vents_count": {
+          "name": "ventilation_passive_vents_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation_flueless_gas_fires_count": {
+          "name": "ventilation_flueless_gas_fires_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation_in_pcdf_database": {
+          "name": "ventilation_in_pcdf_database",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mechanical_ventilation": {
+          "name": "mechanical_ventilation",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mechanical_vent_duct_type": {
+          "name": "mechanical_vent_duct_type",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mechanical_vent_duct_placement": {
+          "name": "mechanical_vent_duct_placement",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mechanical_vent_duct_insulation": {
+          "name": "mechanical_vent_duct_insulation",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mechanical_ventilation_index_number": {
+          "name": "mechanical_ventilation_index_number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mechanical_vent_measured_installation": {
+          "name": "mechanical_vent_measured_installation",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "uq_epc_property_property_portfolio": {
+          "name": "uq_epc_property_property_portfolio",
+          "columns": [
+            {
+              "expression": "property_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "portfolio_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "epc_property_property_id_property_id_fk": {
+          "name": "epc_property_property_id_property_id_fk",
+          "tableFrom": "epc_property",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "epc_property_portfolio_id_portfolio_id_fk": {
+          "name": "epc_property_portfolio_id_portfolio_id_fk",
+          "tableFrom": "epc_property",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "epc_property_uploaded_file_id_uploaded_files_id_fk": {
+          "name": "epc_property_uploaded_file_id_uploaded_files_id_fk",
+          "tableFrom": "epc_property",
+          "tableTo": "uploaded_files",
+          "columnsFrom": [
+            "uploaded_file_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "epc_property_uploaded_file_id_unique": {
+          "name": "epc_property_uploaded_file_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "uploaded_file_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.epc_property_energy_performance": {
+      "name": "epc_property_energy_performance",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "epc_property_id": {
+          "name": "epc_property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "energy_rating_current": {
+          "name": "energy_rating_current",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_current": {
+          "name": "energy_consumption_current",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "environmental_impact_current": {
+          "name": "environmental_impact_current",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_cost_current": {
+          "name": "heating_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lighting_cost_current": {
+          "name": "lighting_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hot_water_cost_current": {
+          "name": "hot_water_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_emissions_current": {
+          "name": "co2_emissions_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_emissions_current_per_floor_area": {
+          "name": "co2_emissions_current_per_floor_area",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_energy_efficiency_band": {
+          "name": "current_energy_efficiency_band",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_rating_potential": {
+          "name": "energy_rating_potential",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_potential": {
+          "name": "energy_consumption_potential",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "environmental_impact_potential": {
+          "name": "environmental_impact_potential",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_cost_potential": {
+          "name": "heating_cost_potential",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lighting_cost_potential": {
+          "name": "lighting_cost_potential",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hot_water_cost_potential": {
+          "name": "hot_water_cost_potential",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_emissions_potential": {
+          "name": "co2_emissions_potential",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "potential_energy_efficiency_band": {
+          "name": "potential_energy_efficiency_band",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "epc_property_energy_performance_epc_property_id_epc_property_id_fk": {
+          "name": "epc_property_energy_performance_epc_property_id_epc_property_id_fk",
+          "tableFrom": "epc_property_energy_performance",
+          "tableTo": "epc_property",
+          "columnsFrom": [
+            "epc_property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "epc_property_energy_performance_epc_property_id_unique": {
+          "name": "epc_property_energy_performance_epc_property_id_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "epc_property_id"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.epc_window": {
+      "name": "epc_window",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "epc_property_id": {
+          "name": "epc_property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "glazing_gap": {
+          "name": "glazing_gap",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "orientation": {
+          "name": "orientation",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "window_type": {
+          "name": "window_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "glazing_type": {
+          "name": "glazing_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "window_width": {
+          "name": "window_width",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "window_height": {
+          "name": "window_height",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "draught_proofed": {
+          "name": "draught_proofed",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "window_location": {
+          "name": "window_location",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "window_wall_type": {
+          "name": "window_wall_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "permanent_shutters_present": {
+          "name": "permanent_shutters_present",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "frame_material": {
+          "name": "frame_material",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "frame_factor": {
+          "name": "frame_factor",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "permanent_shutters_insulated": {
+          "name": "permanent_shutters_insulated",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "transmission_u_value": {
+          "name": "transmission_u_value",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "transmission_data_source": {
+          "name": "transmission_data_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "transmission_solar_transmittance": {
+          "name": "transmission_solar_transmittance",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "epc_window_epc_property_id_epc_property_id_fk": {
+          "name": "epc_window_epc_property_id_epc_property_id_fk",
+          "tableFrom": "epc_window",
+          "tableTo": "epc_property",
+          "columnsFrom": [
+            "epc_property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.non_intrusive_survey": {
+      "name": "non_intrusive_survey",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "survey_date": {
+          "name": "survey_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "surveyor": {
+          "name": "surveyor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.non_intrusive_survey_notes": {
+      "name": "non_intrusive_survey_notes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "survey_id": {
+          "name": "survey_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "note": {
+          "name": "note",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "non_intrusive_survey_notes_survey_id_non_intrusive_survey_id_fk": {
+          "name": "non_intrusive_survey_notes_survey_id_non_intrusive_survey_id_fk",
+          "tableFrom": "non_intrusive_survey_notes",
+          "tableTo": "non_intrusive_survey",
+          "columnsFrom": [
+            "survey_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property": {
+      "name": "property",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "creation_status": {
+          "name": "creation_status",
+          "type": "creation_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "landlord_property_id": {
+          "name": "landlord_property_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "building_reference_number": {
+          "name": "building_reference_number",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "address": {
+          "name": "address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "postcode": {
+          "name": "postcode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_inputted_address": {
+          "name": "user_inputted_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_inputted_postcode": {
+          "name": "user_inputted_postcode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lexiscore": {
+          "name": "lexiscore",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_pre_condition_report": {
+          "name": "has_pre_condition_report",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_recommendations": {
+          "name": "has_recommendations",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "property_type": {
+          "name": "property_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "built_form": {
+          "name": "built_form",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "local_authority": {
+          "name": "local_authority",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "constituency": {
+          "name": "constituency",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_rooms": {
+          "name": "number_of_rooms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "year_built": {
+          "name": "year_built",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tenure": {
+          "name": "tenure",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_epc_rating": {
+          "name": "current_epc_rating",
+          "type": "epc",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_sap_points": {
+          "name": "current_sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_valuation": {
+          "name": "current_valuation",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installed_measures_sap_point_adjustment": {
+          "name": "installed_measures_sap_point_adjustment",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_sap_points_adjusted_for_installed_measures": {
+          "name": "is_sap_points_adjusted_for_installed_measures",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "original_sap_points": {
+          "name": "original_sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lodged_sap_points": {
+          "name": "lodged_sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lodged_epc_rating": {
+          "name": "lodged_epc_rating",
+          "type": "epc",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "uq_property_portfolio_uprn": {
+          "name": "uq_property_portfolio_uprn",
+          "columns": [
+            {
+              "expression": "portfolio_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "uprn",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"property\".\"uprn\" IS NOT NULL",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "property_portfolio_id_portfolio_id_fk": {
+          "name": "property_portfolio_id_portfolio_id_fk",
+          "tableFrom": "property",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property_details_epc": {
+      "name": "property_details_epc",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "full_address": {
+          "name": "full_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lodgement_date": {
+          "name": "lodgement_date",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_expired": {
+          "name": "is_expired",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_floor_area": {
+          "name": "total_floor_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "walls": {
+          "name": "walls",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "walls_rating": {
+          "name": "walls_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof": {
+          "name": "roof",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "roof_rating": {
+          "name": "roof_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor": {
+          "name": "floor",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor_rating": {
+          "name": "floor_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "windows": {
+          "name": "windows",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "windows_rating": {
+          "name": "windows_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating": {
+          "name": "heating",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_rating": {
+          "name": "heating_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_controls": {
+          "name": "heating_controls",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_controls_rating": {
+          "name": "heating_controls_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hot_water": {
+          "name": "hot_water",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hot_water_rating": {
+          "name": "hot_water_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lighting": {
+          "name": "lighting",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lighting_rating": {
+          "name": "lighting_rating",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mainfuel": {
+          "name": "mainfuel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ventilation": {
+          "name": "ventilation",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "solar_pv": {
+          "name": "solar_pv",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "solar_hot_water": {
+          "name": "solar_hot_water",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "wind_turbine": {
+          "name": "wind_turbine",
+          "type": "smallint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "floor_height": {
+          "name": "floor_height",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_heated_rooms": {
+          "name": "number_heated_rooms",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heat_loss_corridor": {
+          "name": "heat_loss_corridor",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "unheated_corridor_length": {
+          "name": "unheated_corridor_length",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_open_fireplaces": {
+          "name": "number_of_open_fireplaces",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_extensions": {
+          "name": "number_of_extensions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_storeys": {
+          "name": "number_of_storeys",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "mains_gas": {
+          "name": "mains_gas",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_tariff": {
+          "name": "energy_tariff",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "primary_energy_consumption": {
+          "name": "primary_energy_consumption",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_emissions": {
+          "name": "co2_emissions",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_energy_demand": {
+          "name": "current_energy_demand",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "current_energy_demand_heating_hotwater": {
+          "name": "current_energy_demand_heating_hotwater",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "estimated": {
+          "name": "estimated",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "sap_05_overwritten": {
+          "name": "sap_05_overwritten",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "sap_05_score": {
+          "name": "sap_05_score",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sap_05_epc_rating": {
+          "name": "sap_05_epc_rating",
+          "type": "epc",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heating_cost_current": {
+          "name": "heating_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hot_water_cost_current": {
+          "name": "hot_water_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lighting_cost_current": {
+          "name": "lighting_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "appliances_cost_current": {
+          "name": "appliances_cost_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "gas_standing_charge": {
+          "name": "gas_standing_charge",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "electricity_standing_charge": {
+          "name": "electricity_standing_charge",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "original_co2_emissions": {
+          "name": "original_co2_emissions",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "original_primary_energy_consumption": {
+          "name": "original_primary_energy_consumption",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "original_current_energy_demand": {
+          "name": "original_current_energy_demand",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "original_current_energy_demand_heating_hotwater": {
+          "name": "original_current_energy_demand_heating_hotwater",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installed_measures_co2_adjustment": {
+          "name": "installed_measures_co2_adjustment",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installed_measures_energy_demand_adjustment": {
+          "name": "installed_measures_energy_demand_adjustment",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installed_measures_total_energy_bill_adjustment": {
+          "name": "installed_measures_total_energy_bill_adjustment",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "installed_measures_heat_demand_adjustment": {
+          "name": "installed_measures_heat_demand_adjustment",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_epc_adjusted_for_installed_measures": {
+          "name": "is_epc_adjusted_for_installed_measures",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "lodged_co2_emissions": {
+          "name": "lodged_co2_emissions",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lodged_heat_demand": {
+          "name": "lodged_heat_demand",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "has_been_remodelled": {
+          "name": "has_been_remodelled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "environment_impact_current": {
+          "name": "environment_impact_current",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "uq_property_details_epc_property_portfolio": {
+          "name": "uq_property_details_epc_property_portfolio",
+          "columns": [
+            {
+              "expression": "property_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "portfolio_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "property_details_epc_property_id_property_id_fk": {
+          "name": "property_details_epc_property_id_property_id_fk",
+          "tableFrom": "property_details_epc",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "property_details_epc_portfolio_id_portfolio_id_fk": {
+          "name": "property_details_epc_portfolio_id_portfolio_id_fk",
+          "tableFrom": "property_details_epc",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property_details_meter": {
+      "name": "property_details_meter",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_supplier": {
+          "name": "energy_supplier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "gas_supplier": {
+          "name": "gas_supplier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "meter_reading_total": {
+          "name": "meter_reading_total",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "meter_reading_electricity": {
+          "name": "meter_reading_electricity",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "meter_reading_gas": {
+          "name": "meter_reading_gas",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property_details_spatial": {
+      "name": "property_details_spatial",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "x_coordinate": {
+          "name": "x_coordinate",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "y_coordinate": {
+          "name": "y_coordinate",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "latitude": {
+          "name": "latitude",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "longitude": {
+          "name": "longitude",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "conservation_status": {
+          "name": "conservation_status",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_listed_building": {
+          "name": "is_listed_building",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_heritage_building": {
+          "name": "is_heritage_building",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "uq_property_details_spatial_uprn": {
+          "name": "uq_property_details_spatial_uprn",
+          "columns": [
+            {
+              "expression": "uprn",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property_targets": {
+      "name": "property_targets",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "epc": {
+          "name": "epc",
+          "type": "epc",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heat_demand": {
+          "name": "heat_demand",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "property_targets_property_id_property_id_fk": {
+          "name": "property_targets_property_id_property_id_fk",
+          "tableFrom": "property_targets",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "property_targets_portfolio_id_portfolio_id_fk": {
+          "name": "property_targets_portfolio_id_portfolio_id_fk",
+          "tableFrom": "property_targets",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.installed_measure": {
+      "name": "installed_measure",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "measure_type": {
+          "name": "measure_type",
+          "type": "measure_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "installed_at": {
+          "name": "installed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        },
+        "sap_points": {
+          "name": "sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "carbon_savings": {
+          "name": "carbon_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "kwh_savings": {
+          "name": "kwh_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "bill_savings": {
+          "name": "bill_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heat_demand_savings": {
+          "name": "heat_demand_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source": {
+          "name": "source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        }
+      },
+      "indexes": {
+        "idx_installed_measure_uprn": {
+          "name": "idx_installed_measure_uprn",
+          "columns": [
+            {
+              "expression": "uprn",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_installed_measure_uprn_active": {
+          "name": "idx_installed_measure_uprn_active",
+          "columns": [
+            {
+              "expression": "uprn",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"installed_measure\".\"is_active\" = true",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_installed_measure_measure_type": {
+          "name": "idx_installed_measure_measure_type",
+          "columns": [
+            {
+              "expression": "measure_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_installed_measure_uprn_measure": {
+          "name": "idx_installed_measure_uprn_measure",
+          "columns": [
+            {
+              "expression": "uprn",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "measure_type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"installed_measure\".\"is_active\" = true",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.plan": {
+      "name": "plan",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scenario_id": {
+          "name": "scenario_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "valuation_increase_lower_bound": {
+          "name": "valuation_increase_lower_bound",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_increase_upper_bound": {
+          "name": "valuation_increase_upper_bound",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_increase_average": {
+          "name": "valuation_increase_average",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "post_sap_points": {
+          "name": "post_sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "post_epc_rating": {
+          "name": "post_epc_rating",
+          "type": "epc",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "post_co2_emissions": {
+          "name": "post_co2_emissions",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_savings": {
+          "name": "co2_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "post_energy_bill": {
+          "name": "post_energy_bill",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_savings": {
+          "name": "energy_bill_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "post_energy_consumption": {
+          "name": "post_energy_consumption",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_savings": {
+          "name": "energy_consumption_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_post_retrofit": {
+          "name": "valuation_post_retrofit",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_increase": {
+          "name": "valuation_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_of_works": {
+          "name": "cost_of_works",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "contingency_cost": {
+          "name": "contingency_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "plan_type": {
+          "name": "plan_type",
+          "type": "plan_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "idx_plan_portfolio_scenario": {
+          "name": "idx_plan_portfolio_scenario",
+          "columns": [
+            {
+              "expression": "portfolio_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "scenario_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_plan_latest_per_property": {
+          "name": "idx_plan_latest_per_property",
+          "columns": [
+            {
+              "expression": "portfolio_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "scenario_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "property_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": false,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "plan_portfolio_id_portfolio_id_fk": {
+          "name": "plan_portfolio_id_portfolio_id_fk",
+          "tableFrom": "plan",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "plan_property_id_property_id_fk": {
+          "name": "plan_property_id_property_id_fk",
+          "tableFrom": "plan",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "plan_scenario_id_scenario_id_fk": {
+          "name": "plan_scenario_id_scenario_id_fk",
+          "tableFrom": "plan",
+          "tableTo": "scenario",
+          "columnsFrom": [
+            "scenario_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.plan_recommendations": {
+      "name": "plan_recommendations",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "plan_id": {
+          "name": "plan_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "recommendation_id": {
+          "name": "recommendation_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "idx_plan_recommendations_plan_id": {
+          "name": "idx_plan_recommendations_plan_id",
+          "columns": [
+            {
+              "expression": "plan_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_plan_recommendations_plan_rec": {
+          "name": "idx_plan_recommendations_plan_rec",
+          "columns": [
+            {
+              "expression": "plan_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "recommendation_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "plan_recommendations_plan_id_plan_id_fk": {
+          "name": "plan_recommendations_plan_id_plan_id_fk",
+          "tableFrom": "plan_recommendations",
+          "tableTo": "plan",
+          "columnsFrom": [
+            "plan_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "plan_recommendations_recommendation_id_recommendation_id_fk": {
+          "name": "plan_recommendations_recommendation_id_recommendation_id_fk",
+          "tableFrom": "plan_recommendations",
+          "tableTo": "recommendation",
+          "columnsFrom": [
+            "recommendation_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.recommendation": {
+      "name": "recommendation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "property_id": {
+          "name": "property_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "measure_type": {
+          "name": "measure_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "estimated_cost": {
+          "name": "estimated_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "contingency_cost": {
+          "name": "contingency_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "default": {
+          "name": "default",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "starting_u_value": {
+          "name": "starting_u_value",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "new_u_value": {
+          "name": "new_u_value",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sap_points": {
+          "name": "sap_points",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "heat_demand": {
+          "name": "heat_demand",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "kwh_savings": {
+          "name": "kwh_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_equivalent_savings": {
+          "name": "co2_equivalent_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_savings": {
+          "name": "energy_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_cost_savings": {
+          "name": "energy_cost_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "property_valuation_increase": {
+          "name": "property_valuation_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rental_yield_increase": {
+          "name": "rental_yield_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_work_hours": {
+          "name": "total_work_hours",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_days": {
+          "name": "labour_days",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "already_installed": {
+          "name": "already_installed",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        }
+      },
+      "indexes": {
+        "recommendation_property_id_idx": {
+          "name": "recommendation_property_id_idx",
+          "columns": [
+            {
+              "expression": "property_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_recommendation_active_defaults": {
+          "name": "idx_recommendation_active_defaults",
+          "columns": [
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"recommendation\".\"default\" = true AND \"recommendation\".\"already_installed\" = false",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_recommendation_active_id_property": {
+          "name": "idx_recommendation_active_id_property",
+          "columns": [
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "property_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "where": "\"recommendation\".\"default\" = true AND \"recommendation\".\"already_installed\" = false",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "recommendation_property_id_property_id_fk": {
+          "name": "recommendation_property_id_property_id_fk",
+          "tableFrom": "recommendation",
+          "tableTo": "property",
+          "columnsFrom": [
+            "property_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.recommendation_materials": {
+      "name": "recommendation_materials",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "recommendation_id": {
+          "name": "recommendation_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "material_id": {
+          "name": "material_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "depth": {
+          "name": "depth",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "quantity": {
+          "name": "quantity",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "quantity_unit": {
+          "name": "quantity_unit",
+          "type": "unit_quantity",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "estimated_cost": {
+          "name": "estimated_cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "recommendation_materials_recommendation_id_idx": {
+          "name": "recommendation_materials_recommendation_id_idx",
+          "columns": [
+            {
+              "expression": "recommendation_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "recommendation_materials_recommendation_id_recommendation_id_fk": {
+          "name": "recommendation_materials_recommendation_id_recommendation_id_fk",
+          "tableFrom": "recommendation_materials",
+          "tableTo": "recommendation",
+          "columnsFrom": [
+            "recommendation_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "recommendation_materials_material_id_material_id_fk": {
+          "name": "recommendation_materials_material_id_material_id_fk",
+          "tableFrom": "recommendation_materials",
+          "tableTo": "material",
+          "columnsFrom": [
+            "material_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.scenario": {
+      "name": "scenario",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "budget": {
+          "name": "budget",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "housing_type": {
+          "name": "housing_type",
+          "type": "housing_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "goal": {
+          "name": "goal",
+          "type": "goal",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "goal_value": {
+          "name": "goal_value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ashp_cop": {
+          "name": "ashp_cop",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 2.8
+        },
+        "trigger_file_path": {
+          "name": "trigger_file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "already_installed_file_path": {
+          "name": "already_installed_file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "patches_file_path": {
+          "name": "patches_file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "non_invasive_recommendations_file_path": {
+          "name": "non_invasive_recommendations_file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "exclusions": {
+          "name": "exclusions",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "multi_plan": {
+          "name": "multi_plan",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "cost": {
+          "name": "cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "contingency": {
+          "name": "contingency",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "funding": {
+          "name": "funding",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_work_hours": {
+          "name": "total_work_hours",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_savings": {
+          "name": "energy_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_equivalent_savings": {
+          "name": "co2_equivalent_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_cost_savings": {
+          "name": "energy_cost_savings",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "property_valuation_increase": {
+          "name": "property_valuation_increase",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "labour_days": {
+          "name": "labour_days",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_breakdown_pre_retrofit": {
+          "name": "epc_breakdown_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "epc_breakdown_post_retrofit": {
+          "name": "epc_breakdown_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number_of_properties": {
+          "name": "number_of_properties",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "n_units_to_retrofit": {
+          "name": "n_units_to_retrofit",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_per_unit_pre_retrofit": {
+          "name": "co2_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "co2_per_unit_post_retrofit": {
+          "name": "co2_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_per_unit_pre_retrofit": {
+          "name": "energy_bill_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_bill_per_unit_post_retrofit": {
+          "name": "energy_bill_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_per_unit_pre_retrofit": {
+          "name": "energy_consumption_per_unit_pre_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "energy_consumption_per_unit_post_retrofit": {
+          "name": "energy_consumption_per_unit_post_retrofit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_improvement_per_unit": {
+          "name": "valuation_improvement_per_unit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_unit": {
+          "name": "cost_per_unit",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_co2_saved": {
+          "name": "cost_per_co2_saved",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost_per_sap_point": {
+          "name": "cost_per_sap_point",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "valuation_return_on_investment": {
+          "name": "valuation_return_on_investment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "scenario_portfolio_id_portfolio_id_fk": {
+          "name": "scenario_portfolio_id_portfolio_id_fk",
+          "tableFrom": "scenario",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.property_removal_requests": {
+      "name": "property_removal_requests",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "hubspot_deal_id": {
+          "name": "hubspot_deal_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "reason": {
+          "name": "reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'removal'"
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "requested_by": {
+          "name": "requested_by",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "requested_at": {
+          "name": "requested_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "reviewed_by": {
+          "name": "reviewed_by",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "reviewed_at": {
+          "name": "reviewed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "original_batch": {
+          "name": "original_batch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "idx_removal_requests_deal_id": {
+          "name": "idx_removal_requests_deal_id",
+          "columns": [
+            {
+              "expression": "hubspot_deal_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_removal_requests_portfolio_id": {
+          "name": "idx_removal_requests_portfolio_id",
+          "columns": [
+            {
+              "expression": "portfolio_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "property_removal_requests_portfolio_id_portfolio_id_fk": {
+          "name": "property_removal_requests_portfolio_id_portfolio_id_fk",
+          "tableFrom": "property_removal_requests",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "property_removal_requests_requested_by_user_id_fk": {
+          "name": "property_removal_requests_requested_by_user_id_fk",
+          "tableFrom": "property_removal_requests",
+          "tableTo": "user",
+          "columnsFrom": [
+            "requested_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "property_removal_requests_reviewed_by_user_id_fk": {
+          "name": "property_removal_requests_reviewed_by_user_id_fk",
+          "tableFrom": "property_removal_requests",
+          "tableTo": "user",
+          "columnsFrom": [
+            "reviewed_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.solar": {
+      "name": "solar",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "longitude": {
+          "name": "longitude",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "latitude": {
+          "name": "latitude",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "google_api_response": {
+          "name": "google_api_response",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.solar_scenario": {
+      "name": "solar_scenario",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "solar_id": {
+          "name": "solar_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "scenario_type": {
+          "name": "scenario_type",
+          "type": "scenario_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "number_panels": {
+          "name": "number_panels",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "array_kwhp": {
+          "name": "array_kwhp",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lifetime_dc_kwh": {
+          "name": "lifetime_dc_kwh",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "yearly_dc_kwh": {
+          "name": "yearly_dc_kwh",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "lifetime_ac_kwh": {
+          "name": "lifetime_ac_kwh",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "yearly_ac_kwh": {
+          "name": "yearly_ac_kwh",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cost": {
+          "name": "cost",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expected_payback_years": {
+          "name": "expected_payback_years",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "panelled_roof_area": {
+          "name": "panelled_roof_area",
+          "type": "real",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_default": {
+          "name": "is_default",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "solar_scenario_solar_id_solar_id_fk": {
+          "name": "solar_scenario_solar_id_solar_id_fk",
+          "tableFrom": "solar_scenario",
+          "tableTo": "solar",
+          "columnsFrom": [
+            "solar_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.sub_task": {
+      "name": "sub_task",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "job_started": {
+          "name": "job_started",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_completed": {
+          "name": "job_completed",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'In Progress'"
+        },
+        "inputs": {
+          "name": "inputs",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "outputs": {
+          "name": "outputs",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cloud_logs_url": {
+          "name": "cloud_logs_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "sub_task_task_id_tasks_id_fk": {
+          "name": "sub_task_task_id_tasks_id_fk",
+          "tableFrom": "sub_task",
+          "tableTo": "tasks",
+          "columnsFrom": [
+            "task_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.tasks": {
+      "name": "tasks",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "task_source": {
+          "name": "task_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "job_started": {
+          "name": "job_started",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_completed": {
+          "name": "job_completed",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'In Progress'"
+        },
+        "service": {
+          "name": "service",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source": {
+          "name": "source",
+          "type": "source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "source_id": {
+          "name": "source_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.team": {
+      "name": "team",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "org_id": {
+          "name": "org_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "team_org_id_organisation_id_fk": {
+          "name": "team_org_id_organisation_id_fk",
+          "tableFrom": "team",
+          "tableTo": "organisation",
+          "columnsFrom": [
+            "org_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.team_members": {
+      "name": "team_members",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "team_id": {
+          "name": "team_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "team_members_user_id_user_id_fk": {
+          "name": "team_members_user_id_user_id_fk",
+          "tableFrom": "team_members",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "team_members_team_id_team_id_fk": {
+          "name": "team_members_team_id_team_id_fk",
+          "tableFrom": "team_members",
+          "tableTo": "team",
+          "columnsFrom": [
+            "team_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.team_portfolio_permissions": {
+      "name": "team_portfolio_permissions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "team_id": {
+          "name": "team_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "portfolio_id": {
+          "name": "portfolio_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "role",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "team_portfolio_permissions_team_id_team_id_fk": {
+          "name": "team_portfolio_permissions_team_id_team_id_fk",
+          "tableFrom": "team_portfolio_permissions",
+          "tableTo": "team",
+          "columnsFrom": [
+            "team_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "team_portfolio_permissions_portfolio_id_portfolio_id_fk": {
+          "name": "team_portfolio_permissions_portfolio_id_portfolio_id_fk",
+          "tableFrom": "team_portfolio_permissions",
+          "tableTo": "portfolio",
+          "columnsFrom": [
+            "portfolio_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.uploaded_files": {
+      "name": "uploaded_files",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "s3_file_bucket": {
+          "name": "s3_file_bucket",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "s3_file_key": {
+          "name": "s3_file_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "s3_upload_timestamp": {
+          "name": "s3_upload_timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "landlord_property_id": {
+          "name": "landlord_property_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uprn": {
+          "name": "uprn",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hubspot_deal_id": {
+          "name": "hubspot_deal_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hubspot_listing_id": {
+          "name": "hubspot_listing_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "file_type": {
+          "name": "file_type",
+          "type": "file_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "file_source": {
+          "name": "file_source",
+          "type": "file_source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "measure_name": {
+          "name": "measure_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_by": {
+          "name": "uploaded_by",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "uploaded_files_uploaded_by_user_id_fk": {
+          "name": "uploaded_files_uploaded_by_user_id_fk",
+          "tableFrom": "uploaded_files",
+          "tableTo": "user",
+          "columnsFrom": [
+            "uploaded_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.account": {
+      "name": "account",
+      "schema": "",
+      "columns": {
+        "userId": {
+          "name": "userId",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "providerAccountId": {
+          "name": "providerAccountId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_type": {
+          "name": "token_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "session_state": {
+          "name": "session_state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "account_userId_user_id_fk": {
+          "name": "account_userId_user_id_fk",
+          "tableFrom": "account",
+          "tableTo": "user",
+          "columnsFrom": [
+            "userId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "account_provider_providerAccountId_pk": {
+          "name": "account_provider_providerAccountId_pk",
+          "columns": [
+            "provider",
+            "providerAccountId"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.session": {
+      "name": "session",
+      "schema": "",
+      "columns": {
+        "sessionToken": {
+          "name": "sessionToken",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "userId": {
+          "name": "userId",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_userId_user_id_fk": {
+          "name": "session_userId_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": [
+            "userId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "firstName": {
+          "name": "firstName",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "emailVerified": {
+          "name": "emailVerified",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "oauth_id": {
+          "name": "oauth_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "oauth_provider": {
+          "name": "oauth_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "onboarded": {
+          "name": "onboarded",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "last_login": {
+          "name": "last_login",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "email"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_profiles": {
+      "name": "user_profiles",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_type": {
+          "name": "user_type",
+          "type": "user_profiles_user_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "property_count": {
+          "name": "property_count",
+          "type": "user_profiles_property_count",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "goals": {
+          "name": "goals",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "referral_source": {
+          "name": "referral_source",
+          "type": "user_profiles_referral_source",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "nrla_membership_id": {
+          "name": "nrla_membership_id",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "accepted_privacy": {
+          "name": "accepted_privacy",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "accepted_privacy_at": {
+          "name": "accepted_privacy_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "marketing_opt_in": {
+          "name": "marketing_opt_in",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false,
+          "default": false
+        },
+        "marketing_opt_in_at": {
+          "name": "marketing_opt_in_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "first_name": {
+          "name": "first_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_name": {
+          "name": "last_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp (6) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_profiles_user_id_user_id_fk": {
+          "name": "user_profiles_user_id_user_id_fk",
+          "tableFrom": "user_profiles",
+          "tableTo": "user",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.verificationToken": {
+      "name": "verificationToken",
+      "schema": "",
+      "columns": {
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "verificationToken_identifier_token_pk": {
+          "name": "verificationToken_identifier_token_pk",
+          "columns": [
+            "identifier",
+            "token"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.whlg": {
+      "name": "whlg",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "bigserial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "postcode": {
+          "name": "postcode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {
+    "public.aspect_type": {
+      "name": "aspect_type",
+      "schema": "public",
+      "values": [
+        "material",
+        "condition",
+        "type",
+        "area",
+        "configuration",
+        "presence",
+        "risk",
+        "severity",
+        "location",
+        "finish",
+        "insulation",
+        "pointing",
+        "spalling",
+        "lintels",
+        "cladding",
+        "category",
+        "quantity",
+        "adequacy",
+        "rating",
+        "strategy",
+        "extent",
+        "distribution",
+        "structure",
+        "covering",
+        "fire_rating",
+        "external_decoration",
+        "work_required",
+        "age_band",
+        "construction_type",
+        "classification",
+        "system"
+      ]
+    },
+    "public.element_type": {
+      "name": "element_type",
+      "schema": "public",
+      "values": [
+        "property",
+        "property_construction_type",
+        "property_classification",
+        "property_age_band",
+        "storey_count",
+        "floor_level",
+        "floor_level_front_door",
+        "accessible_housing_register",
+        "asbestos",
+        "quality_standard",
+        "ccu",
+        "passenger_lift",
+        "stairlift",
+        "disabled_hoist_tracking",
+        "disabled_facilities",
+        "steps_to_front_door",
+        "roof",
+        "pitched_roof_covering",
+        "flat_roof_covering",
+        "rainwater_goods",
+        "loft_insulation",
+        "porch_canopy",
+        "chimney",
+        "fascia",
+        "soffit",
+        "fascia_soffit_bargeboards",
+        "gutters",
+        "store_roof",
+        "garage_roof",
+        "garage_and_store_roof",
+        "external_wall",
+        "external_noise_insulation",
+        "primary_wall",
+        "secondary_wall",
+        "downpipes",
+        "external_decoration",
+        "cladding",
+        "spandrel_panels",
+        "garage_walls",
+        "party_wall_fire_break",
+        "external_brickwork_pointing",
+        "internal_downpipes_external_area",
+        "external_windows",
+        "communal_windows",
+        "secondary_glazing",
+        "store_windows",
+        "garage_windows",
+        "garage_and_store_windows",
+        "external_door",
+        "front_door",
+        "rear_door",
+        "store_door",
+        "garage_door",
+        "garage_and_store_door",
+        "communal_entrance_door",
+        "main_door",
+        "block_entrance_door",
+        "lintel",
+        "patio_french_door",
+        "door_entry_handset",
+        "paths_and_hardstandings",
+        "parking_areas",
+        "boundary_walls",
+        "front_fencing",
+        "rear_fencing",
+        "side_fencing",
+        "rear_gate",
+        "front_gate",
+        "gates",
+        "retaining_walls",
+        "private_balcony",
+        "balcony_balustrade",
+        "outbuildings",
+        "garage_structure",
+        "paving",
+        "roads",
+        "soil_and_vent",
+        "solar_thermals",
+        "drop_kerb",
+        "outbuilding_overhaul",
+        "external_structural_defects",
+        "access_ramp",
+        "kitchen",
+        "kitchen_space_layout",
+        "tenant_installed_kitchen",
+        "kitchen_extractor_fan",
+        "bathroom",
+        "secondary_bathroom",
+        "secondary_toilet",
+        "bathroom_extractor_fan",
+        "additional_wc_or_whb",
+        "bathroom_remaining_life_source",
+        "kitchen_remaining_life_source",
+        "central_heating",
+        "heating_boiler",
+        "heating_distribution",
+        "secondary_heating",
+        "hot_water_system",
+        "cold_water_storage",
+        "heating_system",
+        "boiler_fuel",
+        "water_heating",
+        "programmable_heating",
+        "community_heating",
+        "gas_available",
+        "heat_recovery_units",
+        "heating_improvements",
+        "electrical_wiring",
+        "consumer_unit",
+        "smoke_detection",
+        "heat_detection",
+        "carbon_monoxide_detection",
+        "fire_door_rating",
+        "fire_risk_assessment",
+        "internal_wiring",
+        "electrics",
+        "communal_heating",
+        "communal_boiler",
+        "communal_electrics",
+        "communal_fire_alarm",
+        "communal_emergency_lighting",
+        "communal_door_entry",
+        "communal_cctv",
+        "communal_bin_store",
+        "communal_bin_store_doors",
+        "communal_bin_store_walls",
+        "communal_bin_store_roof",
+        "communal_refuse_chute",
+        "communal_floor_covering",
+        "communal_kitchen",
+        "communal_bathroom",
+        "communal_toilets",
+        "communal_gates",
+        "communal_lift",
+        "communal_passenger_lift",
+        "communal_balcony_walkway",
+        "communal_entrance",
+        "communal_internal_decorations",
+        "communal_internal_floor",
+        "communal_walkways",
+        "communal_external_doors",
+        "communal_stairs",
+        "communal_aerial",
+        "communal_aov",
+        "communal_internal_doors",
+        "communal_lateral_mains",
+        "communal_lighting",
+        "communal_lighting_conductor",
+        "communal_store_roof",
+        "communal_store_walls",
+        "communal_store_doors",
+        "communal_warden_call_system",
+        "communal_bms",
+        "communal_booster_pump",
+        "communal_dry_riser",
+        "communal_wet_riser",
+        "communal_cold_water_storage",
+        "communal_sprinkler",
+        "communal_plug_sockets",
+        "communal_circulation_space",
+        "ffhh_damp",
+        "ffhh_hold_and_cold_water",
+        "ffhh_drainage_lavatories",
+        "ffhh_neglected",
+        "ffhh_natural_light",
+        "ffhh_ventilation",
+        "ffhh_food_prep_and_washup",
+        "ffhh_unsafe_layout",
+        "ffhh_unstable_building",
+        "hhsrs_damp_and_mould",
+        "hhsrs_excess_cold",
+        "hhsrs_excess_heat",
+        "hhsrs_asbestos_and_mmf",
+        "hhsrs_biocides",
+        "hhsrs_carbon_monoxide",
+        "hhsrs_lead",
+        "hhsrs_radiation",
+        "hhsrs_uncombusted_fuel_gas",
+        "hhsrs_volatile_organic_compounds",
+        "hhsrs_crowding_and_space",
+        "hhsrs_entry_by_intruders",
+        "hhsrs_lighting",
+        "hhsrs_noise",
+        "hhsrs_domestic_hygiene_pests_refuse",
+        "hhsrs_food_safety",
+        "hhsrs_personal_hygiene_sanitation",
+        "hhsrs_water_supply",
+        "hhsrs_falls_associated_with_baths",
+        "hhsrs_falls_on_level_surfaces",
+        "hhsrs_falls_on_stairs",
+        "hhsrs_falls_between_levels",
+        "hhsrs_electrical_hazards",
+        "hhsrs_fire",
+        "hhsrs_flames_hot_surfaces",
+        "hhsrs_collision_and_entrapment",
+        "hhsrs_collision_hazards_low_headroom",
+        "hhsrs_explosions",
+        "hhsrs_ergonomics",
+        "hhsrs_structural_collapse",
+        "hhsrs_amenities"
+      ]
+    },
+    "public.document_type": {
+      "name": "document_type",
+      "schema": "public",
+      "values": [
+        "EPR",
+        "Condition Report",
+        "Evidence Report",
+        "Summary Information",
+        "Floor Plan",
+        "Scenario Draft EPC",
+        "Scenario Site Notes"
+      ]
+    },
+    "public.scheme": {
+      "name": "scheme",
+      "schema": "public",
+      "values": [
+        "eco4",
+        "gbis",
+        "whlg",
+        "none"
+      ]
+    },
+    "public.inspection_archetype_2": {
+      "name": "inspection_archetype_2",
+      "schema": "public",
+      "values": [
+        "detached",
+        "mid-terrace",
+        "enclosed mid-terrace",
+        "end-terrace",
+        "enclosed end-terrace",
+        "semi-detached"
+      ]
+    },
+    "public.inspection_archetype": {
+      "name": "inspection_archetype",
+      "schema": "public",
+      "values": [
+        "Bungalow",
+        "Flat",
+        "Maisonette",
+        "House",
+        "non-domestic"
+      ]
+    },
+    "public.inspection_borescoped": {
+      "name": "inspection_borescoped",
+      "schema": "public",
+      "values": [
+        "yes",
+        "no",
+        "refused"
+      ]
+    },
+    "public.inspections_access_issues": {
+      "name": "inspections_access_issues",
+      "schema": "public",
+      "values": [
+        "see notes",
+        "damp issues",
+        "foliage on walls",
+        "bushes against wall",
+        "trees around/anove property",
+        "high rise block flats/maisonettes",
+        "conservatory",
+        "lean-to",
+        "garage",
+        "extension",
+        "decking",
+        "shed against wall"
+      ]
+    },
+    "public.inspections_cladding": {
+      "name": "inspections_cladding",
+      "schema": "public",
+      "values": [
+        "none",
+        "cladded with “sufficient space to fill the wall”",
+        "cladded with “insufficient space to fill the wall”"
+      ]
+    },
+    "public.inspections_insulation_material": {
+      "name": "inspections_insulation_material",
+      "schema": "public",
+      "values": [
+        "empty 50-90",
+        "empty 100+",
+        "empty 30-40",
+        "empty less than 30",
+        "loose fibre/wool",
+        "eps/celo/king",
+        "fibre batts - with cavity",
+        "fibre batts - no cavity",
+        "loose bead",
+        "glued bead",
+        "formaldehyde",
+        "bubble wrap",
+        "poly chunks"
+      ]
+    },
+    "public.inspections_rendered": {
+      "name": "inspections_rendered",
+      "schema": "public",
+      "values": [
+        "no render",
+        "rendered with “insufficient” space between dpc and render",
+        "rendered with “sufficient” space between dpc and render"
+      ]
+    },
+    "public.inspections_roof_orientation": {
+      "name": "inspections_roof_orientation",
+      "schema": "public",
+      "values": [
+        "north",
+        "east",
+        "south",
+        "west",
+        "north-east",
+        "north-west",
+        "south-east",
+        "south-west",
+        "n/s split",
+        "e/w split",
+        "ne/sw split",
+        "nw/se split",
+        "flat roof",
+        "no roof",
+        "roof too small",
+        "already has solar pv"
+      ]
+    },
+    "public.inspections_tile_hung": {
+      "name": "inspections_tile_hung",
+      "schema": "public",
+      "values": [
+        "yes",
+        "no",
+        "first floor flats are tile hung"
+      ]
+    },
+    "public.inspections_wall_construction": {
+      "name": "inspections_wall_construction",
+      "schema": "public",
+      "values": [
+        "cavity",
+        "solid",
+        "system built",
+        "timber framed",
+        "steel framed",
+        "re-walled cavity",
+        "mansard pre-fab",
+        "mansard ewi",
+        "mansard re-walled"
+      ]
+    },
+    "public.inspections_wall_insulation": {
+      "name": "inspections_wall_insulation",
+      "schema": "public",
+      "values": [
+        "empty cavity",
+        "filled at build",
+        "partial",
+        "retro drilled",
+        "ewi",
+        "iwi",
+        "solid non-cavity",
+        "system built",
+        "timber framed",
+        "steel framed"
+      ]
+    },
+    "public.cost_unit": {
+      "name": "cost_unit",
+      "schema": "public",
+      "values": [
+        "gbp_sq_meter",
+        "gbp_per_unit",
+        "gbp_per_m2",
+        "gbp_per_m"
+      ]
+    },
+    "public.depth_unit": {
+      "name": "depth_unit",
+      "schema": "public",
+      "values": [
+        "mm"
+      ]
+    },
+    "public.type": {
+      "name": "type",
+      "schema": "public",
+      "values": [
+        "suspended_floor_insulation",
+        "solid_floor_insulation",
+        "external_wall_insulation",
+        "internal_wall_insulation",
+        "cavity_wall_insulation",
+        "mechanical_ventilation",
+        "loft_insulation",
+        "exposed_floor_insulation",
+        "flat_roof_insulation",
+        "room_roof_insulation",
+        "cavity_wall_extraction",
+        "iwi_wall_demolition",
+        "iwi_vapour_barrier",
+        "iwi_redecoration",
+        "suspended_floor_demolition",
+        "suspended_floor_redecoration",
+        "suspended_floor_vapour_barrier",
+        "solid_floor_demolition",
+        "solid_floor_preparation",
+        "solid_floor_vapour_barrier",
+        "solid_floor_redecoration",
+        "ewi_wall_demolition",
+        "ewi_wall_preparation",
+        "ewi_wall_redecoration",
+        "low_energy_lighting_installation",
+        "flat_roof_preparation",
+        "flat_roof_vapour_barrier",
+        "flat_roof_waterproofing",
+        "windows_glazing",
+        "secondary_glazing",
+        "double_glazing",
+        "trickle_vent",
+        "door_undercut",
+        "solar_pv",
+        "solar_battery",
+        "scaffolding",
+        "high_heat_retention_storage_heaters",
+        "air_source_heat_pump",
+        "boiler_upgrade",
+        "roomstat_programmer_trvs",
+        "time_temperature_zone_control",
+        "sealing_fireplace"
+      ]
+    },
+    "public.r_value_unit": {
+      "name": "r_value_unit",
+      "schema": "public",
+      "values": [
+        "square_meter_kelvin_per_watt"
+      ]
+    },
+    "public.size_unit": {
+      "name": "size_unit",
+      "schema": "public",
+      "values": [
+        "kWp",
+        "kW",
+        "watt",
+        "storey"
+      ]
+    },
+    "public.thermal_conductivity_unit": {
+      "name": "thermal_conductivity_unit",
+      "schema": "public",
+      "values": [
+        "watt_per_meter_kelvin"
+      ]
+    },
+    "public.goal": {
+      "name": "goal",
+      "schema": "public",
+      "values": [
+        "Valuation Improvement",
+        "Increasing EPC",
+        "Reducing CO2 emissions",
+        "Energy Savings",
+        "None"
+      ]
+    },
+    "public.portfolio_capability": {
+      "name": "portfolio_capability",
+      "schema": "public",
+      "values": [
+        "approver",
+        "contractor"
+      ]
+    },
+    "public.role": {
+      "name": "role",
+      "schema": "public",
+      "values": [
+        "creator",
+        "admin",
+        "read",
+        "write"
+      ]
+    },
+    "public.status": {
+      "name": "status",
+      "schema": "public",
+      "values": [
+        "scoping",
+        "survey",
+        "assessment",
+        "tendering",
+        "project underway",
+        "completion; status: on track",
+        "completion; status: delayed",
+        "completion; status: at risk",
+        "completion; status: completed",
+        "needs review"
+      ]
+    },
+    "public.energy_element_type": {
+      "name": "energy_element_type",
+      "schema": "public",
+      "values": [
+        "roof",
+        "wall",
+        "floor",
+        "main_heating",
+        "window",
+        "lighting",
+        "hot_water",
+        "secondary_heating",
+        "main_heating_controls"
+      ]
+    },
+    "public.epc": {
+      "name": "epc",
+      "schema": "public",
+      "values": [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G"
+      ]
+    },
+    "public.creation_status": {
+      "name": "creation_status",
+      "schema": "public",
+      "values": [
+        "LOADING",
+        "READY",
+        "ERROR"
+      ]
+    },
+    "public.housing_type": {
+      "name": "housing_type",
+      "schema": "public",
+      "values": [
+        "Private",
+        "Social"
+      ]
+    },
+    "public.measure_type": {
+      "name": "measure_type",
+      "schema": "public",
+      "values": [
+        "air_source_heat_pump",
+        "boiler_upgrade",
+        "high_heat_retention_storage_heaters",
+        "secondary_heating",
+        "roomstat_programmer_trvs",
+        "time_temperature_zone_control",
+        "cylinder_thermostat",
+        "cavity_wall_insulation",
+        "extension_cavity_wall_insulation",
+        "external_wall_insulation",
+        "internal_wall_insulation",
+        "loft_insulation",
+        "flat_roof_insulation",
+        "room_roof_insulation",
+        "solid_floor_insulation",
+        "suspended_floor_insulation",
+        "double_glazing",
+        "secondary_glazing",
+        "draught_proofing",
+        "mechanical_ventilation",
+        "low_energy_lighting",
+        "solar_pv",
+        "hot_water_tank_insulation",
+        "sealing_open_fireplace"
+      ]
+    },
+    "public.plan_type": {
+      "name": "plan_type",
+      "schema": "public",
+      "values": [
+        "solar_eco4",
+        "solar_hhrsh_eco4",
+        "empty_cavity_eco",
+        "partial_cavity_eco",
+        "extraction_eco"
+      ]
+    },
+    "public.unit_quantity": {
+      "name": "unit_quantity",
+      "schema": "public",
+      "values": [
+        "m2",
+        "part",
+        "kwp"
+      ]
+    },
+    "public.scenario_type": {
+      "name": "scenario_type",
+      "schema": "public",
+      "values": [
+        "unit",
+        "building"
+      ]
+    },
+    "public.source": {
+      "name": "source",
+      "schema": "public",
+      "values": [
+        "portfolio_id"
+      ]
+    },
+    "public.file_source": {
+      "name": "file_source",
+      "schema": "public",
+      "values": [
+        "pas hub",
+        "sharepoint",
+        "hubspot",
+        "ecmk",
+        "contractor"
+      ]
+    },
+    "public.file_type": {
+      "name": "file_type",
+      "schema": "public",
+      "values": [
+        "photo_pack",
+        "site_note",
+        "rd_sap_site_note",
+        "pas_2023_ventilation",
+        "pas_2023_condition",
+        "pas_significance",
+        "par_photo_pack",
+        "pas_2023_property",
+        "pas_2023_occupancy",
+        "ecmk_site_note",
+        "ecmk_rd_sap_site_note",
+        "ecmk_survey_xml",
+        "pre_photo",
+        "mid_photo",
+        "post_photo",
+        "loft_hatch_photo",
+        "dmev_photos",
+        "door_undercut_photos",
+        "trickle_vent_photos",
+        "pre_installation_building_inspection",
+        "point_of_work_risk_assessment",
+        "claim_of_compliance",
+        "mcs_compliance_certificate",
+        "certificate_of_conformity",
+        "minor_works_electrical_certificate",
+        "trustmark_licence_numbers",
+        "operative_competency",
+        "ventilation_assessment_checklist",
+        "anemometer_readings",
+        "commissioning_records",
+        "part_f_ventilation_document",
+        "handover_pack",
+        "insurance_guarantee",
+        "workmanship_warranty",
+        "g98_notification",
+        "installer_qualifications",
+        "installer_feedback",
+        "contractor_other"
+      ]
+    },
+    "public.user_profiles_property_count": {
+      "name": "user_profiles_property_count",
+      "schema": "public",
+      "values": [
+        "1",
+        "2–5",
+        "6–20",
+        "21+",
+        "1–50",
+        "51–100",
+        "101–300",
+        "301–1000",
+        "1000+"
+      ]
+    },
+    "public.user_profiles_referral_source": {
+      "name": "user_profiles_referral_source",
+      "schema": "public",
+      "values": [
+        "search",
+        "social_media",
+        "NRLA",
+        "partner",
+        "word_of_mouth",
+        "other"
+      ]
+    },
+    "public.user_profiles_user_type": {
+      "name": "user_profiles_user_type",
+      "schema": "public",
+      "values": [
+        "private_landlord",
+        "private_tenant",
+        "social_landlord",
+        "social_tenant",
+        "homeowner",
+        "other"
+      ]
+    }
+  },
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/src/app/db/migrations/meta/_journal.json b/src/app/db/migrations/meta/_journal.json
index 6d18f5d..fe79b08 100644
--- a/src/app/db/migrations/meta/_journal.json
+++ b/src/app/db/migrations/meta/_journal.json
@@ -1352,6 +1352,13 @@
       "when": 1777576507360,
       "tag": "0192_colorful_quasimodo",
       "breakpoints": true
+    },
+    {
+      "idx": 193,
+      "version": "7",
+      "when": 1777750000000,
+      "tag": "0193_domna_survey_type",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/src/app/db/schema/crm/hubspot_deal_table.ts b/src/app/db/schema/crm/hubspot_deal_table.ts
index 607269f..7bdf64f 100644
--- a/src/app/db/schema/crm/hubspot_deal_table.ts
+++ b/src/app/db/schema/crm/hubspot_deal_table.ts
@@ -1,4 +1,4 @@
-import { pgTable, uuid, text, timestamp, boolean } from "drizzle-orm/pg-core";
+import { pgTable, uuid, text, timestamp } from "drizzle-orm/pg-core";
 import { InferModel } from "drizzle-orm";
 
 export const hubspotDealData = pgTable("hubspot_deal_data", {
@@ -66,7 +66,7 @@ export const hubspotDealData = pgTable("hubspot_deal_data", {
   propertyHaltedReason: text("property_halted_reason"),
   technicalApprovedMeasuresForInstall: text("technical_approved_measures_for_install"),
   sentToInstallerForPricing: timestamp("sent_to_installer_for_pricing", { precision: 6, withTimezone: true }),
-  domnaSurveyRequired: boolean("domna_survey_required"),
+  domnaSurveyType: text("domna_survey_type"),
   domnaSurveyDate: timestamp("domna_survey_date", { precision: 6, withTimezone: true }),
 
   createdAt: timestamp("created_at", { precision: 6, withTimezone: true })
diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx
index 5dbf7ca..d7c31bf 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx
@@ -84,10 +84,7 @@ function mapDbRowToHubspotDeal(row: DealRow): HubspotDeal {
     propertyHaltedDate: d.propertyHaltedDate,
     propertyHaltedReason: d.propertyHaltedReason,
     technicalApprovedMeasuresForInstall: d.technicalApprovedMeasuresForInstall,
-    // domna_survey_type column does not exist on the schema yet (slice 7) —
-    // surface null and let the drawer fall back to the legacy boolean.
-    domnaSurveyType: null,
-    domnaSurveyRequired: d.domnaSurveyRequired,
+    domnaSurveyType: d.domnaSurveyType,
     domnaSurveyDate: d.domnaSurveyDate,
     createdAt: d.createdAt,
     updatedAt: d.updatedAt,
diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/types.ts b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/types.ts
index 9b775af..c03caa9 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/types.ts
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/types.ts
@@ -61,10 +61,7 @@ export type HubspotDeal = {
   propertyHaltedDate: Date | null;
   propertyHaltedReason: string | null;
   technicalApprovedMeasuresForInstall: string | null;
-  // domnaSurveyType is the new text column added in slice 7. It may not yet
-  // exist in the schema; until then the legacy boolean is used as a fallback.
   domnaSurveyType: string | null;
-  domnaSurveyRequired: boolean | null;
   domnaSurveyDate: Date | null;
 
   createdAt: Date;

From 1336d90c8d344162928fb84c6dd633cae7a5f1fa Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 18:37:57 +0000
Subject: [PATCH 14/25] add domna survey fields to deal-properties registry

Plug `domna_survey_type` and `domna_survey_date` into
DEAL_PROPERTY_FIELDS, gated on the approver capability and reusing the
shared string-or-null + ISO date schemas. Drops the now-unused boolean
column types from the field registry. Vitest cases cover validation,
capability gating, HubSpot mapping, independent setting and clear-to-null.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 src/app/lib/dealPropertyUpdate.test.ts | 169 +++++++++++++++++++++++++
 src/app/lib/dealPropertyUpdate.ts      |  28 ++--
 2 files changed, 186 insertions(+), 11 deletions(-)

diff --git a/src/app/lib/dealPropertyUpdate.test.ts b/src/app/lib/dealPropertyUpdate.test.ts
index 0eb72bc..2f092b5 100644
--- a/src/app/lib/dealPropertyUpdate.test.ts
+++ b/src/app/lib/dealPropertyUpdate.test.ts
@@ -40,6 +40,27 @@ describe("DEAL_PROPERTY_FIELDS registry", () => {
     ).toBe(false);
   });
 
+  it("exposes the domna survey fields gated on the approver capability", () => {
+    expect(isDealPropertyField("domna_survey_type")).toBe(true);
+    expect(isDealPropertyField("domna_survey_date")).toBe(true);
+    // Plain roles never satisfy the approver gate on their own.
+    for (const role of ["read", "write", "admin", "creator"]) {
+      expect(roleAllowedForField("domna_survey_type", role)).toBe(false);
+      expect(roleAllowedForField("domna_survey_date", role)).toBe(false);
+    }
+    // Approver capability unlocks both.
+    expect(
+      roleAllowedForField("domna_survey_type", "read", ["approver"]),
+    ).toBe(true);
+    expect(
+      roleAllowedForField("domna_survey_date", "read", ["approver"]),
+    ).toBe(true);
+    // Other capabilities do not unlock the fields.
+    expect(
+      roleAllowedForField("domna_survey_type", "write", ["contractor"]),
+    ).toBe(false);
+  });
+
   it("maps each registered field to the matching HubSpot property", () => {
     expect(DEAL_PROPERTY_FIELDS.pibi_order_date.hubspotProperty).toBe(
       "pibi_order_date",
@@ -53,6 +74,12 @@ describe("DEAL_PROPERTY_FIELDS registry", () => {
     expect(DEAL_PROPERTY_FIELDS.property_halted_reason.hubspotProperty).toBe(
       "property_halted_reason",
     );
+    expect(DEAL_PROPERTY_FIELDS.domna_survey_type.hubspotProperty).toBe(
+      "domna_survey_type",
+    );
+    expect(DEAL_PROPERTY_FIELDS.domna_survey_date.hubspotProperty).toBe(
+      "domna_survey_date",
+    );
   });
 
   it("rejects unknown fields", () => {
@@ -288,6 +315,148 @@ describe("applyDealPropertyUpdate", () => {
     expect("property_halted_reason" in props).toBe(false);
   });
 
+  it("rejects domna fields when the caller lacks approver capability", async () => {
+    const updateDb = vi.fn();
+    const pushHubspot = vi.fn();
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-d1",
+      fields: {
+        domna_survey_type: "Standard",
+        domna_survey_date: "2025-07-15T00:00:00.000Z",
+      },
+      // Even creator role alone is not enough — capability is orthogonal.
+      role: "creator",
+      capabilities: [],
+      deps: { updateDb, pushHubspot },
+    });
+    expect(out.results.domna_survey_type).toEqual({
+      ok: false,
+      error: "Insufficient permissions",
+    });
+    expect(out.results.domna_survey_date).toEqual({
+      ok: false,
+      error: "Insufficient permissions",
+    });
+    expect(out.hubspotSync).toBe("skipped");
+    expect(updateDb).not.toHaveBeenCalled();
+    expect(pushHubspot).not.toHaveBeenCalled();
+  });
+
+  it("persists domna survey type + date for an approver and pushes them to HubSpot", async () => {
+    const updateDb = vi.fn().mockResolvedValue(undefined);
+    const pushHubspot = vi.fn().mockResolvedValue({ ok: true });
+    const surveyType = "Detailed";
+    const surveyIso = "2025-07-15T00:00:00.000Z";
+
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-d2",
+      fields: {
+        domna_survey_type: surveyType,
+        domna_survey_date: surveyIso,
+      },
+      role: "read",
+      capabilities: ["approver"],
+      deps: { updateDb, pushHubspot },
+    });
+
+    expect(out.results.domna_survey_type).toEqual({ ok: true });
+    expect(out.results.domna_survey_date).toEqual({ ok: true });
+    expect(out.hubspotSync).toBe("ok");
+
+    const dbValues = updateDb.mock.calls[0][1];
+    expect(dbValues.domnaSurveyType).toBe(surveyType);
+    expect(dbValues.domnaSurveyDate).toBeInstanceOf(Date);
+    expect((dbValues.domnaSurveyDate as Date).toISOString()).toBe(surveyIso);
+
+    const props = pushHubspot.mock.calls[0][0].properties;
+    expect(props.domna_survey_type).toBe(surveyType);
+    expect(props.domna_survey_date).toBe(
+      String(new Date(surveyIso).getTime()),
+    );
+  });
+
+  it("validates the domna survey date format", async () => {
+    const updateDb = vi.fn();
+    const pushHubspot = vi.fn();
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-d3",
+      fields: { domna_survey_date: "definitely-not-a-date" },
+      role: "read",
+      capabilities: ["approver"],
+      deps: { updateDb, pushHubspot },
+    });
+    expect(out.results.domna_survey_date.ok).toBe(false);
+    expect(updateDb).not.toHaveBeenCalled();
+    expect(pushHubspot).not.toHaveBeenCalled();
+  });
+
+  it("lets domna survey type and date be settable independently", async () => {
+    // Setting only the type — date column is untouched.
+    const updateDbType = vi.fn().mockResolvedValue(undefined);
+    const pushHubspotType = vi.fn().mockResolvedValue({ ok: true });
+    const outType = await applyDealPropertyUpdate({
+      dealId: "deal-d4",
+      fields: { domna_survey_type: "Standard" },
+      role: "read",
+      capabilities: ["approver"],
+      deps: { updateDb: updateDbType, pushHubspot: pushHubspotType },
+    });
+    expect(outType.results.domna_survey_type).toEqual({ ok: true });
+    expect(outType.results.domna_survey_date).toBeUndefined();
+    const typeOnlyDb = updateDbType.mock.calls[0][1];
+    expect(typeOnlyDb.domnaSurveyType).toBe("Standard");
+    expect("domnaSurveyDate" in typeOnlyDb).toBe(false);
+    const typeOnlyProps = pushHubspotType.mock.calls[0][0].properties;
+    expect(typeOnlyProps.domna_survey_type).toBe("Standard");
+    expect("domna_survey_date" in typeOnlyProps).toBe(false);
+
+    // Setting only the date — type column is untouched.
+    const updateDbDate = vi.fn().mockResolvedValue(undefined);
+    const pushHubspotDate = vi.fn().mockResolvedValue({ ok: true });
+    const surveyIso = "2025-08-20T00:00:00.000Z";
+    const outDate = await applyDealPropertyUpdate({
+      dealId: "deal-d4b",
+      fields: { domna_survey_date: surveyIso },
+      role: "read",
+      capabilities: ["approver"],
+      deps: { updateDb: updateDbDate, pushHubspot: pushHubspotDate },
+    });
+    expect(outDate.results.domna_survey_date).toEqual({ ok: true });
+    expect(outDate.results.domna_survey_type).toBeUndefined();
+    const dateOnlyDb = updateDbDate.mock.calls[0][1];
+    expect(dateOnlyDb.domnaSurveyDate).toBeInstanceOf(Date);
+    expect("domnaSurveyType" in dateOnlyDb).toBe(false);
+    const dateOnlyProps = pushHubspotDate.mock.calls[0][0].properties;
+    expect(dateOnlyProps.domna_survey_date).toBe(
+      String(new Date(surveyIso).getTime()),
+    );
+    expect("domna_survey_type" in dateOnlyProps).toBe(false);
+  });
+
+  it("clears both domna fields to null when explicitly cleared", async () => {
+    const updateDb = vi.fn().mockResolvedValue(undefined);
+    const pushHubspot = vi.fn().mockResolvedValue({ ok: true });
+    const out = await applyDealPropertyUpdate({
+      dealId: "deal-d5",
+      fields: {
+        // empty string collapses to null (mirrors the date schema)
+        domna_survey_type: "",
+        domna_survey_date: null,
+      },
+      role: "read",
+      capabilities: ["approver"],
+      deps: { updateDb, pushHubspot },
+    });
+    expect(out.results.domna_survey_type).toEqual({ ok: true });
+    expect(out.results.domna_survey_date).toEqual({ ok: true });
+    const dbValues = updateDb.mock.calls[0][1];
+    expect(dbValues.domnaSurveyType).toBeNull();
+    expect(dbValues.domnaSurveyDate).toBeNull();
+    const props = pushHubspot.mock.calls[0][0].properties;
+    expect(props.domna_survey_type).toBe("");
+    expect(props.domna_survey_date).toBe("");
+  });
+
   it("surfaces HubSpot push failures back to the caller", async () => {
     const updateDb = vi.fn().mockResolvedValue(undefined);
     const pushHubspot = vi
diff --git a/src/app/lib/dealPropertyUpdate.ts b/src/app/lib/dealPropertyUpdate.ts
index f674bda..5aaf122 100644
--- a/src/app/lib/dealPropertyUpdate.ts
+++ b/src/app/lib/dealPropertyUpdate.ts
@@ -76,15 +76,12 @@ const stringOrNullSchema = z
 
 type DateColumn = typeof hubspotDealData.pibiOrderDate;
 type TextColumn = typeof hubspotDealData.propertyHaltedReason;
-type BoolColumn = typeof hubspotDealData.domnaSurveyRequired;
 
 type ColumnFor<T> = T extends Date | null
   ? DateColumn
   : T extends string | null
     ? TextColumn
-    : T extends boolean | null
-      ? BoolColumn
-      : never;
+    : never;
 
 interface DealPropertyFieldDef<TParsed = unknown> {
   /** Schema used to parse the incoming JSON value. */
@@ -113,9 +110,6 @@ const dateToHubspot = (d: Date | null): string =>
 
 const stringToHubspot = (s: string | null): string => (s === null ? "" : s);
 
-const booleanToHubspot = (b: boolean | null): string =>
-  b === null ? "" : b ? "true" : "false";
-
 // -- Registry ----------------------------------------------------------------
 // Slice 5 ships PIBI dates only. Halted (#255) and Domna (#256) reuse the
 // same registry by adding entries here — no other code path needs to change.
@@ -150,12 +144,24 @@ export const DEAL_PROPERTY_FIELDS = {
     dbColumn: hubspotDealData.propertyHaltedReason,
     toHubspot: stringToHubspot,
   } satisfies DealPropertyFieldDef<string | null>,
-  // -- Slot for issue #256 (Domna survey type / date) ----------------------
-  // domna_survey_type / domna_survey_date will plug in here.
+  // -- Domna survey (issue #256) -------------------------------------------
+  // Approver capability gates these — write role alone is not sufficient.
+  domna_survey_type: {
+    schema: stringOrNullSchema,
+    allowedRoles: APPROVER_ROLES,
+    hubspotProperty: "domna_survey_type",
+    dbColumn: hubspotDealData.domnaSurveyType,
+    toHubspot: stringToHubspot,
+  } satisfies DealPropertyFieldDef<string | null>,
+  domna_survey_date: {
+    schema: isoDateSchema,
+    allowedRoles: APPROVER_ROLES,
+    hubspotProperty: "domna_survey_date",
+    dbColumn: hubspotDealData.domnaSurveyDate,
+    toHubspot: dateToHubspot,
+  } satisfies DealPropertyFieldDef<Date | null>,
 } as const;
 
-void booleanToHubspot;
-
 export type DealPropertyFieldKey = keyof typeof DEAL_PROPERTY_FIELDS;
 
 export function isDealPropertyField(

From a69dac1fcad8e5928183f9bfe40db9af75569a93 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 18:38:17 +0000
Subject: [PATCH 15/25] add editable domna survey section and cypress spec

Replaces the read-only Domna InfoRow block with a DomnaEditor that lets
approvers set a free-text survey type and a survey date with optimistic
update + error surfacing, mirroring the halted-state editor. Non-approvers
keep the read-only InfoRow view. Cypress spec covers the approver flow
end-to-end with a reload-persistence check.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 cypress/e2e/live-tracking/domna-survey.cy.js  | 100 +++++++++
 .../live/PropertyDetailDrawer.tsx             | 203 ++++++++++++++++--
 2 files changed, 288 insertions(+), 15 deletions(-)
 create mode 100644 cypress/e2e/live-tracking/domna-survey.cy.js

diff --git a/cypress/e2e/live-tracking/domna-survey.cy.js b/cypress/e2e/live-tracking/domna-survey.cy.js
new file mode 100644
index 0000000..cf5ec53
--- /dev/null
+++ b/cypress/e2e/live-tracking/domna-survey.cy.js
@@ -0,0 +1,100 @@
+/**
+ * Live Tracking — Domna Survey editor (issue #256)
+ *
+ * Verifies the approver flow on the Domna section of the property detail
+ * drawer:
+ *   1. an approver can set a Domna survey type (free text) and date and
+ *      save them,
+ *   2. the drawer reflects the saved values immediately (optimistic
+ *      update),
+ *   3. the values persist across a page reload (i.e. the deal-properties
+ *      endpoint wrote them server-side).
+ *
+ * Mirrors `halted-state.cy.js`. Assumes an authenticated approver session
+ * is reusable by the test harness; the target portfolio + a deal whose
+ * Domna section is editable by the current user are read from Cypress
+ * env vars so the spec stays portable.
+ */
+
+const PORTFOLIO_SLUG = Cypress.env("LIVE_PORTFOLIO_SLUG");
+const TARGET_DEAL_NAME = Cypress.env("LIVE_DOMNA_DEAL_NAME");
+
+const SURVEY_TYPE = "Standard";
+const SURVEY_DATE = "2025-07-15";
+
+describe("Domna survey editor — approver flow", function () {
+  before(function () {
+    if (!PORTFOLIO_SLUG) {
+      cy.log(
+        "LIVE_PORTFOLIO_SLUG env var not set — skipping live tracking specs",
+      );
+      this.skip();
+    }
+  });
+
+  function openDrawerForTargetDeal() {
+    cy.visit(`/portfolio/${PORTFOLIO_SLUG}/your-projects/live`);
+
+    // Switch to the Measures tab — the easiest way into the drawer.
+    cy.contains("button, [role=tab]", "Measures").click();
+
+    if (TARGET_DEAL_NAME) {
+      cy.contains("[data-testid=measures-row]", TARGET_DEAL_NAME).click();
+    } else {
+      cy.get("[data-testid=measures-row]").first().click();
+    }
+
+    cy.get("[data-testid=property-detail-drawer]").should("be.visible");
+    cy.get("[data-testid=drawer-section-domna]").should("exist");
+  }
+
+  it("lets an approver set domna survey type + date and persists them across reload", () => {
+    openDrawerForTargetDeal();
+
+    // Approver sees editable inputs.
+    cy.get("[data-testid=domna-survey-type-input]").should("be.visible");
+    cy.get("[data-testid=domna-survey-date-input]").should("be.visible");
+
+    cy.get("[data-testid=domna-survey-type-input]")
+      .clear()
+      .type(SURVEY_TYPE);
+    cy.get("[data-testid=domna-survey-date-input]")
+      .clear()
+      .type(SURVEY_DATE);
+
+    cy.get("[data-testid=domna-save-button]")
+      .should("not.be.disabled")
+      .click();
+
+    // Save completes — button label flips back, no error banner.
+    cy.get("[data-testid=domna-save-button]").should(
+      "contain.text",
+      "Save Domna Survey",
+    );
+    cy.get("[data-testid=domna-error]").should("not.exist");
+
+    // Optimistic update — the inputs already reflect the new values.
+    cy.get("[data-testid=domna-survey-type-input]").should(
+      "have.value",
+      SURVEY_TYPE,
+    );
+    cy.get("[data-testid=domna-survey-date-input]").should(
+      "have.value",
+      SURVEY_DATE,
+    );
+
+    // Reload the page and reopen the drawer — the persisted values must
+    // still be there.
+    cy.reload();
+    openDrawerForTargetDeal();
+
+    cy.get("[data-testid=domna-survey-type-input]").should(
+      "have.value",
+      SURVEY_TYPE,
+    );
+    cy.get("[data-testid=domna-survey-date-input]").should(
+      "have.value",
+      SURVEY_DATE,
+    );
+  });
+});
diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
index 43a3a0e..0d9bb7f 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
@@ -930,6 +930,186 @@ function HaltedEditor({
   );
 }
 
+// -----------------------------------------------------------------------
+// Domna section — editable for approvers (issue #256)
+// -----------------------------------------------------------------------
+interface DomnaEditorProps {
+  dealId: string;
+  portfolioId: string;
+  initialSurveyType: string | null;
+  initialSurveyDate: Date | string | null;
+  /** True when the user has the approver capability on this portfolio. */
+  canEdit: boolean;
+}
+
+function DomnaEditor({
+  dealId,
+  portfolioId,
+  initialSurveyType,
+  initialSurveyDate,
+  canEdit,
+}: DomnaEditorProps) {
+  const initialType = initialSurveyType ?? "";
+  const initialDate = useMemo(
+    () => toDateInputValue(initialSurveyDate),
+    [initialSurveyDate],
+  );
+
+  const [typeValue, setTypeValue] = useState(initialType);
+  const [dateValue, setDateValue] = useState(initialDate);
+  const [savedType, setSavedType] = useState(initialType);
+  const [savedDate, setSavedDate] = useState(initialDate);
+  const [submitting, setSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  // Reset state when the drawer switches deals.
+  useEffect(() => {
+    setTypeValue(initialType);
+    setSavedType(initialType);
+  }, [initialType]);
+  useEffect(() => {
+    setDateValue(initialDate);
+    setSavedDate(initialDate);
+  }, [initialDate]);
+
+  const dirty = typeValue !== savedType || dateValue !== savedDate;
+
+  async function handleSave() {
+    if (!dirty) return;
+    setSubmitting(true);
+    setError(null);
+    const fields: Record<string, string | null> = {};
+    if (typeValue !== savedType) {
+      fields.domna_survey_type = typeValue.trim() === "" ? null : typeValue;
+    }
+    if (dateValue !== savedDate) {
+      fields.domna_survey_date = dateInputToIso(dateValue);
+    }
+    // Optimistic update.
+    const prevType = savedType;
+    const prevDate = savedDate;
+    setSavedType(typeValue);
+    setSavedDate(dateValue);
+
+    try {
+      const res = await fetch(
+        `/api/portfolio/${portfolioId}/deal-properties`,
+        {
+          method: "PATCH",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ dealId, fields }),
+        },
+      );
+      if (!res.ok) {
+        setSavedType(prevType);
+        setSavedDate(prevDate);
+        setTypeValue(prevType);
+        setDateValue(prevDate);
+        const json = await res.json().catch(() => ({}));
+        setError(
+          typeof json.error === "string"
+            ? json.error
+            : "Failed to update Domna survey",
+        );
+        return;
+      }
+      const json = (await res.json()) as {
+        results: Record<string, { ok: boolean; error?: string }>;
+        hubspotSync: "ok" | "failed" | "skipped";
+        hubspotError?: string;
+      };
+      const fieldErrors = Object.entries(json.results ?? {})
+        .filter(([, r]) => !r.ok)
+        .map(([k, r]) => `${k}: ${r.error ?? "rejected"}`);
+      if (fieldErrors.length > 0) {
+        setError(fieldErrors.join("; "));
+      } else if (json.hubspotSync === "failed") {
+        setError(
+          json.hubspotError
+            ? `Saved locally — HubSpot sync failed: ${json.hubspotError}`
+            : "Saved locally — HubSpot sync failed",
+        );
+      }
+    } catch (err) {
+      setSavedType(prevType);
+      setSavedDate(prevDate);
+      setTypeValue(prevType);
+      setDateValue(prevDate);
+      setError(err instanceof Error ? err.message : "Failed to update Domna survey");
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  if (!canEdit) {
+    return (
+      <div className="divide-y divide-gray-50">
+        <InfoRow label="Domna Survey Type" value={initialSurveyType} />
+        <InfoRow
+          label="Domna Survey Date"
+          value={formatDate(initialSurveyDate)}
+        />
+      </div>
+    );
+  }
+
+  return (
+    <div className="space-y-3">
+      <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
+        <label className="flex flex-col gap-1">
+          <span className="text-xs text-gray-500 font-medium">
+            Domna Survey Type
+          </span>
+          <input
+            type="text"
+            data-testid="domna-survey-type-input"
+            value={typeValue}
+            onChange={(e) => setTypeValue(e.target.value)}
+            disabled={submitting}
+            placeholder="e.g. Standard, Detailed"
+            className="rounded-lg border border-gray-200 px-3 py-1.5 text-xs text-gray-800 placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-blue-200 focus:border-blue-300"
+          />
+        </label>
+        <label className="flex flex-col gap-1">
+          <span className="text-xs text-gray-500 font-medium">
+            Domna Survey Date
+          </span>
+          <input
+            type="date"
+            data-testid="domna-survey-date-input"
+            value={dateValue}
+            onChange={(e) => setDateValue(e.target.value)}
+            disabled={submitting}
+            className="rounded-lg border border-gray-200 px-3 py-1.5 text-xs text-gray-800 focus:outline-none focus:ring-2 focus:ring-blue-200 focus:border-blue-300"
+          />
+        </label>
+      </div>
+      <div className="flex items-center justify-between gap-3">
+        <p className="text-[11px] text-gray-400">
+          Free text — leave blank to clear. Changes sync to HubSpot.
+        </p>
+        <button
+          type="button"
+          data-testid="domna-save-button"
+          onClick={handleSave}
+          disabled={!dirty || submitting}
+          className="text-xs font-medium px-3 py-1.5 rounded-lg bg-brandblue text-white hover:bg-brandmidblue disabled:opacity-50 transition-colors"
+        >
+          {submitting ? "Saving…" : "Save Domna Survey"}
+        </button>
+      </div>
+      {error && (
+        <p
+          data-testid="domna-error"
+          className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg"
+        >
+          {error}
+        </p>
+      )}
+    </div>
+  );
+}
+
 // -----------------------------------------------------------------------
 // PropertyDetailDrawer — main component
 // -----------------------------------------------------------------------
@@ -1008,16 +1188,6 @@ export default function PropertyDetailDrawer({
     deal?.technicalApprovedMeasuresForInstall ?? null,
   );
 
-  // Domna section: prefer the new text column when present, otherwise fall
-  // back to the legacy boolean ("Required" / "Not required").
-  const domnaSurveyTypeDisplay: string | null = (() => {
-    if (!deal) return null;
-    if (deal.domnaSurveyType) return deal.domnaSurveyType;
-    if (deal.domnaSurveyRequired === true) return "Required";
-    if (deal.domnaSurveyRequired === false) return "Not required";
-    return null;
-  })();
-
   return (
     <Drawer open={open} onOpenChange={(v) => !v && onClose()} direction="right">
       <DrawerContent
@@ -1166,13 +1336,16 @@ export default function PropertyDetailDrawer({
                 </div>
               </div>
 
-              {/* Domna Survey section */}
+              {/* Domna Survey section — editable for approvers (issue #256) */}
               <div ref={(el) => { sectionRefs.current.domna = el; }}>
                 <SectionHeader id="domna" label={SECTION_TITLES.domna} />
-                <div className="divide-y divide-gray-50">
-                  <InfoRow label="Domna Survey Type" value={domnaSurveyTypeDisplay} />
-                  <InfoRow label="Domna Survey Date" value={formatDate(deal.domnaSurveyDate)} />
-                </div>
+                <DomnaEditor
+                  dealId={deal.dealId}
+                  portfolioId={portfolioId}
+                  initialSurveyType={deal.domnaSurveyType ?? null}
+                  initialSurveyDate={deal.domnaSurveyDate}
+                  canEdit={userCapability.includes("approver")}
+                />
               </div>
 
               {/* Halted section — editable for approvers (issue #255) */}

From 54e093891d36afd6f9980892b713f0b504432590 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 18:56:09 +0000
Subject: [PATCH 16/25] add user_defined_deal_measures table migration and
 schema

Track instructed and pibi-ordered measures locally with a source enum,
created-by user, and HubSpot sync timestamps so issue #253 can persist
approver instructions and slice 4 can reuse the table for PIBI selections.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../0194_user_defined_deal_measures.sql       | 16 +++++
 src/app/db/migrations/meta/_journal.json      |  7 ++
 .../db/schema/user_defined_deal_measures.ts   | 67 +++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 src/app/db/migrations/0194_user_defined_deal_measures.sql
 create mode 100644 src/app/db/schema/user_defined_deal_measures.ts

diff --git a/src/app/db/migrations/0194_user_defined_deal_measures.sql b/src/app/db/migrations/0194_user_defined_deal_measures.sql
new file mode 100644
index 0000000..1c11f2f
--- /dev/null
+++ b/src/app/db/migrations/0194_user_defined_deal_measures.sql
@@ -0,0 +1,16 @@
+CREATE TYPE "public"."user_defined_deal_measure_source" AS ENUM('instructed', 'pibi_ordered');--> statement-breakpoint
+CREATE TABLE "user_defined_deal_measures" (
+	"id" bigserial PRIMARY KEY NOT NULL,
+	"hubspot_deal_id" text NOT NULL,
+	"measure_name" text NOT NULL,
+	"source" "user_defined_deal_measure_source" NOT NULL,
+	"created_by_user_id" bigint NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"pushed_at" timestamp with time zone,
+	"confirmed_in_hubspot_at" timestamp with time zone,
+	"notes" text
+);
+--> statement-breakpoint
+ALTER TABLE "user_defined_deal_measures" ADD CONSTRAINT "user_defined_deal_measures_created_by_user_id_user_id_fk" FOREIGN KEY ("created_by_user_id") REFERENCES "public"."user"("id") ON DELETE no action ON UPDATE no action;--> statement-breakpoint
+CREATE INDEX "idx_user_defined_deal_measures_deal_id" ON "user_defined_deal_measures" USING btree ("hubspot_deal_id");--> statement-breakpoint
+CREATE INDEX "idx_user_defined_deal_measures_source" ON "user_defined_deal_measures" USING btree ("source");
diff --git a/src/app/db/migrations/meta/_journal.json b/src/app/db/migrations/meta/_journal.json
index fe79b08..eb188e6 100644
--- a/src/app/db/migrations/meta/_journal.json
+++ b/src/app/db/migrations/meta/_journal.json
@@ -1359,6 +1359,13 @@
       "when": 1777750000000,
       "tag": "0193_domna_survey_type",
       "breakpoints": true
+    },
+    {
+      "idx": 194,
+      "version": "7",
+      "when": 1778100000000,
+      "tag": "0194_user_defined_deal_measures",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/src/app/db/schema/user_defined_deal_measures.ts b/src/app/db/schema/user_defined_deal_measures.ts
new file mode 100644
index 0000000..0a059c0
--- /dev/null
+++ b/src/app/db/schema/user_defined_deal_measures.ts
@@ -0,0 +1,67 @@
+/**
+ * User-defined deal measures (issue #253)
+ *
+ * Tracks measures that an approver has *instructed* outside the coordinator's
+ * proposed set, plus measures that have been *PIBI-ordered* by the contractor
+ * (slice 4). The `source` enum distinguishes the two flows so a single table
+ * can back both.
+ *
+ * Each row pushes back to HubSpot under one of two new multi-value text deal
+ * properties (`instructed_measures` / `pibi_ordered_measures`). `pushed_at`
+ * is stamped after a successful sync; `confirmed_in_hubspot_at` is stamped
+ * by a follow-up reconcile job (out of scope for this slice).
+ */
+import {
+  bigserial,
+  text,
+  timestamp,
+  pgTable,
+  bigint,
+  index,
+  pgEnum,
+} from "drizzle-orm/pg-core";
+import { user } from "./users";
+import { InferModel } from "drizzle-orm";
+
+export const UserDefinedDealMeasureSource: [string, ...string[]] = [
+  "instructed",
+  "pibi_ordered",
+];
+export type UserDefinedDealMeasureSourceType =
+  | "instructed"
+  | "pibi_ordered";
+
+export const userDefinedDealMeasureSourceEnum = pgEnum(
+  "user_defined_deal_measure_source",
+  UserDefinedDealMeasureSource as [string, ...string[]],
+);
+
+export const userDefinedDealMeasures = pgTable(
+  "user_defined_deal_measures",
+  {
+    id: bigserial("id", { mode: "bigint" }).primaryKey(),
+    hubspotDealId: text("hubspot_deal_id").notNull(),
+    measureName: text("measure_name").notNull(),
+    source: userDefinedDealMeasureSourceEnum("source").notNull(),
+    createdByUserId: bigint("created_by_user_id", { mode: "bigint" })
+      .notNull()
+      .references(() => user.id),
+    createdAt: timestamp("created_at", { withTimezone: true })
+      .defaultNow()
+      .notNull(),
+    pushedAt: timestamp("pushed_at", { withTimezone: true }),
+    confirmedInHubspotAt: timestamp("confirmed_in_hubspot_at", {
+      withTimezone: true,
+    }),
+    notes: text("notes"),
+  },
+  (table) => [
+    index("idx_user_defined_deal_measures_deal_id").on(table.hubspotDealId),
+    index("idx_user_defined_deal_measures_source").on(table.source),
+  ],
+);
+
+export type UserDefinedDealMeasure = InferModel<
+  typeof userDefinedDealMeasures,
+  "select"
+>;

From 4181af6d15b500e42d0391c31e6d2a8ea65996dd Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 18:56:19 +0000
Subject: [PATCH 17/25] add syncMeasuresFieldToHubSpot helper

Generic push for multi-value HubSpot deal properties (semicolon-separated)
with the same ECONNRESET retry pattern as pushDealPropertiesToHubSpot.
Returns a discriminated ok result so callers can stamp pushed_at only on
success. Slice 4 (PIBI selections) will reuse the same helper.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 src/app/lib/hubspot/dealSync.test.ts | 124 +++++++++++++++++++++++++++
 src/app/lib/hubspot/dealSync.ts      |  55 ++++++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 src/app/lib/hubspot/dealSync.test.ts

diff --git a/src/app/lib/hubspot/dealSync.test.ts b/src/app/lib/hubspot/dealSync.test.ts
new file mode 100644
index 0000000..2ca92a0
--- /dev/null
+++ b/src/app/lib/hubspot/dealSync.test.ts
@@ -0,0 +1,124 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+// Mock the HubSpot client module before importing the helper. The helper
+// calls `getHubSpotClient()` lazily inside each retry attempt, so we
+// re-create the mock on every test to control behaviour per-test.
+const updateMock = vi.fn();
+vi.mock("./client", () => ({
+  getHubSpotClient: () => ({
+    crm: { deals: { basicApi: { update: updateMock } } },
+  }),
+}));
+
+import { syncMeasuresFieldToHubSpot } from "./dealSync";
+
+describe("syncMeasuresFieldToHubSpot", () => {
+  beforeEach(() => {
+    updateMock.mockReset();
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it("joins measure names with a semicolon and pushes to the named property", async () => {
+    updateMock.mockResolvedValueOnce(undefined);
+    const result = await syncMeasuresFieldToHubSpot({
+      hubspotDealId: "deal-1",
+      propName: "instructed_measures",
+      measureNames: ["ASHP", "Solar PV", "Loft insulation"],
+    });
+    expect(result).toEqual({ ok: true });
+    expect(updateMock).toHaveBeenCalledTimes(1);
+    expect(updateMock).toHaveBeenCalledWith("deal-1", {
+      properties: { instructed_measures: "ASHP;Solar PV;Loft insulation" },
+    });
+  });
+
+  it("sends an empty string when the list is empty (clear field)", async () => {
+    updateMock.mockResolvedValueOnce(undefined);
+    const result = await syncMeasuresFieldToHubSpot({
+      hubspotDealId: "deal-2",
+      propName: "instructed_measures",
+      measureNames: [],
+    });
+    expect(result).toEqual({ ok: true });
+    expect(updateMock).toHaveBeenCalledWith("deal-2", {
+      properties: { instructed_measures: "" },
+    });
+  });
+
+  it("retries up to 3 times on ECONNRESET and succeeds on the final attempt", async () => {
+    vi.useFakeTimers();
+    const reset1 = Object.assign(new Error("reset"), { code: "ECONNRESET" });
+    const reset2 = Object.assign(new Error("reset"), { code: "ECONNRESET" });
+    updateMock
+      .mockRejectedValueOnce(reset1)
+      .mockRejectedValueOnce(reset2)
+      .mockResolvedValueOnce(undefined);
+
+    const promise = syncMeasuresFieldToHubSpot({
+      hubspotDealId: "deal-3",
+      propName: "instructed_measures",
+      measureNames: ["EWI"],
+    });
+    // Advance timers past the two backoff windows (200ms then 400ms).
+    await vi.advanceTimersByTimeAsync(200);
+    await vi.advanceTimersByTimeAsync(400);
+    const result = await promise;
+    expect(result).toEqual({ ok: true });
+    expect(updateMock).toHaveBeenCalledTimes(3);
+  });
+
+  it("returns failure when ECONNRESET persists past the third attempt", async () => {
+    vi.useFakeTimers();
+    const reset = Object.assign(new Error("network reset"), {
+      code: "ECONNRESET",
+    });
+    updateMock
+      .mockRejectedValueOnce(reset)
+      .mockRejectedValueOnce(reset)
+      .mockRejectedValueOnce(reset);
+
+    const promise = syncMeasuresFieldToHubSpot({
+      hubspotDealId: "deal-4",
+      propName: "instructed_measures",
+      measureNames: ["IWI"],
+    });
+    await vi.advanceTimersByTimeAsync(200);
+    await vi.advanceTimersByTimeAsync(400);
+    const result = await promise;
+    expect(result.ok).toBe(false);
+    if (!result.ok) {
+      expect(result.error).toBe("network reset");
+    }
+    expect(updateMock).toHaveBeenCalledTimes(3);
+  });
+
+  it("does not retry for non-ECONNRESET errors", async () => {
+    const boom = new Error("HubSpot 400 — invalid property value");
+    updateMock.mockRejectedValueOnce(boom);
+    const result = await syncMeasuresFieldToHubSpot({
+      hubspotDealId: "deal-5",
+      propName: "instructed_measures",
+      measureNames: ["DMevs"],
+    });
+    expect(result).toEqual({
+      ok: false,
+      error: "HubSpot 400 — invalid property value",
+    });
+    expect(updateMock).toHaveBeenCalledTimes(1);
+  });
+
+  it("works for any property name (so PIBI slice 4 can reuse it)", async () => {
+    updateMock.mockResolvedValueOnce(undefined);
+    await syncMeasuresFieldToHubSpot({
+      hubspotDealId: "deal-6",
+      propName: "pibi_ordered_measures",
+      measureNames: ["ASHP", "EWI"],
+    });
+    expect(updateMock).toHaveBeenCalledWith("deal-6", {
+      properties: { pibi_ordered_measures: "ASHP;EWI" },
+    });
+  });
+});
diff --git a/src/app/lib/hubspot/dealSync.ts b/src/app/lib/hubspot/dealSync.ts
index 563c703..05662ad 100644
--- a/src/app/lib/hubspot/dealSync.ts
+++ b/src/app/lib/hubspot/dealSync.ts
@@ -130,6 +130,61 @@ export async function syncContractorDocUploadToHubSpot(params: {
   }
 }
 
+/**
+ * Generic helper for pushing a list of measure names to a multi-value
+ * HubSpot deal property (e.g. `instructed_measures`, `pibi_ordered_measures`).
+ *
+ * HubSpot's multi-select / multi-value text fields use `;` as the native
+ * delimiter — see how `proposed_measures` is parsed by `parseMeasures`.
+ *
+ * Mirrors the retry-on-`ECONNRESET` pattern in
+ * `pushDealPropertiesToHubSpot` and the other deal-sync helpers in this
+ * file. Returns a discriminated `{ ok }` so the caller can decide whether
+ * to stamp `pushed_at` on the local DB row.
+ *
+ * Issue #253 introduces this helper; slice 4 (PIBI selections) reuses it.
+ */
+export async function syncMeasuresFieldToHubSpot(params: {
+  hubspotDealId: string;
+  propName: string;
+  measureNames: ReadonlyArray<string>;
+}): Promise<{ ok: true } | { ok: false; error: string }> {
+  // HubSpot multi-value text properties expect a `;`-joined string.
+  // Empty list collapses to "" so the field can be cleared.
+  const value = params.measureNames.join(";");
+  const maxAttempts = 3;
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    try {
+      const client = getHubSpotClient();
+      await client.crm.deals.basicApi.update(params.hubspotDealId, {
+        properties: {
+          [params.propName]: value,
+        },
+      });
+      return { ok: true };
+    } catch (err) {
+      const isReset =
+        err instanceof Error &&
+        "code" in err &&
+        (err as NodeJS.ErrnoException).code === "ECONNRESET";
+      if (isReset && attempt < maxAttempts) {
+        await new Promise((resolve) => setTimeout(resolve, 200 * attempt));
+        continue;
+      }
+      const message =
+        err instanceof Error ? err.message : "HubSpot sync failed";
+      console.error("[HubSpot] syncMeasuresFieldToHubSpot failed", {
+        dealId: params.hubspotDealId,
+        propName: params.propName,
+        attempt,
+        error: err,
+      });
+      return { ok: false, error: message };
+    }
+  }
+  return { ok: false, error: "HubSpot sync failed" };
+}
+
 export async function syncMeasureApprovalsToHubSpot(params: {
   hubspotDealId: string;
   approvedMeasures: Array<{ measureName: string; approvedByEmail: string }>;

From 7de92cf5ea0b0683b49fc40fb8e8bc9ac0e32df4 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 18:56:48 +0000
Subject: [PATCH 18/25] add instruct-measure service, route and soft-warning
 helper

Approver-only flow that records an instructed measure in
user_defined_deal_measures, auto-creates a deal_measure_approvals row +
event in a single tx, then pushes the instructed list to HubSpot under
instructed_measures. When the deal has no proposed measures and no prior
approvals, also pushes the new measure as proposed_measures so the deal
has a coherent starting point. Soft-warning helper surfaces the
out-of-order case for the drawer (and later slices).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../instructed-measures/route.ts              | 146 +++++++++
 src/app/lib/instructMeasure.test.ts           | 278 +++++++++++++++++
 src/app/lib/instructMeasure.ts                | 293 ++++++++++++++++++
 src/app/lib/softWarnings.test.ts              |  39 +++
 src/app/lib/softWarnings.ts                   |  36 +++
 5 files changed, 792 insertions(+)
 create mode 100644 src/app/api/portfolio/[portfolioId]/instructed-measures/route.ts
 create mode 100644 src/app/lib/instructMeasure.test.ts
 create mode 100644 src/app/lib/instructMeasure.ts
 create mode 100644 src/app/lib/softWarnings.test.ts
 create mode 100644 src/app/lib/softWarnings.ts

diff --git a/src/app/api/portfolio/[portfolioId]/instructed-measures/route.ts b/src/app/api/portfolio/[portfolioId]/instructed-measures/route.ts
new file mode 100644
index 0000000..eb5830d
--- /dev/null
+++ b/src/app/api/portfolio/[portfolioId]/instructed-measures/route.ts
@@ -0,0 +1,146 @@
+import { NextRequest, NextResponse } from "next/server";
+import { getServerSession } from "next-auth";
+import { and, eq } from "drizzle-orm";
+import { z } from "zod";
+
+import { AuthOptions } from "@/app/api/auth/[...nextauth]/authOptions";
+import { db } from "@/app/db/db";
+import {
+  portfolioCapabilities,
+  portfolioUsers,
+} from "@/app/db/schema/portfolio";
+import { user } from "@/app/db/schema/users";
+import { instructMeasure } from "@/app/lib/instructMeasure";
+import { MEASURE_NAMES } from "@/app/lib/measureDocumentRequirements";
+
+const postSchema = z.object({
+  dealId: z.string().min(1, "dealId is required"),
+  measureName: z.string().min(1, "measureName is required"),
+});
+
+/**
+ * POST /api/portfolio/[portfolioId]/instructed-measures
+ *
+ * Approver-only endpoint that instructs a measure on a deal. Validates the
+ * measure name against the canonical `MEASURE_NAMES` catalogue, persists
+ * to `user_defined_deal_measures`, auto-creates an approval row, and
+ * pushes back to HubSpot. See `instructMeasure` for the full contract.
+ *
+ * Body:
+ *   { dealId: string, measureName: string }
+ *
+ * Response:
+ *   200 { ok: true, hubspotSync: "ok" | "failed", autoPopulatedProposed: boolean, hubspotError? }
+ *   400 { ok: false, error }
+ *   401 / 403 / 404 on auth/role/user errors.
+ */
+export async function POST(
+  req: NextRequest,
+  props: { params: Promise<{ portfolioId: string }> },
+) {
+  const { portfolioId } = await props.params;
+
+  const session = await getServerSession(AuthOptions);
+  if (!session?.user?.email) {
+    return NextResponse.json({ error: "Unauthorised" }, { status: 401 });
+  }
+
+  let body: unknown;
+  try {
+    body = await req.json();
+  } catch {
+    return NextResponse.json({ error: "Invalid JSON" }, { status: 400 });
+  }
+
+  const parsed = postSchema.safeParse(body);
+  if (!parsed.success) {
+    return NextResponse.json(
+      { error: parsed.error.flatten() },
+      { status: 400 },
+    );
+  }
+
+  const { dealId, measureName } = parsed.data;
+
+  // Validate against the canonical catalogue up-front so the route returns
+  // a clean 400 rather than relying on the service-level check.
+  if (!(MEASURE_NAMES as ReadonlyArray<string>).includes(measureName)) {
+    return NextResponse.json(
+      { error: `Unknown measure: ${measureName}` },
+      { status: 400 },
+    );
+  }
+
+  const userRow = await db
+    .select({ id: user.id })
+    .from(user)
+    .where(eq(user.email, session.user.email))
+    .limit(1);
+
+  if (!userRow[0]) {
+    return NextResponse.json({ error: "User not found" }, { status: 404 });
+  }
+
+  // Caller must have any role on the portfolio (so we don't expose the
+  // endpoint to strangers) AND the approver capability.
+  const portfolioUserRow = await db
+    .select({ role: portfolioUsers.role })
+    .from(portfolioUsers)
+    .where(
+      and(
+        eq(portfolioUsers.portfolioId, BigInt(portfolioId)),
+        eq(portfolioUsers.userId, userRow[0].id),
+      ),
+    )
+    .limit(1);
+
+  if (!portfolioUserRow[0]?.role) {
+    return NextResponse.json(
+      { error: "No portfolio access" },
+      { status: 403 },
+    );
+  }
+
+  const capabilityRows = await db
+    .select({ capability: portfolioCapabilities.capability })
+    .from(portfolioCapabilities)
+    .where(
+      and(
+        eq(portfolioCapabilities.portfolioId, BigInt(portfolioId)),
+        eq(portfolioCapabilities.userId, userRow[0].id),
+      ),
+    );
+  const capabilities = capabilityRows.map((r) => r.capability);
+  if (!capabilities.includes("approver")) {
+    return NextResponse.json(
+      { error: "Approver capability required" },
+      { status: 403 },
+    );
+  }
+
+  try {
+    const result = await instructMeasure({
+      dealId,
+      measureName,
+      userId: userRow[0].id,
+    });
+
+    if (!result.ok) {
+      return NextResponse.json({ ok: false, error: result.error }, {
+        status: 400,
+      });
+    }
+    return NextResponse.json({
+      ok: true,
+      hubspotSync: result.hubspotSync,
+      autoPopulatedProposed: result.autoPopulatedProposed,
+      hubspotError: result.hubspotError,
+    });
+  } catch (err) {
+    console.error("[instructed-measures POST]", err);
+    return NextResponse.json(
+      { error: "Internal server error" },
+      { status: 500 },
+    );
+  }
+}
diff --git a/src/app/lib/instructMeasure.test.ts b/src/app/lib/instructMeasure.test.ts
new file mode 100644
index 0000000..80089c7
--- /dev/null
+++ b/src/app/lib/instructMeasure.test.ts
@@ -0,0 +1,278 @@
+/**
+ * Unit tests for the instruct-measure service.
+ *
+ * These tests exercise the orchestration logic — DB transaction +
+ * post-commit HubSpot push + auto-populate-proposed branch — by injecting
+ * lightweight fakes for the DB hooks. The tests never touch the real DB
+ * or HubSpot client.
+ */
+import { describe, expect, it, vi } from "vitest";
+import {
+  INSTRUCTED_MEASURES_PROP,
+  PROPOSED_MEASURES_PROP,
+  instructMeasure,
+} from "./instructMeasure";
+import type {
+  InstructTxOutcome,
+  RunInstructTx,
+  ReadInstructedMeasureNames,
+  StampPushedAt,
+  SyncMeasuresField,
+} from "./instructMeasure";
+
+function makeDeps(overrides?: {
+  txOutcome?: Partial<InstructTxOutcome>;
+  txError?: Error;
+  instructedAfter?: string[];
+  syncResults?: Array<
+    { ok: true } | { ok: false; error: string }
+  >;
+  stampError?: Error;
+}) {
+  const txOutcome: InstructTxOutcome = {
+    instructedRowId: 42n,
+    proposedWasEmpty: false,
+    hadNoApprovals: false,
+    ...overrides?.txOutcome,
+  };
+  const runInstructTx: RunInstructTx = vi.fn(async () => {
+    if (overrides?.txError) throw overrides.txError;
+    return txOutcome;
+  });
+  const readInstructedMeasureNames: ReadInstructedMeasureNames = vi.fn(
+    async () => overrides?.instructedAfter ?? ["ASHP"],
+  );
+  const syncQueue: Array<{ ok: true } | { ok: false; error: string }> =
+    overrides?.syncResults ?? [{ ok: true }];
+  const syncMeasuresField: SyncMeasuresField = vi.fn(async () => {
+    return syncQueue.shift() ?? ({ ok: true } as const);
+  });
+  const stampPushedAt: StampPushedAt = vi.fn(async () => {
+    if (overrides?.stampError) throw overrides.stampError;
+  });
+  return {
+    runInstructTx,
+    readInstructedMeasureNames,
+    syncMeasuresField,
+    stampPushedAt,
+  };
+}
+
+describe("instructMeasure — input validation", () => {
+  it("rejects an unknown measure name without touching the DB or HubSpot", async () => {
+    const deps = makeDeps();
+    const result = await instructMeasure({
+      dealId: "deal-1",
+      measureName: "Not a real measure",
+      userId: 1n,
+      deps,
+    });
+    expect(result).toEqual({
+      ok: false,
+      error: "Unknown measure: Not a real measure",
+    });
+    expect(deps.runInstructTx).not.toHaveBeenCalled();
+    expect(deps.syncMeasuresField).not.toHaveBeenCalled();
+    expect(deps.stampPushedAt).not.toHaveBeenCalled();
+  });
+
+  it("rejects an empty measure name", async () => {
+    const deps = makeDeps();
+    const result = await instructMeasure({
+      dealId: "deal-1",
+      measureName: "   ",
+      userId: 1n,
+      deps,
+    });
+    expect(result.ok).toBe(false);
+    expect(deps.runInstructTx).not.toHaveBeenCalled();
+  });
+});
+
+describe("instructMeasure — happy path", () => {
+  it("commits the tx, pushes the full instructed list, stamps pushed_at", async () => {
+    const deps = makeDeps({
+      instructedAfter: ["ASHP", "Solar PV"],
+      txOutcome: {
+        instructedRowId: 99n,
+        proposedWasEmpty: false,
+        hadNoApprovals: false,
+      },
+    });
+    const result = await instructMeasure({
+      dealId: "deal-42",
+      measureName: "Solar PV",
+      userId: 7n,
+      deps,
+    });
+    expect(result).toMatchObject({
+      ok: true,
+      instructedRowId: 99n,
+      hubspotSync: "ok",
+      autoPopulatedProposed: false,
+    });
+    expect(deps.runInstructTx).toHaveBeenCalledWith({
+      dealId: "deal-42",
+      measureName: "Solar PV",
+      userId: 7n,
+      notes: null,
+    });
+    expect(deps.syncMeasuresField).toHaveBeenCalledTimes(1);
+    expect(deps.syncMeasuresField).toHaveBeenCalledWith({
+      hubspotDealId: "deal-42",
+      propName: INSTRUCTED_MEASURES_PROP,
+      measureNames: ["ASHP", "Solar PV"],
+    });
+    expect(deps.stampPushedAt).toHaveBeenCalledWith(99n);
+  });
+});
+
+describe("instructMeasure — auto-populate proposed branch", () => {
+  it("also pushes proposed_measures when proposed was empty AND no prior approvals", async () => {
+    const deps = makeDeps({
+      instructedAfter: ["EWI"],
+      txOutcome: {
+        instructedRowId: 1n,
+        proposedWasEmpty: true,
+        hadNoApprovals: true,
+      },
+    });
+    const result = await instructMeasure({
+      dealId: "deal-blank",
+      measureName: "EWI",
+      userId: 3n,
+      deps,
+    });
+    expect(result.ok).toBe(true);
+    if (result.ok) {
+      expect(result.autoPopulatedProposed).toBe(true);
+      expect(result.hubspotSync).toBe("ok");
+    }
+    expect(deps.syncMeasuresField).toHaveBeenCalledTimes(2);
+    expect(deps.syncMeasuresField).toHaveBeenNthCalledWith(1, {
+      hubspotDealId: "deal-blank",
+      propName: INSTRUCTED_MEASURES_PROP,
+      measureNames: ["EWI"],
+    });
+    expect(deps.syncMeasuresField).toHaveBeenNthCalledWith(2, {
+      hubspotDealId: "deal-blank",
+      propName: PROPOSED_MEASURES_PROP,
+      measureNames: ["EWI"],
+    });
+  });
+
+  it("does NOT auto-populate proposed when proposed was empty but approvals already exist", async () => {
+    const deps = makeDeps({
+      instructedAfter: ["EWI"],
+      txOutcome: {
+        instructedRowId: 1n,
+        proposedWasEmpty: true,
+        hadNoApprovals: false, // an approval already existed
+      },
+    });
+    const result = await instructMeasure({
+      dealId: "deal-mid-flow",
+      measureName: "EWI",
+      userId: 3n,
+      deps,
+    });
+    expect(result.ok).toBe(true);
+    if (result.ok) expect(result.autoPopulatedProposed).toBe(false);
+    expect(deps.syncMeasuresField).toHaveBeenCalledTimes(1);
+    expect(deps.syncMeasuresField).toHaveBeenCalledWith(
+      expect.objectContaining({ propName: INSTRUCTED_MEASURES_PROP }),
+    );
+  });
+
+  it("does NOT auto-populate proposed when proposed already has measures", async () => {
+    const deps = makeDeps({
+      instructedAfter: ["EWI"],
+      txOutcome: {
+        instructedRowId: 1n,
+        proposedWasEmpty: false,
+        hadNoApprovals: true,
+      },
+    });
+    const result = await instructMeasure({
+      dealId: "deal-with-proposed",
+      measureName: "EWI",
+      userId: 3n,
+      deps,
+    });
+    expect(result.ok).toBe(true);
+    if (result.ok) expect(result.autoPopulatedProposed).toBe(false);
+    expect(deps.syncMeasuresField).toHaveBeenCalledTimes(1);
+  });
+});
+
+describe("instructMeasure — DB transaction failure", () => {
+  it("returns an error and skips HubSpot when the tx throws", async () => {
+    const deps = makeDeps({ txError: new Error("insert failed") });
+    const result = await instructMeasure({
+      dealId: "deal-x",
+      measureName: "ASHP",
+      userId: 1n,
+      deps,
+    });
+    expect(result).toEqual({ ok: false, error: "insert failed" });
+    expect(deps.syncMeasuresField).not.toHaveBeenCalled();
+    expect(deps.readInstructedMeasureNames).not.toHaveBeenCalled();
+    expect(deps.stampPushedAt).not.toHaveBeenCalled();
+  });
+});
+
+describe("instructMeasure — HubSpot push failure leaves DB committed", () => {
+  it("returns ok=true with hubspotSync=failed and does NOT stamp pushed_at", async () => {
+    const deps = makeDeps({
+      instructedAfter: ["ASHP"],
+      txOutcome: {
+        instructedRowId: 11n,
+        proposedWasEmpty: false,
+        hadNoApprovals: false,
+      },
+      syncResults: [{ ok: false, error: "hubspot 500" }],
+    });
+    const result = await instructMeasure({
+      dealId: "deal-h",
+      measureName: "ASHP",
+      userId: 1n,
+      deps,
+    });
+    expect(result).toMatchObject({
+      ok: true,
+      instructedRowId: 11n,
+      hubspotSync: "failed",
+      hubspotError: "hubspot 500",
+    });
+    expect(deps.runInstructTx).toHaveBeenCalledTimes(1);
+    expect(deps.stampPushedAt).not.toHaveBeenCalled();
+  });
+
+  it("treats a failed proposed-measures push as overall failure (still no stamp)", async () => {
+    const deps = makeDeps({
+      instructedAfter: ["EWI"],
+      txOutcome: {
+        instructedRowId: 12n,
+        proposedWasEmpty: true,
+        hadNoApprovals: true,
+      },
+      syncResults: [
+        { ok: true },
+        { ok: false, error: "proposed push failed" },
+      ],
+    });
+    const result = await instructMeasure({
+      dealId: "deal-blank",
+      measureName: "EWI",
+      userId: 3n,
+      deps,
+    });
+    expect(result).toMatchObject({
+      ok: true,
+      hubspotSync: "failed",
+      hubspotError: "proposed push failed",
+      autoPopulatedProposed: true,
+    });
+    expect(deps.stampPushedAt).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/app/lib/instructMeasure.ts b/src/app/lib/instructMeasure.ts
new file mode 100644
index 0000000..d59bb46
--- /dev/null
+++ b/src/app/lib/instructMeasure.ts
@@ -0,0 +1,293 @@
+/**
+ * Instruct-measure service (issue #253)
+ *
+ * Implements the headline approver flow: an approver instructs a measure
+ * that the coordinator did not propose, picking from the canonical
+ * `MEASURE_NAMES` catalogue. The instruction is recorded locally and
+ * pushed back to HubSpot.
+ *
+ * Single DB transaction:
+ *   1. insert a `user_defined_deal_measures` row with `source = "instructed"`
+ *   2. insert a `deal_measure_approvals` row with `is_approved = true`
+ *   3. insert a corresponding `deal_measure_approval_events` row
+ *   4. read the deal's current `proposed_measures` + total approval count
+ *
+ * After the transaction commits, push the instructed-measures list to
+ * HubSpot under `instructed_measures`. If `proposed_measures` was empty
+ * AND the deal had no prior approvals, ALSO push the new measure as
+ * `proposed_measures` so the deal has a coherent measures starting point.
+ *
+ * HubSpot push failures DO NOT roll back the DB. Successful pushes stamp
+ * `pushed_at` on the new local row; failures leave it null so a follow-up
+ * reconcile job can retry.
+ */
+import { and, eq, sql } from "drizzle-orm";
+import { db } from "@/app/db/db";
+import { hubspotDealData } from "@/app/db/schema/crm/hubspot_deal_table";
+import {
+  dealMeasureApprovals,
+  dealMeasureApprovalEvents,
+} from "@/app/db/schema/approvals";
+import { userDefinedDealMeasures } from "@/app/db/schema/user_defined_deal_measures";
+import {
+  MEASURE_NAMES,
+  type MeasureName,
+} from "@/app/lib/measureDocumentRequirements";
+import { parseMeasures } from "@/app/lib/parseMeasures";
+import { syncMeasuresFieldToHubSpot as defaultSyncMeasuresField } from "@/app/lib/hubspot/dealSync";
+
+export const INSTRUCTED_MEASURES_PROP = "instructed_measures";
+export const PROPOSED_MEASURES_PROP = "proposed_measures";
+
+/** Snapshot returned by the transactional step of the service. */
+export interface InstructTxOutcome {
+  instructedRowId: bigint;
+  proposedWasEmpty: boolean;
+  hadNoApprovals: boolean;
+}
+
+export type SyncMeasuresField = typeof defaultSyncMeasuresField;
+
+export type RunInstructTx = (params: {
+  dealId: string;
+  measureName: MeasureName;
+  userId: bigint;
+  notes: string | null;
+}) => Promise<InstructTxOutcome>;
+
+export type ReadInstructedMeasureNames = (
+  dealId: string,
+) => Promise<string[]>;
+
+export type StampPushedAt = (rowId: bigint) => Promise<void>;
+
+export type InstructMeasureResult =
+  | {
+      ok: true;
+      instructedRowId: bigint;
+      hubspotSync: "ok" | "failed";
+      autoPopulatedProposed: boolean;
+      hubspotError?: string;
+    }
+  | { ok: false; error: string };
+
+export interface InstructMeasureInput {
+  dealId: string;
+  measureName: string;
+  userId: bigint;
+  notes?: string;
+  /**
+   * Hooks for the unit tests so the service stays environment-free. The
+   * route wires the real DB + HubSpot client through.
+   */
+  deps?: {
+    runInstructTx?: RunInstructTx;
+    readInstructedMeasureNames?: ReadInstructedMeasureNames;
+    syncMeasuresField?: SyncMeasuresField;
+    stampPushedAt?: StampPushedAt;
+  };
+}
+
+function isMeasureName(value: string): value is MeasureName {
+  return (MEASURE_NAMES as ReadonlyArray<string>).includes(value);
+}
+
+// ---------------------------------------------------------------------------
+// Default DB-backed implementations of the injectable hooks. The real route
+// uses these; tests substitute lightweight in-memory versions.
+// ---------------------------------------------------------------------------
+const defaultRunInstructTx: RunInstructTx = async ({
+  dealId,
+  measureName,
+  userId,
+  notes,
+}) => {
+  return await db.transaction(async (tx) => {
+    const inserted = await tx
+      .insert(userDefinedDealMeasures)
+      .values({
+        hubspotDealId: dealId,
+        measureName,
+        source: "instructed",
+        createdByUserId: userId,
+        notes,
+      })
+      .returning({ id: userDefinedDealMeasures.id });
+    const instructedRowId = inserted[0]?.id;
+    if (instructedRowId === undefined || instructedRowId === null) {
+      throw new Error("Failed to insert user_defined_deal_measures row");
+    }
+
+    // Approval row — keep one row per (deal, measure). The unique
+    // constraint is on (hubspot_deal_id, measure_name); a duplicate
+    // instruction for an already-approved measure refreshes the row but
+    // still produces a new event + a new instructed row.
+    await tx
+      .insert(dealMeasureApprovals)
+      .values({
+        hubspotDealId: dealId,
+        measureName,
+        isApproved: true,
+        approvedBy: userId,
+      })
+      .onConflictDoUpdate({
+        target: [
+          dealMeasureApprovals.hubspotDealId,
+          dealMeasureApprovals.measureName,
+        ],
+        set: {
+          isApproved: true,
+          approvedBy: userId,
+          approvedAt: new Date(),
+        },
+      });
+
+    await tx.insert(dealMeasureApprovalEvents).values({
+      hubspotDealId: dealId,
+      measureName,
+      action: "approved",
+      actedBy: userId,
+    });
+
+    const dealRows = await tx
+      .select({ proposedMeasures: hubspotDealData.proposedMeasures })
+      .from(hubspotDealData)
+      .where(eq(hubspotDealData.dealId, dealId))
+      .limit(1);
+    const proposedRaw = dealRows[0]?.proposedMeasures ?? null;
+    const proposedWasEmpty = parseMeasures(proposedRaw).length === 0;
+
+    const approvalCountRows = await tx
+      .select({ count: sql<number>`count(*)::int` })
+      .from(dealMeasureApprovals)
+      .where(eq(dealMeasureApprovals.hubspotDealId, dealId));
+    const approvalCount = Number(approvalCountRows[0]?.count ?? 0);
+    // We just inserted (or upserted) one approval row in this tx, so any
+    // count > 1 means the deal already had a prior approval row before us.
+    const hadNoApprovals = approvalCount <= 1;
+
+    return { instructedRowId, proposedWasEmpty, hadNoApprovals };
+  });
+};
+
+const defaultReadInstructedMeasureNames: ReadInstructedMeasureNames = async (
+  dealId,
+) => {
+  const rows = await db
+    .select({ measureName: userDefinedDealMeasures.measureName })
+    .from(userDefinedDealMeasures)
+    .where(
+      and(
+        eq(userDefinedDealMeasures.hubspotDealId, dealId),
+        eq(userDefinedDealMeasures.source, "instructed"),
+      ),
+    );
+  return rows.map((r) => r.measureName);
+};
+
+const defaultStampPushedAt: StampPushedAt = async (rowId) => {
+  await db
+    .update(userDefinedDealMeasures)
+    .set({ pushedAt: new Date() })
+    .where(eq(userDefinedDealMeasures.id, rowId));
+};
+
+export async function instructMeasure(
+  input: InstructMeasureInput,
+): Promise<InstructMeasureResult> {
+  const measureName = input.measureName.trim();
+  if (!measureName) {
+    return { ok: false, error: "measureName is required" };
+  }
+  if (!isMeasureName(measureName)) {
+    return { ok: false, error: `Unknown measure: ${measureName}` };
+  }
+
+  const runInstructTx = input.deps?.runInstructTx ?? defaultRunInstructTx;
+  const readInstructed =
+    input.deps?.readInstructedMeasureNames ??
+    defaultReadInstructedMeasureNames;
+  const syncMeasuresField =
+    input.deps?.syncMeasuresField ?? defaultSyncMeasuresField;
+  const stampPushedAt = input.deps?.stampPushedAt ?? defaultStampPushedAt;
+
+  // ---------------------------------------------------------------------
+  // DB transaction. Any throw here rolls everything back — no row is
+  // created, no approval is logged, no HubSpot push happens.
+  // ---------------------------------------------------------------------
+  let txResult: InstructTxOutcome;
+  try {
+    txResult = await runInstructTx({
+      dealId: input.dealId,
+      measureName,
+      userId: input.userId,
+      notes: input.notes ?? null,
+    });
+  } catch (err) {
+    const message =
+      err instanceof Error ? err.message : "Failed to instruct measure";
+    console.error("[instructMeasure] transaction failed", {
+      dealId: input.dealId,
+      measureName,
+      error: err,
+    });
+    return { ok: false, error: message };
+  }
+
+  // ---------------------------------------------------------------------
+  // Post-commit: push to HubSpot. Failures here do NOT roll back the DB;
+  // `pushed_at` simply stays null so a reconcile job can retry.
+  // ---------------------------------------------------------------------
+  const allInstructed = await readInstructed(input.dealId);
+
+  const instructedSync = await syncMeasuresField({
+    hubspotDealId: input.dealId,
+    propName: INSTRUCTED_MEASURES_PROP,
+    measureNames: allInstructed,
+  });
+
+  let proposedSync: { ok: true } | { ok: false; error: string } | null = null;
+  const shouldAutoPopulateProposed =
+    txResult.proposedWasEmpty && txResult.hadNoApprovals;
+  if (shouldAutoPopulateProposed) {
+    proposedSync = await syncMeasuresField({
+      hubspotDealId: input.dealId,
+      propName: PROPOSED_MEASURES_PROP,
+      measureNames: [measureName],
+    });
+  }
+
+  const overallOk =
+    instructedSync.ok && (proposedSync === null || proposedSync.ok);
+
+  if (overallOk) {
+    try {
+      await stampPushedAt(txResult.instructedRowId);
+    } catch (err) {
+      console.error("[instructMeasure] failed to stamp pushed_at", {
+        rowId: String(txResult.instructedRowId),
+        error: err,
+      });
+    }
+    return {
+      ok: true,
+      instructedRowId: txResult.instructedRowId,
+      hubspotSync: "ok",
+      autoPopulatedProposed: shouldAutoPopulateProposed,
+    };
+  }
+
+  const hubspotError = !instructedSync.ok
+    ? instructedSync.error
+    : proposedSync && !proposedSync.ok
+      ? proposedSync.error
+      : "HubSpot sync failed";
+
+  return {
+    ok: true,
+    instructedRowId: txResult.instructedRowId,
+    hubspotSync: "failed",
+    autoPopulatedProposed: shouldAutoPopulateProposed,
+    hubspotError,
+  };
+}
diff --git a/src/app/lib/softWarnings.test.ts b/src/app/lib/softWarnings.test.ts
new file mode 100644
index 0000000..6afc153
--- /dev/null
+++ b/src/app/lib/softWarnings.test.ts
@@ -0,0 +1,39 @@
+import { describe, expect, it } from "vitest";
+import { outOfOrderInstructionWarning } from "./softWarnings";
+
+describe("outOfOrderInstructionWarning", () => {
+  it("returns null when there are no technical-approved measures", () => {
+    expect(
+      outOfOrderInstructionWarning({
+        technicalApprovedMeasuresForInstall: null,
+      }),
+    ).toBeNull();
+    expect(
+      outOfOrderInstructionWarning({
+        technicalApprovedMeasuresForInstall: "",
+      }),
+    ).toBeNull();
+    expect(
+      outOfOrderInstructionWarning({
+        technicalApprovedMeasuresForInstall: undefined,
+      }),
+    ).toBeNull();
+  });
+
+  it("returns a non-empty warning when technical-approved measures exist", () => {
+    const w = outOfOrderInstructionWarning({
+      technicalApprovedMeasuresForInstall: "ASHP;Solar PV",
+    });
+    expect(typeof w).toBe("string");
+    expect(w?.toLowerCase()).toContain("technical-approved");
+    expect(w?.toLowerCase()).toContain("out of");
+  });
+
+  it("treats whitespace-only text as no measures", () => {
+    expect(
+      outOfOrderInstructionWarning({
+        technicalApprovedMeasuresForInstall: "   ",
+      }),
+    ).toBeNull();
+  });
+});
diff --git a/src/app/lib/softWarnings.ts b/src/app/lib/softWarnings.ts
new file mode 100644
index 0000000..2bfd3dc
--- /dev/null
+++ b/src/app/lib/softWarnings.ts
@@ -0,0 +1,36 @@
+/**
+ * Soft warnings (issue #253)
+ *
+ * Cross-cutting helper for non-blocking, advisory messages surfaced in the
+ * UI. The first use case is the "out-of-order" warning shown above the
+ * Instruct-measure form when a deal already has technical-approved
+ * measures: instructing a new measure at that point is unusual and the
+ * approver should pause before doing it.
+ *
+ * Kept deliberately small and stateless so later slices (e.g. PIBI flow,
+ * lodgement guards) can reuse it. The shape is `(deal) => string | null`
+ * so callers can render the warning verbatim or fold it into a list.
+ */
+import { parseMeasures } from "@/app/lib/parseMeasures";
+
+export interface OutOfOrderInstructionDealLike {
+  technicalApprovedMeasuresForInstall?: string | null;
+}
+
+/**
+ * Soft warning shown above the Instruct-measure form when the deal has
+ * already moved into the technical-approved phase. Returns `null` when
+ * there are no technical-approved measures (i.e. the instruction is in
+ * order).
+ */
+export function outOfOrderInstructionWarning(
+  deal: OutOfOrderInstructionDealLike,
+): string | null {
+  const measures = parseMeasures(deal.technicalApprovedMeasuresForInstall);
+  if (measures.length === 0) return null;
+  return (
+    "This deal already has technical-approved measures for install. " +
+    "Instructing a new measure now is out of the usual order — confirm " +
+    "with the coordinator before proceeding."
+  );
+}

From c5083cbc7873b78d7c5437cfa0ef4ecb8a539719 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 18:58:01 +0000
Subject: [PATCH 19/25] add instruct-measure drawer form

Approver-only catalogue dropdown + submit button at the bottom of the
Measures section with optimistic chip rendering, error surfacing, and
the out-of-order soft warning when technical-approved measures already
exist on the deal.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../live/PropertyDetailDrawer.tsx             | 161 +++++++++++++++++-
 1 file changed, 160 insertions(+), 1 deletion(-)

diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
index 0d9bb7f..a9d807f 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
@@ -26,6 +26,8 @@ import {
 import { STAGE_COLORS } from "./types";
 import type { ClassifiedDeal, PortfolioCapabilityType, RemovalRequest } from "./types";
 import { parseMeasures } from "@/app/lib/parseMeasures";
+import { MEASURE_NAMES } from "@/app/lib/measureDocumentRequirements";
+import { outOfOrderInstructionWarning } from "@/app/lib/softWarnings";
 
 // Sections that the drawer can scroll-focus on initial open. Keep the keys in
 // stable, stage-ordered order so the layout remains predictable.
@@ -1110,6 +1112,154 @@ function DomnaEditor({
   );
 }
 
+// -----------------------------------------------------------------------
+// Instruct measure editor — approver-only form to instruct an out-of-band
+// measure that the coordinator did not propose (issue #253).
+// -----------------------------------------------------------------------
+interface InstructMeasureEditorProps {
+  dealId: string;
+  portfolioId: string;
+  /** True when the user has the approver capability on this portfolio. */
+  canEdit: boolean;
+  /** Soft-warning string from `outOfOrderInstructionWarning`, or null. */
+  outOfOrderWarning: string | null;
+}
+
+function InstructMeasureEditor({
+  dealId,
+  portfolioId,
+  canEdit,
+  outOfOrderWarning,
+}: InstructMeasureEditorProps) {
+  const [selected, setSelected] = useState<string>("");
+  const [optimisticList, setOptimisticList] = useState<string[]>([]);
+  const [submitting, setSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  // Reset optimistic state when the drawer switches deals.
+  useEffect(() => {
+    setOptimisticList([]);
+    setSelected("");
+    setError(null);
+  }, [dealId]);
+
+  if (!canEdit) return null;
+
+  async function handleSubmit() {
+    if (!selected) return;
+    const measure = selected;
+    setSubmitting(true);
+    setError(null);
+    // Optimistic append. Reverted on failure.
+    setOptimisticList((prev) => [...prev, measure]);
+    try {
+      const res = await fetch(
+        `/api/portfolio/${portfolioId}/instructed-measures`,
+        {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ dealId, measureName: measure }),
+        },
+      );
+      if (!res.ok) {
+        setOptimisticList((prev) => prev.filter((m) => m !== measure));
+        const json = await res.json().catch(() => ({}));
+        setError(
+          typeof json.error === "string"
+            ? json.error
+            : "Failed to instruct measure",
+        );
+        return;
+      }
+      const json = (await res.json()) as {
+        ok: boolean;
+        hubspotSync?: "ok" | "failed";
+        hubspotError?: string;
+      };
+      if (json.hubspotSync === "failed") {
+        setError(
+          json.hubspotError
+            ? `Saved locally — HubSpot sync failed: ${json.hubspotError}`
+            : "Saved locally — HubSpot sync failed",
+        );
+      }
+      setSelected("");
+    } catch (err) {
+      setOptimisticList((prev) => prev.filter((m) => m !== measure));
+      setError(
+        err instanceof Error ? err.message : "Failed to instruct measure",
+      );
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  return (
+    <div className="space-y-3">
+      {outOfOrderWarning && (
+        <div
+          data-testid="instruct-measure-warning"
+          className="flex items-start gap-2 text-xs text-amber-800 bg-amber-50 border border-amber-200 px-3 py-2 rounded-lg"
+        >
+          <AlertTriangle className="h-3.5 w-3.5 mt-0.5 shrink-0" />
+          <span>{outOfOrderWarning}</span>
+        </div>
+      )}
+      {optimisticList.length > 0 && (
+        <div data-testid="instructed-measures-list" className="flex flex-wrap gap-1.5">
+          {optimisticList.map((m) => (
+            <span
+              key={m}
+              data-testid="instructed-measure-chip"
+              className="px-2 py-0.5 rounded-full text-[11px] bg-blue-50 border border-blue-200 text-blue-700"
+            >
+              {m}
+            </span>
+          ))}
+        </div>
+      )}
+      <div className="flex flex-wrap items-center gap-2">
+        <label className="flex flex-col gap-1 flex-1 min-w-[12rem]">
+          <span className="text-xs text-gray-500 font-medium">
+            Instruct a measure
+          </span>
+          <select
+            data-testid="instruct-measure-select"
+            value={selected}
+            onChange={(e) => setSelected(e.target.value)}
+            disabled={submitting}
+            className="rounded-lg border border-gray-200 px-3 py-1.5 text-xs text-gray-800 focus:outline-none focus:ring-2 focus:ring-blue-200 focus:border-blue-300"
+          >
+            <option value="">Select a measure…</option>
+            {MEASURE_NAMES.map((m) => (
+              <option key={m} value={m}>
+                {m}
+              </option>
+            ))}
+          </select>
+        </label>
+        <button
+          type="button"
+          data-testid="instruct-measure-submit"
+          onClick={handleSubmit}
+          disabled={!selected || submitting}
+          className="text-xs font-medium px-3 py-1.5 rounded-lg bg-brandblue text-white hover:bg-brandmidblue disabled:opacity-50 transition-colors mt-5"
+        >
+          {submitting ? "Instructing…" : "Instruct"}
+        </button>
+      </div>
+      {error && (
+        <p
+          data-testid="instruct-measure-error"
+          className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg"
+        >
+          {error}
+        </p>
+      )}
+    </div>
+  );
+}
+
 // -----------------------------------------------------------------------
 // PropertyDetailDrawer — main component
 // -----------------------------------------------------------------------
@@ -1292,7 +1442,8 @@ export default function PropertyDetailDrawer({
                 </div>
               </div>
 
-              {/* Measures section — keeps existing approval table content */}
+              {/* Measures section — read-only fields plus the approver-only
+                  Instruct-measure form (issue #253). */}
               <div ref={(el) => { sectionRefs.current.measures = el; }}>
                 <SectionHeader id="measures" label={SECTION_TITLES.measures} />
                 <div className="divide-y divide-gray-50">
@@ -1301,6 +1452,14 @@ export default function PropertyDetailDrawer({
                   <InfoRow label="Installed" value={deal.actualMeasuresInstalled} />
                   <InfoRow label="Lodgement Status" value={deal.lodgementStatus} />
                 </div>
+                <div className="mt-3">
+                  <InstructMeasureEditor
+                    dealId={deal.dealId}
+                    portfolioId={portfolioId}
+                    canEdit={userCapability.includes("approver")}
+                    outOfOrderWarning={outOfOrderInstructionWarning(deal)}
+                  />
+                </div>
               </div>
 
               {/* PIBI section — editable date pickers for write+ users (issue #252) */}

From f3ce506653c153a6336cc7b68dc42553ab966095 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 18:58:08 +0000
Subject: [PATCH 20/25] add cypress spec for instruct-measure flow

Approver opens the drawer at the Measures section, picks a measure from
the catalogue dropdown, submits, and the spec asserts the optimistic
chip, the POST payload + response shape, and that the approval log
surfaces the new approval row.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../e2e/live-tracking/instruct-measure.cy.js  | 93 +++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 cypress/e2e/live-tracking/instruct-measure.cy.js

diff --git a/cypress/e2e/live-tracking/instruct-measure.cy.js b/cypress/e2e/live-tracking/instruct-measure.cy.js
new file mode 100644
index 0000000..e633963
--- /dev/null
+++ b/cypress/e2e/live-tracking/instruct-measure.cy.js
@@ -0,0 +1,93 @@
+/**
+ * Live Tracking — Instruct measure flow (issue #253)
+ *
+ * Verifies the approver flow for instructing a measure that the
+ * coordinator did not propose:
+ *   1. the approver opens the property drawer at the Measures section,
+ *   2. picks a measure from the canonical catalogue dropdown and submits,
+ *   3. the drawer reflects the new instructed measure (optimistic chip),
+ *   4. the POST hits the instructed-measures route which pushes
+ *      `instructed_measures` back to HubSpot,
+ *   5. the approval log surface shows a row for the new approval.
+ *
+ * Mirrors `halted-state.cy.js` / `domna-survey.cy.js`. The spec uses
+ * `cy.intercept` so the HubSpot push side-effect is observable without a
+ * real CRM round-trip.
+ */
+
+const PORTFOLIO_SLUG = Cypress.env("LIVE_PORTFOLIO_SLUG");
+const TARGET_DEAL_NAME = Cypress.env("LIVE_INSTRUCT_DEAL_NAME");
+const INSTRUCT_MEASURE = "Loft insulation";
+
+describe("Instruct measure — approver flow", function () {
+  before(function () {
+    if (!PORTFOLIO_SLUG) {
+      cy.log(
+        "LIVE_PORTFOLIO_SLUG env var not set — skipping live tracking specs",
+      );
+      this.skip();
+    }
+  });
+
+  function openDrawerForTargetDeal() {
+    cy.visit(`/portfolio/${PORTFOLIO_SLUG}/your-projects/live`);
+
+    // Switch to the Measures tab — the easiest way into the drawer at the
+    // Measures section.
+    cy.contains("button, [role=tab]", "Measures").click();
+
+    if (TARGET_DEAL_NAME) {
+      cy.contains("[data-testid=measures-row]", TARGET_DEAL_NAME).click();
+    } else {
+      cy.get("[data-testid=measures-row]").first().click();
+    }
+
+    cy.get("[data-testid=property-detail-drawer]").should("be.visible");
+    cy.get("[data-testid=drawer-section-measures]").should("exist");
+  }
+
+  it("lets an approver instruct a measure and reflects it in the drawer + approval log", () => {
+    // Capture the API call so we can assert the payload that would be
+    // pushed to HubSpot under `instructed_measures`.
+    cy.intercept(
+      "POST",
+      `/api/portfolio/*/instructed-measures`,
+    ).as("instructMeasure");
+
+    openDrawerForTargetDeal();
+
+    // Approver-only form is visible at the bottom of the Measures section.
+    cy.get("[data-testid=instruct-measure-select]").should("be.visible");
+
+    cy.get("[data-testid=instruct-measure-select]").select(INSTRUCT_MEASURE);
+    cy.get("[data-testid=instruct-measure-submit]")
+      .should("not.be.disabled")
+      .click();
+
+    // Wait for the POST to land and assert the body shape that the
+    // service uses to drive the HubSpot push.
+    cy.wait("@instructMeasure").then((intercepted) => {
+      expect(intercepted.request.body).to.deep.include({
+        measureName: INSTRUCT_MEASURE,
+      });
+      // Response from our route signals the HubSpot sync outcome — it is
+      // either "ok" (mock recorded the push) or "failed" (network error).
+      // We accept either here so the spec stays portable across envs.
+      expect(intercepted.response.statusCode).to.be.oneOf([200, 201]);
+      expect(intercepted.response.body).to.have.property("ok", true);
+      expect(intercepted.response.body).to.have.property("hubspotSync");
+    });
+
+    // Drawer reflects the instructed measure as an optimistic chip.
+    cy.get("[data-testid=instructed-measures-list]").should("be.visible");
+    cy.get("[data-testid=instructed-measure-chip]")
+      .should("contain.text", INSTRUCT_MEASURE);
+
+    // No error banner.
+    cy.get("[data-testid=instruct-measure-error]").should("not.exist");
+
+    // Approval log section reveals the new approval row when expanded.
+    cy.contains("Approval Log").click();
+    cy.contains(INSTRUCT_MEASURE).should("exist");
+  });
+});

From 091388692e5ee1a6f24500a7da437bef6c9d0017 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 19:14:12 +0000
Subject: [PATCH 21/25] add pibi-selection service

Implements selectPibiMeasures (issue #254): replaces all pibi_ordered
rows for a deal, then pushes the new list to HubSpot under
measures_for_pibi_ordered via syncMeasuresFieldToHubSpot. Mirrors the
instruct-measure service; no approval rows touched.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/app/lib/selectPibiMeasures.ts | 187 ++++++++++++++++++++++++++++++
 1 file changed, 187 insertions(+)
 create mode 100644 src/app/lib/selectPibiMeasures.ts

diff --git a/src/app/lib/selectPibiMeasures.ts b/src/app/lib/selectPibiMeasures.ts
new file mode 100644
index 0000000..aa2b734
--- /dev/null
+++ b/src/app/lib/selectPibiMeasures.ts
@@ -0,0 +1,187 @@
+/**
+ * PIBI-selection service (issue #254)
+ *
+ * Lets an approver mark which measures on a deal are going for PIBI. The
+ * selection is recorded locally as `user_defined_deal_measures` rows with
+ * `source = "pibi_ordered"` and pushed back to HubSpot under the
+ * `measures_for_pibi_ordered` deal property via `syncMeasuresFieldToHubSpot`.
+ *
+ * Semantics deliberately mirror instruct-measure (issue #253):
+ *  - The incoming `measureNames[]` is the NEW desired set, not a delta. The
+ *    service REPLACES all existing `pibi_ordered` rows for the deal, then
+ *    re-inserts one row per selected measure.
+ *  - No `deal_measure_approvals` rows are created or modified.
+ *  - `pushed_at` is stamped on every new row when HubSpot sync succeeds;
+ *    left null on failure so a reconcile job can retry.
+ *  - HubSpot push failures do NOT roll back the DB.
+ *
+ * The service accepts injectable deps so it stays environment-free in tests.
+ */
+import { and, eq } from "drizzle-orm";
+import { db } from "@/app/db/db";
+import { userDefinedDealMeasures } from "@/app/db/schema/user_defined_deal_measures";
+import { syncMeasuresFieldToHubSpot as defaultSyncMeasuresField } from "@/app/lib/hubspot/dealSync";
+
+export const PIBI_MEASURES_PROP = "measures_for_pibi_ordered";
+
+// ---------------------------------------------------------------------------
+// Injected dependency types — mirrors the pattern in instructMeasure.ts so
+// the service is fully testable without touching the real DB or HubSpot.
+// ---------------------------------------------------------------------------
+
+export type SyncMeasuresField = typeof defaultSyncMeasuresField;
+
+/**
+ * Replace the pibi_ordered rows for the deal inside a transaction.
+ * Returns the IDs of the newly inserted rows (one per selected measure).
+ */
+export type RunPibiTx = (params: {
+  dealId: string;
+  measureNames: string[];
+  userId: bigint;
+}) => Promise<{ insertedRowIds: bigint[] }>;
+
+export type StampPushedAt = (rowIds: bigint[]) => Promise<void>;
+
+// ---------------------------------------------------------------------------
+// Public result type
+// ---------------------------------------------------------------------------
+
+export type SelectPibiMeasuresResult =
+  | {
+      ok: true;
+      insertedRowIds: bigint[];
+      hubspotSync: "ok" | "failed";
+      hubspotError?: string;
+    }
+  | { ok: false; error: string };
+
+// ---------------------------------------------------------------------------
+// Input
+// ---------------------------------------------------------------------------
+
+export interface SelectPibiMeasuresInput {
+  dealId: string;
+  /** The FULL desired set of PIBI measures (replaces any prior selection). */
+  measureNames: string[];
+  userId: bigint;
+  deps?: {
+    runPibiTx?: RunPibiTx;
+    syncMeasuresField?: SyncMeasuresField;
+    stampPushedAt?: StampPushedAt;
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Default DB-backed implementations
+// ---------------------------------------------------------------------------
+
+const defaultRunPibiTx: RunPibiTx = async ({ dealId, measureNames, userId }) => {
+  return await db.transaction(async (tx) => {
+    // Delete ALL existing pibi_ordered rows for this deal so the new
+    // selection fully replaces the previous one.
+    await tx
+      .delete(userDefinedDealMeasures)
+      .where(
+        and(
+          eq(userDefinedDealMeasures.hubspotDealId, dealId),
+          eq(userDefinedDealMeasures.source, "pibi_ordered"),
+        ),
+      );
+
+    if (measureNames.length === 0) {
+      return { insertedRowIds: [] };
+    }
+
+    const inserted = await tx
+      .insert(userDefinedDealMeasures)
+      .values(
+        measureNames.map((measureName) => ({
+          hubspotDealId: dealId,
+          measureName,
+          source: "pibi_ordered" as const,
+          createdByUserId: userId,
+        })),
+      )
+      .returning({ id: userDefinedDealMeasures.id });
+
+    return { insertedRowIds: inserted.map((r) => r.id) };
+  });
+};
+
+const defaultStampPushedAt: StampPushedAt = async (rowIds) => {
+  if (rowIds.length === 0) return;
+  for (const rowId of rowIds) {
+    await db
+      .update(userDefinedDealMeasures)
+      .set({ pushedAt: new Date() })
+      .where(eq(userDefinedDealMeasures.id, rowId));
+  }
+};
+
+// ---------------------------------------------------------------------------
+// Service entry-point
+// ---------------------------------------------------------------------------
+
+export async function selectPibiMeasures(
+  input: SelectPibiMeasuresInput,
+): Promise<SelectPibiMeasuresResult> {
+  const runPibiTx = input.deps?.runPibiTx ?? defaultRunPibiTx;
+  const syncMeasuresField =
+    input.deps?.syncMeasuresField ?? defaultSyncMeasuresField;
+  const stampPushedAt = input.deps?.stampPushedAt ?? defaultStampPushedAt;
+
+  // -------------------------------------------------------------------------
+  // DB transaction. Any throw here rolls everything back — no row is
+  // touched, no HubSpot push happens.
+  // -------------------------------------------------------------------------
+  let txResult: { insertedRowIds: bigint[] };
+  try {
+    txResult = await runPibiTx({
+      dealId: input.dealId,
+      measureNames: input.measureNames,
+      userId: input.userId,
+    });
+  } catch (err) {
+    const message =
+      err instanceof Error ? err.message : "Failed to save PIBI measures";
+    console.error("[selectPibiMeasures] transaction failed", {
+      dealId: input.dealId,
+      error: err,
+    });
+    return { ok: false, error: message };
+  }
+
+  // -------------------------------------------------------------------------
+  // Post-commit: push the new selection list to HubSpot. Failures here do
+  // NOT roll back the DB; `pushed_at` simply stays null.
+  // -------------------------------------------------------------------------
+  const syncResult = await syncMeasuresField({
+    hubspotDealId: input.dealId,
+    propName: PIBI_MEASURES_PROP,
+    measureNames: input.measureNames,
+  });
+
+  if (syncResult.ok) {
+    try {
+      await stampPushedAt(txResult.insertedRowIds);
+    } catch (err) {
+      console.error("[selectPibiMeasures] failed to stamp pushed_at", {
+        rowIds: txResult.insertedRowIds.map(String),
+        error: err,
+      });
+    }
+    return {
+      ok: true,
+      insertedRowIds: txResult.insertedRowIds,
+      hubspotSync: "ok",
+    };
+  }
+
+  return {
+    ok: true,
+    insertedRowIds: txResult.insertedRowIds,
+    hubspotSync: "failed",
+    hubspotError: syncResult.error,
+  };
+}

From 1e5eb09c3e689b9f5d6a709317b0146512bc55ae Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 19:14:20 +0000
Subject: [PATCH 22/25] add pibi-measures route
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds POST /api/portfolio/[portfolioId]/pibi-measures (approver-gated)
that accepts { dealId, measureNames[] } and delegates to
selectPibiMeasures. Also adds a GET handler that returns the current
pibi_ordered selection, approved measures, and instructed measures for
a deal — used by the drawer's PIBI selector to pre-populate.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../[portfolioId]/pibi-measures/route.ts      | 231 ++++++++++++++++++
 1 file changed, 231 insertions(+)
 create mode 100644 src/app/api/portfolio/[portfolioId]/pibi-measures/route.ts

diff --git a/src/app/api/portfolio/[portfolioId]/pibi-measures/route.ts b/src/app/api/portfolio/[portfolioId]/pibi-measures/route.ts
new file mode 100644
index 0000000..afe84c0
--- /dev/null
+++ b/src/app/api/portfolio/[portfolioId]/pibi-measures/route.ts
@@ -0,0 +1,231 @@
+import { NextRequest, NextResponse } from "next/server";
+import { getServerSession } from "next-auth";
+import { and, eq } from "drizzle-orm";
+import { z } from "zod";
+
+import { AuthOptions } from "@/app/api/auth/[...nextauth]/authOptions";
+import { db } from "@/app/db/db";
+import {
+  portfolioCapabilities,
+  portfolioUsers,
+} from "@/app/db/schema/portfolio";
+import { user } from "@/app/db/schema/users";
+import { userDefinedDealMeasures } from "@/app/db/schema/user_defined_deal_measures";
+import { dealMeasureApprovals } from "@/app/db/schema/approvals";
+import { selectPibiMeasures } from "@/app/lib/selectPibiMeasures";
+
+const postSchema = z.object({
+  dealId: z.string().min(1, "dealId is required"),
+  measureNames: z.array(z.string()).min(0),
+});
+
+/**
+ * GET /api/portfolio/[portfolioId]/pibi-measures?dealId=...
+ *
+ * Returns the current PIBI selection and approved measure names for a deal.
+ * Used by the drawer's PIBI selector to pre-populate the multi-select.
+ *
+ * Response:
+ *   200 { pibiMeasures: string[], approvedMeasures: string[], instructedMeasures: string[] }
+ */
+export async function GET(
+  req: NextRequest,
+  props: { params: Promise<{ portfolioId: string }> },
+) {
+  const { portfolioId } = await props.params;
+
+  const session = await getServerSession(AuthOptions);
+  if (!session?.user?.email) {
+    return NextResponse.json({ error: "Unauthorised" }, { status: 401 });
+  }
+
+  const dealId = req.nextUrl.searchParams.get("dealId");
+  if (!dealId) {
+    return NextResponse.json(
+      { error: "dealId query param is required" },
+      { status: 400 },
+    );
+  }
+
+  const userRow = await db
+    .select({ id: user.id })
+    .from(user)
+    .where(eq(user.email, session.user.email))
+    .limit(1);
+
+  if (!userRow[0]) {
+    return NextResponse.json({ error: "User not found" }, { status: 404 });
+  }
+
+  const portfolioUserRow = await db
+    .select({ role: portfolioUsers.role })
+    .from(portfolioUsers)
+    .where(
+      and(
+        eq(portfolioUsers.portfolioId, BigInt(portfolioId)),
+        eq(portfolioUsers.userId, userRow[0].id),
+      ),
+    )
+    .limit(1);
+
+  if (!portfolioUserRow[0]?.role) {
+    return NextResponse.json(
+      { error: "No portfolio access" },
+      { status: 403 },
+    );
+  }
+
+  const [pibiRows, approvalRows, instructedRows] = await Promise.all([
+    db
+      .select({ measureName: userDefinedDealMeasures.measureName })
+      .from(userDefinedDealMeasures)
+      .where(
+        and(
+          eq(userDefinedDealMeasures.hubspotDealId, dealId),
+          eq(userDefinedDealMeasures.source, "pibi_ordered"),
+        ),
+      ),
+    db
+      .select({ measureName: dealMeasureApprovals.measureName })
+      .from(dealMeasureApprovals)
+      .where(
+        and(
+          eq(dealMeasureApprovals.hubspotDealId, dealId),
+          eq(dealMeasureApprovals.isApproved, true),
+        ),
+      ),
+    db
+      .select({ measureName: userDefinedDealMeasures.measureName })
+      .from(userDefinedDealMeasures)
+      .where(
+        and(
+          eq(userDefinedDealMeasures.hubspotDealId, dealId),
+          eq(userDefinedDealMeasures.source, "instructed"),
+        ),
+      ),
+  ]);
+
+  return NextResponse.json({
+    pibiMeasures: pibiRows.map((r) => r.measureName),
+    approvedMeasures: approvalRows.map((r) => r.measureName),
+    instructedMeasures: instructedRows.map((r) => r.measureName),
+  });
+}
+
+/**
+ * POST /api/portfolio/[portfolioId]/pibi-measures
+ *
+ * Approver-only endpoint that records which measures on a deal are going for
+ * PIBI. The incoming `measureNames[]` is the FULL desired set — it replaces
+ * any prior selection. Persists to `user_defined_deal_measures` with
+ * `source = "pibi_ordered"` and pushes back to HubSpot under
+ * `measures_for_pibi_ordered`. See `selectPibiMeasures` for the full
+ * contract.
+ *
+ * Body:
+ *   { dealId: string, measureNames: string[] }
+ *
+ * Response:
+ *   200 { ok: true, hubspotSync: "ok" | "failed", hubspotError? }
+ *   400 { ok: false, error }
+ *   401 / 403 / 404 on auth/role/user errors.
+ */
+export async function POST(
+  req: NextRequest,
+  props: { params: Promise<{ portfolioId: string }> },
+) {
+  const { portfolioId } = await props.params;
+
+  const session = await getServerSession(AuthOptions);
+  if (!session?.user?.email) {
+    return NextResponse.json({ error: "Unauthorised" }, { status: 401 });
+  }
+
+  let body: unknown;
+  try {
+    body = await req.json();
+  } catch {
+    return NextResponse.json({ error: "Invalid JSON" }, { status: 400 });
+  }
+
+  const parsed = postSchema.safeParse(body);
+  if (!parsed.success) {
+    return NextResponse.json(
+      { error: parsed.error.flatten() },
+      { status: 400 },
+    );
+  }
+
+  const { dealId, measureNames } = parsed.data;
+
+  const userRow = await db
+    .select({ id: user.id })
+    .from(user)
+    .where(eq(user.email, session.user.email))
+    .limit(1);
+
+  if (!userRow[0]) {
+    return NextResponse.json({ error: "User not found" }, { status: 404 });
+  }
+
+  // Caller must be a portfolio member AND have the approver capability.
+  const portfolioUserRow = await db
+    .select({ role: portfolioUsers.role })
+    .from(portfolioUsers)
+    .where(
+      and(
+        eq(portfolioUsers.portfolioId, BigInt(portfolioId)),
+        eq(portfolioUsers.userId, userRow[0].id),
+      ),
+    )
+    .limit(1);
+
+  if (!portfolioUserRow[0]?.role) {
+    return NextResponse.json(
+      { error: "No portfolio access" },
+      { status: 403 },
+    );
+  }
+
+  const capabilityRows = await db
+    .select({ capability: portfolioCapabilities.capability })
+    .from(portfolioCapabilities)
+    .where(
+      and(
+        eq(portfolioCapabilities.portfolioId, BigInt(portfolioId)),
+        eq(portfolioCapabilities.userId, userRow[0].id),
+      ),
+    );
+  const capabilities = capabilityRows.map((r) => r.capability);
+  if (!capabilities.includes("approver")) {
+    return NextResponse.json(
+      { error: "Approver capability required" },
+      { status: 403 },
+    );
+  }
+
+  try {
+    const result = await selectPibiMeasures({
+      dealId,
+      measureNames,
+      userId: userRow[0].id,
+    });
+
+    if (!result.ok) {
+      return NextResponse.json({ ok: false, error: result.error }, {
+        status: 400,
+      });
+    }
+    return NextResponse.json({
+      ok: true,
+      hubspotSync: result.hubspotSync,
+      hubspotError: result.hubspotError,
+    });
+  } catch (err) {
+    console.error("[pibi-measures POST]", err);
+    return NextResponse.json(
+      { error: "Internal server error" },
+      { status: 500 },
+    );
+  }
+}

From 240b633928e7a70f03290b7ee5daf1adcb5291e2 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 19:14:33 +0000
Subject: [PATCH 23/25] add PIBI measure selector to property drawer

Adds PibiMeasureSelector component (issue #254) inside the drawer's
PIBI section. Approvers see a checkbox multi-select listing proposed +
instructed measures; approved measures are pre-ticked. Non-approvers
retain the existing read-only chip list. Saves via POST
/api/portfolio/[portfolioId]/pibi-measures and invalidates the query
cache on success.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../live/PropertyDetailDrawer.tsx             | 273 ++++++++++++++++--
 1 file changed, 254 insertions(+), 19 deletions(-)

diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
index a9d807f..daeb4c6 100644
--- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyDetailDrawer.tsx
@@ -1112,6 +1112,230 @@ function DomnaEditor({
   );
 }
 
+// -----------------------------------------------------------------------
+// PIBI measure selector — approver-only multi-select listing all measures
+// associated with the deal (proposed + instructed). Approved measures are
+// pre-ticked. The user can freely tick/untick; no hard block (issue #254).
+// -----------------------------------------------------------------------
+interface PibiMeasureSelectorProps {
+  dealId: string;
+  portfolioId: string;
+  /** Proposed measures parsed from the deal row. */
+  proposedMeasures: string[];
+  /** True when the user has the approver capability. */
+  canEdit: boolean;
+}
+
+function PibiMeasureSelector({
+  dealId,
+  portfolioId,
+  proposedMeasures,
+  canEdit,
+}: PibiMeasureSelectorProps) {
+  const queryClient = useQueryClient();
+
+  // Fetch current PIBI selection, approved measures, and instructed measures.
+  const { data, isLoading } = useQuery<{
+    pibiMeasures: string[];
+    approvedMeasures: string[];
+    instructedMeasures: string[];
+  }>({
+    queryKey: ["pibiMeasures", portfolioId, dealId],
+    queryFn: async () => {
+      const res = await fetch(
+        `/api/portfolio/${portfolioId}/pibi-measures?dealId=${encodeURIComponent(dealId)}`,
+      );
+      if (!res.ok) throw new Error("Failed to fetch PIBI measures");
+      return res.json();
+    },
+    staleTime: 30_000,
+  });
+
+  // All measures to display: union of proposed + instructed (de-duped).
+  const allMeasures = useMemo(() => {
+    const instructed = data?.instructedMeasures ?? [];
+    const all = [...proposedMeasures];
+    for (const m of instructed) {
+      if (!all.includes(m)) all.push(m);
+    }
+    return all;
+  }, [proposedMeasures, data?.instructedMeasures]);
+
+  // Local selection state — initialised from server data once loaded.
+  const [selected, setSelected] = useState<Set<string>>(new Set());
+  const [initialised, setInitialised] = useState(false);
+  const [submitting, setSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  // Re-initialise when the deal changes or server data arrives.
+  useEffect(() => {
+    if (!data) return;
+    // Pre-tick: current pibi_ordered rows if any, otherwise approved measures.
+    const initial =
+      data.pibiMeasures.length > 0
+        ? data.pibiMeasures
+        : data.approvedMeasures;
+    setSelected(new Set(initial));
+    setInitialised(true);
+    setError(null);
+  }, [dealId, data]);
+
+  function toggleMeasure(measure: string) {
+    setSelected((prev) => {
+      const next = new Set(prev);
+      if (next.has(measure)) {
+        next.delete(measure);
+      } else {
+        next.add(measure);
+      }
+      return next;
+    });
+  }
+
+  async function handleSave() {
+    setSubmitting(true);
+    setError(null);
+    const measureNames = Array.from(selected);
+    try {
+      const res = await fetch(
+        `/api/portfolio/${portfolioId}/pibi-measures`,
+        {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ dealId, measureNames }),
+        },
+      );
+      if (!res.ok) {
+        const json = await res.json().catch(() => ({}));
+        setError(
+          typeof json.error === "string"
+            ? json.error
+            : "Failed to save PIBI selections",
+        );
+        return;
+      }
+      const json = (await res.json()) as {
+        ok: boolean;
+        hubspotSync?: "ok" | "failed";
+        hubspotError?: string;
+      };
+      if (json.hubspotSync === "failed") {
+        setError(
+          json.hubspotError
+            ? `Saved locally — HubSpot sync failed: ${json.hubspotError}`
+            : "Saved locally — HubSpot sync failed",
+        );
+      }
+      queryClient.invalidateQueries({
+        queryKey: ["pibiMeasures", portfolioId, dealId],
+      });
+    } catch (err) {
+      setError(
+        err instanceof Error ? err.message : "Failed to save PIBI selections",
+      );
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  if (!canEdit) return null;
+
+  if (isLoading || !initialised) {
+    return (
+      <p
+        data-testid="pibi-selector-loading"
+        className="text-xs text-gray-400 py-2"
+      >
+        Loading…
+      </p>
+    );
+  }
+
+  if (allMeasures.length === 0) {
+    return (
+      <p className="text-xs text-gray-400 py-2">
+        No measures associated with this deal yet.
+      </p>
+    );
+  }
+
+  return (
+    <div className="space-y-3">
+      <p className="text-xs text-gray-500 font-medium">PIBI Measure Selection</p>
+      <div
+        data-testid="pibi-measure-selector"
+        className="flex flex-wrap gap-2"
+      >
+        {allMeasures.map((measure) => {
+          const checked = selected.has(measure);
+          const isApproved = (data?.approvedMeasures ?? []).includes(measure);
+          return (
+            <label
+              key={measure}
+              data-testid={`pibi-measure-option-${measure}`}
+              className={`flex items-center gap-1.5 cursor-pointer px-2.5 py-1 rounded-full text-xs border transition-colors ${
+                checked
+                  ? "bg-brandblue/10 border-brandblue/40 text-brandblue font-medium"
+                  : "bg-gray-50 border-gray-200 text-gray-600 hover:bg-gray-100"
+              }`}
+            >
+              <input
+                type="checkbox"
+                className="sr-only"
+                checked={checked}
+                onChange={() => toggleMeasure(measure)}
+                disabled={submitting}
+                data-testid={`pibi-measure-checkbox-${measure}`}
+              />
+              <span
+                className={`w-3 h-3 rounded-sm border flex items-center justify-center shrink-0 ${
+                  checked
+                    ? "bg-brandblue border-brandblue"
+                    : "bg-white border-gray-300"
+                }`}
+              >
+                {checked && (
+                  <svg viewBox="0 0 10 8" className="w-2 h-2 fill-white">
+                    <path d="M1 4l3 3 5-6" stroke="white" strokeWidth="1.5" fill="none" strokeLinecap="round" strokeLinejoin="round" />
+                  </svg>
+                )}
+              </span>
+              {measure}
+              {isApproved && (
+                <span className="text-[10px] text-emerald-600 font-semibold ml-0.5">
+                  ✓
+                </span>
+              )}
+            </label>
+          );
+        })}
+      </div>
+      <div className="flex items-center justify-between gap-3">
+        <p className="text-[11px] text-gray-400">
+          Tick measures going for PIBI. Approved measures are pre-ticked (✓).
+        </p>
+        <button
+          type="button"
+          data-testid="pibi-selector-save"
+          onClick={handleSave}
+          disabled={submitting}
+          className="text-xs font-medium px-3 py-1.5 rounded-lg bg-brandblue text-white hover:bg-brandmidblue disabled:opacity-50 transition-colors"
+        >
+          {submitting ? "Saving…" : "Save PIBI Selections"}
+        </button>
+      </div>
+      {error && (
+        <p
+          data-testid="pibi-selector-error"
+          className="text-xs text-red-600 bg-red-50 px-3 py-2 rounded-lg"
+        >
+          {error}
+        </p>
+      )}
+    </div>
+  );
+}
+
 // -----------------------------------------------------------------------
 // Instruct measure editor — approver-only form to instruct an out-of-band
 // measure that the coordinator did not propose (issue #253).
@@ -1462,7 +1686,7 @@ export default function PropertyDetailDrawer({
                 </div>
               </div>
 
-              {/* PIBI section — editable date pickers for write+ users (issue #252) */}
+              {/* PIBI section — date pickers (issue #252) + measure selector (issue #254) */}
               <div ref={(el) => { sectionRefs.current.pibi = el; }}>
                 <SectionHeader id="pibi" label={SECTION_TITLES.pibi} />
                 <div className="space-y-3">
@@ -1473,24 +1697,35 @@ export default function PropertyDetailDrawer({
                     initialCompletedDate={deal.pibiCompletedDate}
                     canEdit={WRITE_ROLES.includes(userRole)}
                   />
-                  {pibiMeasures.length > 0 && (
-                    <div className="divide-y divide-gray-50">
-                      <InfoRow
-                        label="Measures for PIBI"
-                        value={
-                          <span className="flex flex-wrap gap-1.5">
-                            {pibiMeasures.map((m) => (
-                              <span
-                                key={m}
-                                className="px-2 py-0.5 rounded-full text-[11px] bg-gray-50 border border-gray-200 text-gray-600"
-                              >
-                                {m}
-                              </span>
-                            ))}
-                          </span>
-                        }
-                      />
-                    </div>
+                  {/* Approver-only PIBI measure selector (issue #254). Non-approvers
+                      still see the static read-only chip list from the deal row. */}
+                  {userCapability.includes("approver") ? (
+                    <PibiMeasureSelector
+                      dealId={deal.dealId}
+                      portfolioId={portfolioId}
+                      proposedMeasures={parseMeasures(deal.proposedMeasures ?? null)}
+                      canEdit
+                    />
+                  ) : (
+                    pibiMeasures.length > 0 && (
+                      <div className="divide-y divide-gray-50">
+                        <InfoRow
+                          label="Measures for PIBI"
+                          value={
+                            <span className="flex flex-wrap gap-1.5">
+                              {pibiMeasures.map((m) => (
+                                <span
+                                  key={m}
+                                  className="px-2 py-0.5 rounded-full text-[11px] bg-gray-50 border border-gray-200 text-gray-600"
+                                >
+                                  {m}
+                                </span>
+                              ))}
+                            </span>
+                          }
+                        />
+                      </div>
+                    )
                   )}
                 </div>
               </div>

From 176773344199be8b33677f5ecff0cd838393cdb8 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 19:15:05 +0000
Subject: [PATCH 24/25] add vitest unit tests for pibi-selection service

Covers: happy path (tx committed, HubSpot called with
measures_for_pibi_ordered, pushed_at stamped), empty selection,
no approval rows touched, DB failure (ok=false, no HubSpot call),
HubSpot failure (pushed_at null), correct property name assertion.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/app/lib/selectPibiMeasures.test.ts | 194 +++++++++++++++++++++++++
 1 file changed, 194 insertions(+)
 create mode 100644 src/app/lib/selectPibiMeasures.test.ts

diff --git a/src/app/lib/selectPibiMeasures.test.ts b/src/app/lib/selectPibiMeasures.test.ts
new file mode 100644
index 0000000..ae228e5
--- /dev/null
+++ b/src/app/lib/selectPibiMeasures.test.ts
@@ -0,0 +1,194 @@
+/**
+ * Unit tests for the PIBI-selection service (issue #254).
+ *
+ * These tests exercise the orchestration logic — DB transaction +
+ * post-commit HubSpot push — by injecting lightweight fakes for the DB
+ * hooks. The tests never touch the real DB or HubSpot client.
+ *
+ * Key properties verified:
+ *   - Happy path: rows inserted, HubSpot push called with correct property,
+ *     pushed_at stamped.
+ *   - No approval rows are created or modified.
+ *   - Sync semantics: pushed_at null when HubSpot fails.
+ *   - DB failure: returns ok=false, no HubSpot call.
+ *   - Empty selection: clears all rows and pushes an empty list.
+ */
+import { describe, expect, it, vi } from "vitest";
+import {
+  PIBI_MEASURES_PROP,
+  selectPibiMeasures,
+} from "./selectPibiMeasures";
+import type {
+  RunPibiTx,
+  StampPushedAt,
+  SyncMeasuresField,
+} from "./selectPibiMeasures";
+
+function makeDeps(overrides?: {
+  txResult?: { insertedRowIds: bigint[] };
+  txError?: Error;
+  syncResult?: { ok: true } | { ok: false; error: string };
+  stampError?: Error;
+}) {
+  const txResult = overrides?.txResult ?? { insertedRowIds: [1n, 2n] };
+
+  const runPibiTx: RunPibiTx = vi.fn(async () => {
+    if (overrides?.txError) throw overrides.txError;
+    return txResult;
+  });
+
+  const syncMeasuresField: SyncMeasuresField = vi.fn(async () => {
+    return overrides?.syncResult ?? ({ ok: true } as const);
+  });
+
+  const stampPushedAt: StampPushedAt = vi.fn(async () => {
+    if (overrides?.stampError) throw overrides.stampError;
+  });
+
+  return { runPibiTx, syncMeasuresField, stampPushedAt };
+}
+
+describe("selectPibiMeasures — happy path", () => {
+  it("commits the tx, pushes to HubSpot under the PIBI property, stamps pushed_at", async () => {
+    const deps = makeDeps({
+      txResult: { insertedRowIds: [10n, 11n] },
+    });
+
+    const result = await selectPibiMeasures({
+      dealId: "deal-1",
+      measureNames: ["ASHP", "Solar PV"],
+      userId: 5n,
+      deps,
+    });
+
+    expect(result).toMatchObject({
+      ok: true,
+      insertedRowIds: [10n, 11n],
+      hubspotSync: "ok",
+    });
+
+    expect(deps.runPibiTx).toHaveBeenCalledWith({
+      dealId: "deal-1",
+      measureNames: ["ASHP", "Solar PV"],
+      userId: 5n,
+    });
+
+    // Must push to the PIBI property specifically, not instructed_measures.
+    expect(deps.syncMeasuresField).toHaveBeenCalledTimes(1);
+    expect(deps.syncMeasuresField).toHaveBeenCalledWith({
+      hubspotDealId: "deal-1",
+      propName: PIBI_MEASURES_PROP,
+      measureNames: ["ASHP", "Solar PV"],
+    });
+
+    expect(deps.stampPushedAt).toHaveBeenCalledWith([10n, 11n]);
+  });
+
+  it("handles an empty selection — clears rows and pushes an empty list", async () => {
+    const deps = makeDeps({
+      txResult: { insertedRowIds: [] },
+    });
+
+    const result = await selectPibiMeasures({
+      dealId: "deal-2",
+      measureNames: [],
+      userId: 3n,
+      deps,
+    });
+
+    expect(result).toMatchObject({
+      ok: true,
+      insertedRowIds: [],
+      hubspotSync: "ok",
+    });
+
+    expect(deps.syncMeasuresField).toHaveBeenCalledWith({
+      hubspotDealId: "deal-2",
+      propName: PIBI_MEASURES_PROP,
+      measureNames: [],
+    });
+
+    // Nothing to stamp when no rows were inserted.
+    expect(deps.stampPushedAt).toHaveBeenCalledWith([]);
+  });
+});
+
+describe("selectPibiMeasures — no approval rows touched", () => {
+  it("never calls any approval-related function", async () => {
+    // The deps object only exposes pibi-specific hooks; if the service
+    // called any approval function it would have to import it separately.
+    // We simply confirm the service returns ok=true and only the three
+    // expected hooks were invoked — no approval side-effects possible.
+    const deps = makeDeps();
+    const result = await selectPibiMeasures({
+      dealId: "deal-3",
+      measureNames: ["EWI"],
+      userId: 1n,
+      deps,
+    });
+    expect(result.ok).toBe(true);
+    // Only these three hooks should exist / be called.
+    expect(Object.keys(deps)).toEqual(["runPibiTx", "syncMeasuresField", "stampPushedAt"]);
+  });
+});
+
+describe("selectPibiMeasures — DB transaction failure", () => {
+  it("returns ok=false and skips HubSpot when the tx throws", async () => {
+    const deps = makeDeps({ txError: new Error("insert failed") });
+
+    const result = await selectPibiMeasures({
+      dealId: "deal-x",
+      measureNames: ["ASHP"],
+      userId: 1n,
+      deps,
+    });
+
+    expect(result).toEqual({ ok: false, error: "insert failed" });
+    expect(deps.syncMeasuresField).not.toHaveBeenCalled();
+    expect(deps.stampPushedAt).not.toHaveBeenCalled();
+  });
+});
+
+describe("selectPibiMeasures — HubSpot push failure leaves pushed_at null", () => {
+  it("returns ok=true with hubspotSync=failed and does NOT stamp pushed_at", async () => {
+    const deps = makeDeps({
+      txResult: { insertedRowIds: [20n] },
+      syncResult: { ok: false, error: "hubspot 503" },
+    });
+
+    const result = await selectPibiMeasures({
+      dealId: "deal-h",
+      measureNames: ["CWI"],
+      userId: 2n,
+      deps,
+    });
+
+    expect(result).toMatchObject({
+      ok: true,
+      insertedRowIds: [20n],
+      hubspotSync: "failed",
+      hubspotError: "hubspot 503",
+    });
+
+    // DB was committed (tx called) but pushed_at NOT stamped.
+    expect(deps.runPibiTx).toHaveBeenCalledTimes(1);
+    expect(deps.stampPushedAt).not.toHaveBeenCalled();
+  });
+});
+
+describe("selectPibiMeasures — sync called with correct property name", () => {
+  it("always passes measures_for_pibi_ordered as propName, never instructed_measures", async () => {
+    const deps = makeDeps();
+    await selectPibiMeasures({
+      dealId: "deal-prop",
+      measureNames: ["Loft insulation", "CWI"],
+      userId: 7n,
+      deps,
+    });
+
+    const callArg = (deps.syncMeasuresField as ReturnType<typeof vi.fn>).mock
+      .calls[0][0] as { propName: string };
+    expect(callArg.propName).toBe("measures_for_pibi_ordered");
+    expect(callArg.propName).not.toBe("instructed_measures");
+  });
+});

From 084391b9dc52b2b869c3c389505445359783fbef Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Tue, 5 May 2026 19:15:35 +0000
Subject: [PATCH 25/25] add cypress spec for pibi-measure selection flow

Verifies that an approver can open the drawer, tick/untick PIBI
measures, save the selection, and that the POST to pibi-measures route
(which pushes measures_for_pibi_ordered to HubSpot) is intercepted with
the correct payload. Uses cy.intercept stubs for both GET and POST.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 cypress/e2e/live-tracking/pibi-measures.cy.js | 161 ++++++++++++++++++
 1 file changed, 161 insertions(+)
 create mode 100644 cypress/e2e/live-tracking/pibi-measures.cy.js

diff --git a/cypress/e2e/live-tracking/pibi-measures.cy.js b/cypress/e2e/live-tracking/pibi-measures.cy.js
new file mode 100644
index 0000000..59afbe2
--- /dev/null
+++ b/cypress/e2e/live-tracking/pibi-measures.cy.js
@@ -0,0 +1,161 @@
+/**
+ * Live Tracking — PIBI measure selection flow (issue #254)
+ *
+ * Verifies the approver flow for selecting which measures on a deal go for
+ * PIBI:
+ *   1. the approver opens the property drawer at the PIBI section,
+ *   2. ticks and unticks measures in the multi-select,
+ *   3. saves the selection — the drawer reflects the ticked state,
+ *   4. the POST hits the pibi-measures route which pushes
+ *      `measures_for_pibi_ordered` back to HubSpot.
+ *
+ * Mirrors `instruct-measure.cy.js`. The spec uses `cy.intercept` so the
+ * HubSpot push side-effect is observable without a real CRM round-trip.
+ */
+
+const PORTFOLIO_SLUG = Cypress.env("LIVE_PORTFOLIO_SLUG");
+const TARGET_DEAL_NAME = Cypress.env("LIVE_PIBI_DEAL_NAME");
+
+describe("PIBI measure selection — approver flow", function () {
+  before(function () {
+    if (!PORTFOLIO_SLUG) {
+      cy.log(
+        "LIVE_PORTFOLIO_SLUG env var not set — skipping live tracking specs",
+      );
+      this.skip();
+    }
+  });
+
+  function openDrawerAtPibiSection() {
+    cy.visit(`/portfolio/${PORTFOLIO_SLUG}/your-projects/live`);
+
+    // Open a property row to get the detail drawer.
+    cy.contains("button, [role=tab]", "Measures").click();
+
+    if (TARGET_DEAL_NAME) {
+      cy.contains("[data-testid=measures-row]", TARGET_DEAL_NAME).click();
+    } else {
+      cy.get("[data-testid=measures-row]").first().click();
+    }
+
+    cy.get("[data-testid=property-detail-drawer]").should("be.visible");
+
+    // Scroll to the PIBI section.
+    cy.get("[data-testid=drawer-section-pibi]").should("exist").scrollIntoView();
+  }
+
+  it("fetches the PIBI state and shows the multi-select for approvers", () => {
+    // Stub the GET so we control the initial state.
+    cy.intercept(
+      "GET",
+      `/api/portfolio/*/pibi-measures*`,
+      {
+        body: {
+          pibiMeasures: ["ASHP"],
+          approvedMeasures: ["ASHP", "Solar PV"],
+          instructedMeasures: [],
+        },
+      },
+    ).as("getPibiMeasures");
+
+    openDrawerAtPibiSection();
+
+    cy.wait("@getPibiMeasures");
+
+    // The multi-select should be visible for approvers.
+    cy.get("[data-testid=pibi-measure-selector]").should("be.visible");
+
+    // ASHP should be checked (was in pibiMeasures).
+    cy.get("[data-testid=pibi-measure-checkbox-ASHP]").should(
+      "be.checked",
+    );
+  });
+
+  it("lets an approver tick/untick selections and POST to the route", () => {
+    // Stub GET to return a clean state.
+    cy.intercept(
+      "GET",
+      `/api/portfolio/*/pibi-measures*`,
+      {
+        body: {
+          pibiMeasures: [],
+          approvedMeasures: ["ASHP", "Solar PV"],
+          instructedMeasures: [],
+        },
+      },
+    ).as("getPibiMeasures");
+
+    // Intercept the POST so we can assert the body.
+    cy.intercept(
+      "POST",
+      `/api/portfolio/*/pibi-measures`,
+    ).as("savePibiMeasures");
+
+    openDrawerAtPibiSection();
+
+    cy.wait("@getPibiMeasures");
+
+    cy.get("[data-testid=pibi-measure-selector]").should("be.visible");
+
+    // Both approved measures (ASHP, Solar PV) should be pre-ticked since
+    // pibiMeasures was empty and approvedMeasures had values.
+    cy.get("[data-testid=pibi-measure-checkbox-ASHP]").should("be.checked");
+    cy.get("[data-testid=pibi-measure-checkbox-Solar PV]").should("be.checked");
+
+    // Untick ASHP.
+    cy.get("[data-testid=pibi-measure-option-ASHP]").click();
+    cy.get("[data-testid=pibi-measure-checkbox-ASHP]").should("not.be.checked");
+
+    // Save the selection.
+    cy.get("[data-testid=pibi-selector-save]").click();
+
+    cy.wait("@savePibiMeasures").then((intercepted) => {
+      // Body should reflect the new selection (Solar PV only).
+      expect(intercepted.request.body).to.have.property("dealId");
+      expect(intercepted.request.body.measureNames).to.include("Solar PV");
+      expect(intercepted.request.body.measureNames).not.to.include("ASHP");
+
+      // Route returns ok=true.
+      expect(intercepted.response.statusCode).to.be.oneOf([200, 201]);
+      expect(intercepted.response.body).to.have.property("ok", true);
+      expect(intercepted.response.body).to.have.property(
+        "hubspotSync",
+      );
+    });
+
+    // No error banner visible.
+    cy.get("[data-testid=pibi-selector-error]").should("not.exist");
+  });
+
+  it("pushes measures_for_pibi_ordered to HubSpot on a successful save", () => {
+    cy.intercept(
+      "GET",
+      `/api/portfolio/*/pibi-measures*`,
+      {
+        body: {
+          pibiMeasures: ["CWI"],
+          approvedMeasures: ["CWI"],
+          instructedMeasures: [],
+        },
+      },
+    ).as("getPibiMeasures");
+
+    // Stub the POST to confirm the property pushed.
+    cy.intercept("POST", `/api/portfolio/*/pibi-measures`, {
+      body: { ok: true, hubspotSync: "ok" },
+    }).as("savePibiMeasures");
+
+    openDrawerAtPibiSection();
+
+    cy.wait("@getPibiMeasures");
+
+    cy.get("[data-testid=pibi-selector-save]").click();
+
+    cy.wait("@savePibiMeasures").then((intercepted) => {
+      // Confirm the POST body contains the right measures.
+      expect(intercepted.request.body).to.have.property("measureNames");
+      // Response signals a successful HubSpot push.
+      expect(intercepted.response.body.hubspotSync).to.equal("ok");
+    });
+  });
+});