Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
241e3a9
feat(dpav-1134): implemented fuel type query into IRIS API (#65)
suarezmashd Jul 10, 2025
6092756
chore(non-req): updating changelog to prepare for release (#66)
KumailKamranIS Jul 15, 2025
b01805a
chore(non-req): Update CHANGELOG.md (#69)
KumailKamranIS Jul 22, 2025
a5250c8
[DPAV-1492] Met Office Wind-Driven Rain Data - GeoJSON endpoint (#72)
kingarj Aug 13, 2025
ce8db4f
[DPAV-1488] Create endpoint for exposing icing days GeoJSON (#73)
kingarj Aug 14, 2025
3657baf
[DPAV-1489] add hot summer days API endpoint (#74)
kingarj Aug 18, 2025
7a5070d
Script now handles gpkg downloads in zip format
MattThomas-Informed Aug 19, 2025
0d63fbe
created alembic file for ward data
MattThomas-Informed Aug 19, 2025
1ed9d1c
loads epc ward data
MattThomas-Informed Aug 21, 2025
3da8a2f
fix
MattThomas-Informed Aug 22, 2025
3c5410b
remove .iris from TARGET TABLE
MattThomas-Informed Aug 22, 2025
c8ca72f
feature: [DPAV-1456] add endpoint for ward data
kingarj Aug 22, 2025
df15213
remove geometry from json properties
MattThomas-Informed Aug 22, 2025
8379d90
add --rm back to Makefile after debugging
MattThomas-Informed Aug 26, 2025
19c103d
feat(OSPO): synchronise OSPO workflows
MattThomas-Informed Aug 26, 2025
bff5db2
Update load_gpkg_to_postgis.py
MattThomas-Informed Aug 26, 2025
8db9fa0
Merge pull request #77 from National-Digital-Twin/feature/DPAV-1456/w…
MattThomas-Informed Aug 26, 2025
eb65383
feature: [DPAV-1456] implement script guard if tables have been loade…
kingarj Aug 27, 2025
2406e28
Feature/dpav 1292/epc endpoints (#81)
MattThomas-Informed Sep 2, 2025
2c99bb0
Revert "Feature/dpav 1292/epc endpoints (#81)" (#82)
kingarj Sep 3, 2025
0f24319
feature: (dpav 1292) epc endpoints (#84)
kingarj Sep 4, 2025
45b709c
feature: (DPAV-1481) add os ngd roof columns (#86)
kingarj Sep 4, 2025
207af78
feat(DPAV-1594): new api queries for os ngd buildings data (#85)
suarezmashd Sep 5, 2025
a6f11af
feature: [DPAV-1579] add uprn and roof shape columns (#87)
kingarj Sep 8, 2025
bbeac98
feat(dpav-1684): added os roof data to filterable building and filter…
KumailKamranIS Sep 9, 2025
80e0bab
feat(dpav-1684): only included the roof aspect area when the value is…
KumailKamranIS Sep 10, 2025
84e01d4
feature: [DPAV-1453] add underlying geometry data for Wales (#91)
kingarj Sep 10, 2025
91d57f8
feat(DPAV-1594): new postgis fallback option for os ngd buildings dat…
suarezmashd Sep 10, 2025
d8cadbd
New pg query for os ngd buildings (#92)
suarezmashd Sep 10, 2025
d7609e4
feat(DPAV-1594): os ngd roof shape (#93)
suarezmashd Sep 10, 2025
eddb235
fixed solar panel mapping for postgres data (#94)
suarezmashd Sep 11, 2025
1665fc7
Updated changelog for release 0.93.0 (#95)
suarezmashd Sep 11, 2025
9ca75fc
feat(DPAV-1731): update to migrations to identify residential dwellin…
suarezmashd Sep 19, 2025
a47d0fe
efficiency improvements to migration queries (#100)
suarezmashd Sep 22, 2025
380c7d8
removed index creation query and added session parameters to migratio…
suarezmashd Sep 23, 2025
1310d67
feat(DPAV-1731): set new migrations to just create is_residential fie…
suarezmashd Sep 23, 2025
7106025
feat(dpav-1809): added migration to add and load region name per dist…
KumailKamranIS Oct 3, 2025
a058e72
Revert "feat(dpav-1809): added migration to add and load region name …
KumailKamranIS Oct 3, 2025
6db7439
updated changelog (#106)
suarezmashd Oct 3, 2025
313922c
Revert "Revert "feat(dpav-1809): added migration to add and load regi…
KumailKamranIS Oct 7, 2025
25dddf5
feat(non-req): added materialized view for analytics dashboard (#108)
KumailKamranIS Oct 10, 2025
2d8c3a8
feat(non-req): replaced upsert functionality with update and added in…
KumailKamranIS Oct 13, 2025
18103c1
bugfix(non-req): moved from psycopg to sqlalchemy and psycopg (#111)
KumailKamranIS Oct 15, 2025
d942182
bugfix(non-req): fix for null values for os roof aspect area (#112)
KumailKamranIS Oct 15, 2025
4cfe280
bugfix(non-req): fixed utils module error on startup (#113)
KumailKamranIS Oct 15, 2025
38a2ea6
revert(non-req): revert changes to handle nullable roof aspect area d…
KumailKamranIS Oct 15, 2025
a208f05
Revert "revert(non-req): revert changes to handle nullable roof aspec…
KumailKamranIS Oct 16, 2025
7230916
bugfix(non-req): added optional clauses to nullable attributes in spa…
KumailKamranIS Oct 16, 2025
af0a156
feat(DPAV-1922): api changes to fetch latest epc records (#118)
suarezmashd Oct 17, 2025
aa4b456
feat(DPAV-1922): fuel type query update (#119)
suarezmashd Oct 21, 2025
8cd283c
feat(dpav-1779): add endpoints for initial dashboard charts (#120)
jsmith-informed Oct 22, 2025
2af8bc7
feat(dpav-1779): add endpoint for building fuel type chart
jsmith-informed Oct 22, 2025
ec3f381
Merge pull request #122 from National-Digital-Twin/feature/dpav-1779/…
jsmith-informed Oct 22, 2025
da3149c
feat(DPAV-1922): changelog update (#124)
suarezmashd Oct 23, 2025
f006c52
feature: (DPAV-1453) refresh regions view (#96)
kingarj Oct 23, 2025
e6b0198
Region view definition updated with buffer (#125)
suarezmashd Oct 23, 2025
8e6a419
feat(non-req): remove region overlap (#127)
suarezmashd Oct 24, 2025
e7a5fb1
feat(dpav-1926): updated and split the analytics view for dashboards …
KumailKamranIS Oct 27, 2025
ae8351c
bugfix(non-req): fixed down revision id to reference penultimate revi…
KumailKamranIS Oct 27, 2025
f0a057b
bugfix(non-req): added gpkg table to entrypoint script to fix data lo…
KumailKamranIS Oct 28, 2025
faac4e1
bugfix(non-req): standardized index names across migrations (#130)
KumailKamranIS Oct 28, 2025
3246b92
feat(non-req): updated dashboard queries to reference renamed view (#…
KumailKamranIS Oct 29, 2025
cbe99b2
feat(non-req): updated epc analytics view to include epc active field…
KumailKamranIS Oct 30, 2025
bab49d2
bugfix(non-req): modified bounding box query to only fetch residentia…
KumailKamranIS Oct 30, 2025
22a3ebb
feat(non-req): added partial indices for base charts (#134)
KumailKamranIS Oct 30, 2025
422fcb2
feat(non-req): added way to retrieve data for extreme weather chart (…
KumailKamranIS Oct 30, 2025
cccf432
feat(dpav-1956): updated view, query and routes to match extreme weat…
KumailKamranIS Nov 3, 2025
a319655
Merge pull request #138 from National-Digital-Twin/feature/DPAV-1951/…
jsmith-informed Nov 4, 2025
f01f257
feat(dpav-1961): added query and route to fetch data for the in date …
KumailKamranIS Nov 5, 2025
7680309
feat(DPAV-1951): Add covering index for historical EPC queries (#139)
jsmith-informed Nov 5, 2025
1866664
feat(DPAV-1951): add active_snapshots to build_epc_analytics (#140)
jsmith-informed Nov 6, 2025
a08d266
feat(DPAV-2060): add database query timeout (#141)
jsmith-informed Nov 7, 2025
71bf95f
feat(DPAV-1951): add building_epc_analytics_aggregates materialized v…
jsmith-informed Nov 7, 2025
e12bc15
feat(DPAV-2060): Ensure DEFAULT_QUERY_TIMEOUT is set with fallback (#…
jsmith-informed Nov 10, 2025
6ca72e6
feat(DPAV-1968): add support for named areas dashboard (#144)
jsmith-informed Nov 12, 2025
dca0c7b
feat(DPAV-1961): support area filters on expired vs in-date epc (#145)
jsmith-informed Nov 12, 2025
b889818
feat(DPAV-1957): add area columns to extreme weather analytics view (…
jsmith-informed Nov 13, 2025
33b8c5b
feat(DPAV-1970): add active partial indexes for building_epc_analytic…
jsmith-informed Nov 17, 2025
5cd6a40
feat(DPAV-1970): add composite partial index for fuel charts (#148)
jsmith-informed Nov 18, 2025
36ca982
feat(DPAV-1963): update dashboard building attributes endpoint (#149)
jsmith-informed Nov 19, 2025
7d12144
bugfix(non-req): moved where statement to subquery for ngd attributes…
KumailKamranIS Nov 19, 2025
0d180fe
feat(DPAV-1953): add dashboard endpoint for epc overtime (#152)
jsmith-informed Nov 20, 2025
7a5c3c0
feat(DPAV-2118): combine Welsh regions (#151)
jsmith-informed Nov 20, 2025
2eca6c6
feat(DPAV-1779): New EPC charts (#153)
jsmith-informed Nov 25, 2025
1120b4e
feat(DPAV-1958/9): add endpoints for grouped sap timeline charts (#154)
jsmith-informed Nov 27, 2025
561379c
fix(DPAV-2060): fix execute_with_timeout reset (#155)
jsmith-informed Nov 28, 2025
d0ccb9f
bugfix(dpav-1926): changed the logic for geom matching to contains (#…
KumailKamranIS Jan 6, 2026
a28935f
bugfix(dpav-1926): corrected the join logic in the sync region fk scr…
KumailKamranIS Jan 7, 2026
7ee0125
feat(dpav-2060): reverted db query timeout back to 29 seconds (#158)
KumailKamranIS Jan 12, 2026
8f57c15
chore(non-req): update changelog (#159)
KumailKamranIS Jan 12, 2026
07c380b
chore(non-req): merge main to dev (#160)
KumailKamranIS Jan 12, 2026
832b63e
feature(non-req): updated indices to optimise for performance of buil…
KumailKamranIS Jan 14, 2026
3e8e7b1
Merge branch 'main' into feature/non-req/release-prep-0.95.2
KumailKamranIS Jan 15, 2026
e0859da
chore(non-req): sorted out changes after merge from main
KumailKamranIS Jan 15, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
35 changes: 29 additions & 6 deletions .github/workflows/api-ci-pr.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: Apache-2.0
# © Crown Copyright 2025. This work has been developed by the National Digital Twin Programme and is legally attributed to the Department for Business and Trade (UK) as the governing entity.

name: Frontend CI on PR
name: API CI on PR

on:
workflow_call:
Expand All @@ -11,8 +11,8 @@ on:
paths:
- "api/**"
- "requirements.txt"
- ".github/workflows/frontend-ci-pr.yml"
- ".github/workflows/frontend-ci-pr-merge.yml"
- ".github/workflows/api-ci-pr.yml"
- ".github/workflows/api-ci-pr-merge.yml"
workflow_dispatch:

permissions:
Expand All @@ -30,7 +30,7 @@ jobs:
uses: actions/checkout@v4

- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@0.28.0
uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # v0.33.1
with:
scan-type: "fs"
scan-ref: .
Expand All @@ -40,10 +40,33 @@ jobs:
severity: "CRITICAL,HIGH"
continue-on-error: true

unit-tests:
name: Run Unit Tests
runs-on: ubuntu-latest
timeout-minutes: 10
env:
GITHUB_ACCESS_TOKEN: ${{ secrets.GH_PACKAGES_PAT }}
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.12'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt

- name: Run unit tests
run: python -m pytest unit_tests/ -v

docker-build-test-scan:
name: Build, Docker Build, Test & Scan
runs-on: ubuntu-latest
needs: security-scanning
needs: [security-scanning, unit-tests]
timeout-minutes: 20
env:
GITHUB_ACCESS_TOKEN: ${{ secrets.GH_PACKAGES_PAT }}
Expand All @@ -57,7 +80,7 @@ jobs:
docker build --secret id=pat_token,env=GITHUB_ACCESS_TOKEN -t iris/api:latest -f Dockerfile .

- name: Run Trivy Scan on Docker Image
uses: aquasecurity/trivy-action@0.28.0
uses: aquasecurity/trivy-action@b6643a29fecd7f34b3597bc6acb0a98b03d33ff8 # v0.33.1
with:
image-ref: "iris/api:latest"
format: "table"
Expand Down
Loading
Loading