diff --git a/etl/MonthEndUploader.py b/etl/MonthEndUploader.py index 6d0f97e..0afa353 100644 --- a/etl/MonthEndUploader.py +++ b/etl/MonthEndUploader.py @@ -22,3 +22,21 @@ def upload_to_month_end_folder(file_name_on_sp, local_file_path, add_to_path): print("Uploading to sharepoint...") sharepoint.upload_file(local_file_path, sharepoint_path, file_name_on_sp) print(f"Finished upload of {local_file_path} to sharepoint. It's found under {sharepoint_path}/{file_name_on_sp}") + + +def upload_to_nick_folder(file_name_on_sp, local_file_path, add_to_path=None): + sharepoint = SharePointScraper(SharePointInstaller.OSMOSIS_WAVE_2) + + parent_folder = "General/Junte Kim/For Nick" + today = datetime.today() + formatted_date = today.strftime("%Y-%m-%d%H-%M-S") + + sharepoint.create_dir(formatted_date, parent_folder) + sharepoint_path = parent_folder + "/" + formatted_date + if add_to_path: + sharepoint.create_dir(add_to_path, sharepoint_path) + sharepoint_path += "/" + add_to_path + + print("Uploading to sharepoint...") + sharepoint.upload_file(local_file_path, sharepoint_path, file_name_on_sp) + print(f"Finished upload of {local_file_path} to sharepoint. It's found under {sharepoint_path}/{file_name_on_sp}") diff --git a/etl/sharepoint_installer_data_gatherer.py b/etl/sharepoint_installer_data_gatherer.py index 1cf2d48..d612c6f 100644 --- a/etl/sharepoint_installer_data_gatherer.py +++ b/etl/sharepoint_installer_data_gatherer.py @@ -5,6 +5,7 @@ os.environ["SHAREPOINT_TENANT_ID"] = "10d5af8b-2cfd-4882-9ccd-b96e4812dacf" from etl.scraper.scraper import SharePointScraper, SharePointInstaller from etl.fileReader.pdfReaderToText import pdfReaderToText import pandas as pd +from MonthEndUploader import upload_to_nick_folder sharepoint = SharePointScraper(SharePointInstaller.NEW_JJC) file_paths = sharepoint.download_file_for_each_address() @@ -55,11 +56,30 @@ for eachaddress in all_address_to_work_on: for file in files: pdf = pdfReaderToText(file) if "Summary Information".lower() == pdf.text_list[0].lower(): - potential_sap_rating = f"{pdf.text_list[pdf.text_list.index("Emissions (t/year):")-1]}" - potential_sap_rating = extract_rating(potential_sap_rating) - row = {"address": addressName, "potential sap rating": potential_sap_rating} + current_sap_rating = pdf.text_list[pdf.text_list.index("Current SAP rating:") + 1] + house_no = pdf.text_list[pdf.text_list.index("House No:") + 1] + street = pdf.text_list[pdf.text_list.index("Street:") + 1] + post_code = pdf.text_list[pdf.text_list.index("Postcode:") + 1] + address = f"{house_no} {street.title()}" + floor_area = pdf.text_list[pdf.text_list.index("Lowest Floor:") + 1] + fuel_bill = pdf.text_list[pdf.text_list.index("Fuel Bill:") + 1] + row = { + "address": address, + "postcode": post_code, + "current sap rating": current_sap_rating, + "floor_area ": floor_area, + "fuel_bill ": fuel_bill, + } final_data.append(row) -pd.DataFrame(final_data) \ No newline at end of file +df = pd.DataFrame(final_data) + +file_name = "installer.xlsx" +df.to_excel(file_name, index=False) + +# Get local path +file_path = os.path.abspath(file_name) +upload_to_nick_folder(file_name, file_path) +print(f"File saved at: {file_path}")