Merge branch 'main' of https://github.com/Hestia-Homes/assessment-model into feature/solar-map

src/app/db/migrations/0165_small_khan.sql

@@ -0,0 +1,3 @@
+ALTER TYPE "public"."file_source" ADD VALUE 'ecmk';--> statement-breakpoint
+ALTER TYPE "public"."file_type" ADD VALUE 'ecmk_site_note';--> statement-breakpoint
+ALTER TYPE "public"."file_type" ADD VALUE 'ecmk_rd_sap_site_note';

src/app/db/migrations/0166_melodic_crusher_hogan.sql

@@ -0,0 +1 @@
+ALTER TABLE "hubspot_deal_data" ADD COLUMN "coordination_comments" text;

src/app/db/migrations/0167_wise_agent_zero.sql

@@ -0,0 +1 @@
+ALTER TABLE "property_details_epc" ADD COLUMN "environment_impact_current" real;

src/app/db/migrations/meta/_journal.json

@@ -1156,6 +1156,27 @@
       "when": 1775310006908,
       "tag": "0164_high_sumo",
       "breakpoints": true
+    },
+    {
+      "idx": 165,
+      "version": "7",
+      "when": 1775577933185,
+      "tag": "0165_small_khan",
+      "breakpoints": true
+    },
+    {
+      "idx": 166,
+      "version": "7",
+      "when": 1775658752820,
+      "tag": "0166_melodic_crusher_hogan",
+      "breakpoints": true
+    },
+    {
+      "idx": 167,
+      "version": "7",
+      "when": 1775747945070,
+      "tag": "0167_wise_agent_zero",
+      "breakpoints": true
     }
   ]
 }

src/app/db/schema/crm/hubspot_deal_table.ts

@@ -43,6 +43,7 @@ export const hubspotDealData = pgTable("hubspot_deal_data", {
   measuresLodgementDate: timestamp("measures_lodgement_date", { precision: 6, withTimezone: true }),
   lodgementDate: timestamp("lodgement_date", { precision: 6, withTimezone: true }),
   expectedCommencementDate: timestamp("expected_commencement_date", { precision: 6, withTimezone: true }),
+  coordination_comments: text("coordination_comments"),
   surveyor: text("surveyor"),
   damnpMouldAndRepairComments: text("damp_mould_and_repairs_comments"),
   confirmedSurveyDate: timestamp("confirmed_survey_date", { precision: 6, withTimezone: true }),

src/app/db/schema/property.ts

@@ -269,6 +269,8 @@ export const propertyDetailsEpc = pgTable(
     lodgedCo2Emissions: real("lodged_co2_emissions"),
     lodgedHeatDemand: real("lodged_heat_demand"),
     hasBeenRemodelled: boolean("has_been_remodelled").default(false),
+    // additional fields
+    environment_impact_current: real("environment_impact_current"),
   },
   (table) => [
     uniqueIndex("uq_property_details_epc_property_portfolio").on(

src/app/db/schema/uploaded_files.ts

@@ -9,13 +9,16 @@ export const fileType = pgEnum("file_type", [
   "pas_significance",
   "par_photo_pack",
   "pas_2023_property",
-  "pas_2023_occupancy"
+  "pas_2023_occupancy",
+  "ecmk_site_note",
+  "ecmk_rd_sap_site_note"
 ]);
 
 export const fileSource = pgEnum("file_source", [
   "pas hub",
   "sharepoint",
-  "hubspot"
+  "hubspot",
+  "ecmk"
 ]);
 
 export const uploadedFiles = pgTable(