diff --git a/etl/pdfReader/sitenotes.py b/etl/pdfReader/sitenotes.py index dde575e..3995248 100644 --- a/etl/pdfReader/sitenotes.py +++ b/etl/pdfReader/sitenotes.py @@ -75,6 +75,8 @@ class ConditionReport(SiteNotesExtractor): def get_property_reference_code(self): print("hello world") + pprint(self.raw_data) + diff --git a/etl/transform/conditionReportTypes.py b/etl/transform/conditionReportTypes.py index f857008..ca74a6a 100644 --- a/etl/transform/conditionReportTypes.py +++ b/etl/transform/conditionReportTypes.py @@ -2,17 +2,20 @@ from etl.transform.preSiteNoteTypes import BaseModel, Optional, List class AssessorInformation(BaseModel): - assessor_name: str - assessor_id: str + assessor_name_and_id: str + elmhurst_id: str class InspectionAndProject(BaseModel): inspection_date: str risk_assessment_pathway: str class TheProperty(BaseModel): - property_address: str - is_the_building_classed_as_protected: bool - type_of_proerty: str + classification_type: str + orientation_front_elevation: str + orientation_in_degrees_front_elevation: str + house_type: str + exposure_zone: str + main_wall_constructions: str class GeneralInformation(BaseModel): assessor: AssessorInformation @@ -226,6 +229,9 @@ class VentilationChecklist(BaseModel): class ConditionReport(BaseModel): property_reference_code: str + property_site_name: str + property_address: str + postcode: str general_information: GeneralInformation access_and_elevation: AccessAndElevations rooms: List[Rooms] diff --git a/frontend/.env.development b/frontend/.env.development index d7b3b3b..ce988a6 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -1 +1,2 @@ -DATABASE_URL=postgresql://postgres:makingwarmhomes@db:5432/postgres \ No newline at end of file +# DATABASE_URL=postgresql://postgres:makingwarmhomes@db:5432/postgres +DATABASE_URL=postgresql://postgres:makingwarmhomes@terraform-20250331175522503500000002.cdgzupxvdyp0.eu-west-2.rds.amazonaws.com:5432/surveyDB \ No newline at end of file