From 7b99d0497f1d5e8011a43f7b40949981a32f1d5d Mon Sep 17 00:00:00 2001 From: Jun-te Kim Date: Thu, 3 Apr 2025 21:29:56 +0000 Subject: [PATCH] add current work --- etl/jjc_invoice.py | 8 ++++---- etl/osmosis_monday_to_sharepoint_automation.py | 9 ++++++++- etl/scraper/scraper.py | 2 ++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/etl/jjc_invoice.py b/etl/jjc_invoice.py index 4573090..744f64a 100644 --- a/etl/jjc_invoice.py +++ b/etl/jjc_invoice.py @@ -58,14 +58,14 @@ def work_out_total_floor_area(pre_site_note): floor_area = math.ceil(total) if total%1 >=0.5 else math.floor(total) if 0 <= floor_area <= 72: return '0-72m', floor_area - elif 73 <= floor_area <= 97: + elif 72 < floor_area <= 97: return '73-97m', floor_area - elif 98 <= floor_area <= 199: + elif 97 < floor_area <= 199: return '98-199m', floor_area - elif floor_area >= 200: + elif 199 <= floor_area: return 'over 200m', floor_area else: - return 'Invalid floor area', floor_area + raise NotImplementedError(f"unknown floor area {floor_area} {pre_site_note.summary_information.address}") def fuzzy_match_address(row, target_address, threshold=90): return fuzz.ratio(row, target_address) >= threshold diff --git a/etl/osmosis_monday_to_sharepoint_automation.py b/etl/osmosis_monday_to_sharepoint_automation.py index 9d79da9..a4b344b 100644 --- a/etl/osmosis_monday_to_sharepoint_automation.py +++ b/etl/osmosis_monday_to_sharepoint_automation.py @@ -1,3 +1,10 @@ # Make a a folder in a new directory from a string # Great time to work out asynchrnous functionality if i have time -print("Hello world") \ No newline at end of file +from etl.scraper.scraper import SharePointInstaller +from etl.scraper.scraper import SharePointScraper + + + + +a = SharePointScraper(SharePointInstaller.JJC) + diff --git a/etl/scraper/scraper.py b/etl/scraper/scraper.py index c800b05..37a9aab 100644 --- a/etl/scraper/scraper.py +++ b/etl/scraper/scraper.py @@ -19,10 +19,12 @@ def previous_monday(): WEEK_COMMENCING = os.getenv("WEEK_COMMENCING", previous_monday()) class SharePointInstaller(Enum): + # https//{tenant}.sharepoint.com/sites/{site}/_api/site/id SOUTH_COAST_INSULATION = os.getenv("SOUTH_COAST_INSULATION_SERVICE_SHAREPOINT_ID", None) JJC = os.getenv("JJC_SERVICE_SHAREPOINT_ID", None) SGEC = os.getenv("SGEC_SERVICE_SHAREPOINT_ID", None) BAXTER_KELLY = os.getenv("BAXTER_KELLY_SERVICE_SHAREPOINT_ID", None) + DOMNA = os.getenv("DOMNA_SHAREPOINT_ID", "8ab64924-ccde-4b56-b0dc-4e11596446e4") class SharePointScraper(): """