diff --git a/etl/files/osmosis_condition_report.pdf b/etl/files/osmosis_condition_report.pdf index 2205c50..cd33476 100644 Binary files a/etl/files/osmosis_condition_report.pdf and b/etl/files/osmosis_condition_report.pdf differ diff --git a/etl/load/topLevel.py b/etl/load/topLevel.py index 610c2e9..a2e2326 100644 --- a/etl/load/topLevel.py +++ b/etl/load/topLevel.py @@ -34,4 +34,5 @@ class Documents(BaseModel, table=True): target_table: str target_id: uuid.UUID -Documents.update_forward_refs() \ No newline at end of file +Documents.update_forward_refs() + diff --git a/etl/pdfReader/pdfReaderToText.py b/etl/pdfReader/pdfReaderToText.py index e8a1bef..34e37ad 100644 --- a/etl/pdfReader/pdfReaderToText.py +++ b/etl/pdfReader/pdfReaderToText.py @@ -40,7 +40,7 @@ class pdfReaderToText(): self.type = ReportType.ENERGY_PERFORMANCE_REPORT elif "Chartered Surveyor Report: Recommending Extraction of Defective Cavity Wall Insulation " in self.text_list: self.type = ReportType.CHARTED_SURVEYOR_REPORT - elif "Osmosis ACD PAS 2035 Condition Report".lower() in self.text_list[0].lower(): + elif "Osmosis ACD NEW PAS 2035 Condition Report".lower() in self.text_list[0].lower(): self.type = ReportType.OSMOSIS_CONDITION_PAS_2035_REPORT else: pass diff --git a/etl/pdfReader/reportType.py b/etl/pdfReader/reportType.py index 61bc908..a94847a 100644 --- a/etl/pdfReader/reportType.py +++ b/etl/pdfReader/reportType.py @@ -7,4 +7,4 @@ class ReportType(Enum): ENERGY_PERFORMANCE_REPORT = "energy_performance_report" U_VALUE_CALCULATOR_REPORT = "u_value_calculator_report" OVERWRITING_U_VALUE_DECLARATION_FORM = "overwriting_u_value_declaration_form" - OSMOSIS_CONDITION_PAS_2035_REPORT = "osmosis_condition_pas_2035_report" \ No newline at end of file + OSMOSIS_CONDITION_PAS_2035_REPORT = "osmosis_condition_pas_2035_report" diff --git a/etl/transform/conditionReportTypes.py b/etl/transform/conditionReportTypes.py index b7e52ea..f857008 100644 --- a/etl/transform/conditionReportTypes.py +++ b/etl/transform/conditionReportTypes.py @@ -228,7 +228,7 @@ class ConditionReport(BaseModel): property_reference_code: str general_information: GeneralInformation access_and_elevation: AccessAndElevations - rooms: Rooms + rooms: List[Rooms] heating_system: HeatingSystem occupancy_assessment: OccupancyAssessment ventilation_checklist: VentilationChecklist \ No newline at end of file diff --git a/frontend/src/app/db/db.ts b/frontend/src/app/db/db.ts index 08204e9..f9b6771 100644 --- a/frontend/src/app/db/db.ts +++ b/frontend/src/app/db/db.ts @@ -6,4 +6,4 @@ if (!process.env.DATABASE_URL) { } const sqlClient = postgres(process.env.DATABASE_URL); -export const db = drizzle(sqlClient); \ No newline at end of file +export const db = drizzle(sqlClient);