diff --git a/.github/workflows/hubspot_sync.yml b/.github/workflows/hubspot_sync.yml index 67594c9..d3b690f 100644 --- a/.github/workflows/hubspot_sync.yml +++ b/.github/workflows/hubspot_sync.yml @@ -8,6 +8,7 @@ on: jobs: hubspot-sync: runs-on: ubuntu-22.04 + runs-on: [self-hosted, mist] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/hubspot_to_invoice.yml b/.github/workflows/hubspot_to_invoice.yml index 7434f80..c7454ed 100644 --- a/.github/workflows/hubspot_to_invoice.yml +++ b/.github/workflows/hubspot_to_invoice.yml @@ -1,37 +1,37 @@ -name: HubSpot Deals to DB loading and Invoice Calculator -on: - # schedule: - # - cron: '0 19 * * 0' - workflow_dispatch: +# name: HubSpot Deals to DB loading and Invoice Calculator +# on: +# # schedule: +# # - cron: '0 19 * * 0' +# workflow_dispatch: -jobs: - hubspot-deals-to-db: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v3 +# jobs: +# hubspot-deals-to-db: +# runs-on: ubuntu-22.04 +# steps: +# - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.12' +# - name: Set up Python +# uses: actions/setup-python@v4 +# with: +# python-version: '3.12' - - name: Install dependencies - run: | - pip install poetry - poetry install --no-root +# - name: Install dependencies +# run: | +# pip install poetry +# poetry install --no-root - - name: run script - run: | - pwd - ls -la - poetry run python etl/hubspot_to_invoice_rewrite.py - env: - PYTHONPATH: ${{ github.workspace }} - DATABASE_URL: postgresql://postgres:makingwarmhomes@terraform-20250331175522503500000002.cdgzupxvdyp0.eu-west-2.rds.amazonaws.com:5432/surveyDB - SOUTH_COAST_INSULATION_SERVICE_SHAREPOINT_ID: ${{ secrets.SOUTH_COAST_INSULATION_SERVICE_SHAREPOINT_ID }} - JJC_SERVICE_SHAREPOINT_ID: ${{ secrets.JJC_SERVICE_SHAREPOINT_ID }} - BAXTER_KELLY_SERVICE_SHAREPOINT_ID: ${{ secrets.BAXTER_KELLY_SERVICE_SHAREPOINT_ID }} - SGEC_SERVICE_SHAREPOINT_ID: ${{ secrets.SGEC_SERVICE_SHAREPOINT_ID }} - SHAREPOINT_CLIENT_ID: ${{ secrets.SHAREPOINT_CLIENT_ID }} - SHAREPOINT_CLIENT_SECRET: ${{ secrets.SHAREPOINT_CLIENT_SECRET }} - SHAREPOINT_TENANT_ID: ${{ secrets.SHAREPOINT_TENANT_ID }} \ No newline at end of file +# - name: run script +# run: | +# pwd +# ls -la +# poetry run python etl/hubspot_to_invoice_rewrite.py +# env: +# PYTHONPATH: ${{ github.workspace }} +# DATABASE_URL: postgresql://postgres:makingwarmhomes@terraform-20250331175522503500000002.cdgzupxvdyp0.eu-west-2.rds.amazonaws.com:5432/surveyDB +# SOUTH_COAST_INSULATION_SERVICE_SHAREPOINT_ID: ${{ secrets.SOUTH_COAST_INSULATION_SERVICE_SHAREPOINT_ID }} +# JJC_SERVICE_SHAREPOINT_ID: ${{ secrets.JJC_SERVICE_SHAREPOINT_ID }} +# BAXTER_KELLY_SERVICE_SHAREPOINT_ID: ${{ secrets.BAXTER_KELLY_SERVICE_SHAREPOINT_ID }} +# SGEC_SERVICE_SHAREPOINT_ID: ${{ secrets.SGEC_SERVICE_SHAREPOINT_ID }} +# SHAREPOINT_CLIENT_ID: ${{ secrets.SHAREPOINT_CLIENT_ID }} +# SHAREPOINT_CLIENT_SECRET: ${{ secrets.SHAREPOINT_CLIENT_SECRET }} +# SHAREPOINT_TENANT_ID: ${{ secrets.SHAREPOINT_TENANT_ID }} \ No newline at end of file diff --git a/.github/workflows/sharepoint_validator.yml b/.github/workflows/sharepoint_validator.yml index bc22bee..0de1f61 100644 --- a/.github/workflows/sharepoint_validator.yml +++ b/.github/workflows/sharepoint_validator.yml @@ -1,36 +1,36 @@ -name: SharePoint Validator -on: - schedule: - - cron: '0 6 * * *' - workflow_dispatch: +# name: SharePoint Validator +# on: +# schedule: +# - cron: '0 6 * * *' +# workflow_dispatch: -jobs: - sharepoint-validator: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v3 +# jobs: +# sharepoint-validator: +# runs-on: ubuntu-22.04 +# steps: +# - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.12' +# - name: Set up Python +# uses: actions/setup-python@v4 +# with: +# python-version: '3.12' - - name: Install dependencies - run: | - pip install poetry - poetry install --no-root +# - name: Install dependencies +# run: | +# pip install poetry +# poetry install --no-root - - name: run script - run: | - pwd - ls -la - bash run_daily_script.sh - env: - PYTHONPATH: ${{ github.workspace }} - SOUTH_COAST_INSULATION_SERVICE_SHAREPOINT_ID: ${{ secrets.SOUTH_COAST_INSULATION_SERVICE_SHAREPOINT_ID }} - JJC_SERVICE_SHAREPOINT_ID: ${{ secrets.JJC_SERVICE_SHAREPOINT_ID }} - BAXTER_KELLY_SERVICE_SHAREPOINT_ID: ${{ secrets.BAXTER_KELLY_SERVICE_SHAREPOINT_ID }} - SGEC_SERVICE_SHAREPOINT_ID: ${{ secrets.SGEC_SERVICE_SHAREPOINT_ID }} - SHAREPOINT_CLIENT_ID: ${{ secrets.SHAREPOINT_CLIENT_ID }} - SHAREPOINT_CLIENT_SECRET: ${{ secrets.SHAREPOINT_CLIENT_SECRET }} - SHAREPOINT_TENANT_ID: ${{ secrets.SHAREPOINT_TENANT_ID }} \ No newline at end of file +# - name: run script +# run: | +# pwd +# ls -la +# bash run_daily_script.sh +# env: +# PYTHONPATH: ${{ github.workspace }} +# SOUTH_COAST_INSULATION_SERVICE_SHAREPOINT_ID: ${{ secrets.SOUTH_COAST_INSULATION_SERVICE_SHAREPOINT_ID }} +# JJC_SERVICE_SHAREPOINT_ID: ${{ secrets.JJC_SERVICE_SHAREPOINT_ID }} +# BAXTER_KELLY_SERVICE_SHAREPOINT_ID: ${{ secrets.BAXTER_KELLY_SERVICE_SHAREPOINT_ID }} +# SGEC_SERVICE_SHAREPOINT_ID: ${{ secrets.SGEC_SERVICE_SHAREPOINT_ID }} +# SHAREPOINT_CLIENT_ID: ${{ secrets.SHAREPOINT_CLIENT_ID }} +# SHAREPOINT_CLIENT_SECRET: ${{ secrets.SHAREPOINT_CLIENT_SECRET }} +# SHAREPOINT_TENANT_ID: ${{ secrets.SHAREPOINT_TENANT_ID }} \ No newline at end of file diff --git a/etl/month_end_automation_wave_3_layout.py b/etl/month_end_automation_wave_3_layout.py index aac0657..6a9e754 100644 --- a/etl/month_end_automation_wave_3_layout.py +++ b/etl/month_end_automation_wave_3_layout.py @@ -26,12 +26,12 @@ class BoardID(Enum): board_ids = [ "9349630181", # WCHG Walkups-Operations - # "8830772914", # "L&Q London" - # "9601691730", # Cardo Wales & West - Wave 3 - # "9660895490", # Northumberland County SHDF Wave 3 - # "9641491000", # Watford Warm Homes - # "9671463094", # Seddon - # "9929454382", # NCHA SHDF Wave 3 Main Operation Board + "8830772914", # "L&Q London" + "9601691730", # Cardo Wales & West - Wave 3 + "9660895490", # Northumberland County SHDF Wave 3 + "9641491000", # Watford Warm Homes + "9671463094", # Seddon + "9929454382", # NCHA SHDF Wave 3 Main Operation Board ] empty = "Rate card info missing"