From 7b149474ee564fad1c0e6e089d31b5257c292312 Mon Sep 17 00:00:00 2001 From: Jun-te Kim Date: Fri, 14 Mar 2025 09:19:23 +0000 Subject: [PATCH] save work and merge to develop to make dailyscirpt to run@ --- .github/workflows/sharepoint_validator.yml | 12 ++++++++++-- etl/daily_script.py | 4 ++-- etl/scraper/scraper.py | 6 ++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sharepoint_validator.yml b/.github/workflows/sharepoint_validator.yml index cb8a680..fc80d93 100644 --- a/.github/workflows/sharepoint_validator.yml +++ b/.github/workflows/sharepoint_validator.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: jobs: - check_status_code: + sharepoint-validator: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -21,4 +21,12 @@ jobs: - name: run script run: | - bash run_daily_script.sh \ No newline at end of file + bash run_daily_script.sh + env: + SOUTH_COAST_INSULATION_SERVICE_SHAREPOINT_ID: ${{ secrets.SOUTH_COAST_INSULATION_SERVICE_SHAREPOINT_ID }} + JJC_SERVICE_SHAREPOINT_ID: ${{ JJC_SERVICE_SHAREPOINT_ID }} + BAXTER_KELLY_SERVICE_SHAREPOINT_ID: ${{ BAXTER_KELLY_SERVICE_SHAREPOINT_ID }} + SGEC_SERVICE_SHAREPOINT_ID: ${{ SGEC_SERVICE_SHAREPOINT_ID }} + SHAREPOINT_CLIENT_ID: ${{ SHAREPOINT_CLIENT ID}} + SHAREPOINT_CLIENT_SECRET: ${{ SHAREPOINT_CLIENT_SECRET }} + SHAREPOINT_TENANT_ID: ${{ SHAREPOINT_TENANT_ID }} \ No newline at end of file diff --git a/etl/daily_script.py b/etl/daily_script.py index 95e3f16..98fd443 100644 --- a/etl/daily_script.py +++ b/etl/daily_script.py @@ -14,10 +14,10 @@ def main(): """ # Correct dates format checker - south_coast_scraper = SharePointScraper(SharePointInstaller.SOUTH_COAST_INSULATION_SERVICE) + south_coast_scraper = SharePointScraper(SharePointInstaller.SOUTH_COAST_INSULATION) south_coast_names = south_coast_scraper.list_of_names_that_has_the_wrong_date_format() - jjc_scraper = SharePointScraper(SharePointInstaller.JJC_SERVICE) + jjc_scraper = SharePointScraper(SharePointInstaller.JJC) jjc_names = jjc_scraper.list_of_names_that_has_the_wrong_date_format() logger.info("Good morning Cyrus") diff --git a/etl/scraper/scraper.py b/etl/scraper/scraper.py index cc5e99b..de7a9ac 100644 --- a/etl/scraper/scraper.py +++ b/etl/scraper/scraper.py @@ -12,8 +12,10 @@ from etl.validator.validator import DomnaSharePointValidator WEEK_COMMENCING = os.getenv("WEEK_COMMENCING", "W.C. 03.03.2025") class SharePointInstaller(Enum): - SOUTH_COAST_INSULATION_SERVICE = os.getenv("SOUTH_COAST_INSULATION_SERVICE_SHAREPOINT_ID", None) - JJC_SERVICE = os.getenv("JJC_SERVICE_SHAREPOINT_ID", None) + 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) class SharePointScraper(): """