v8.2.0

.github/workflows/create_dockerized_db.yml → .github/workflows/build-and-push-database-image.yml

@@ -1,11 +1,10 @@
-name: Create Dockerized Database
-run-name: Creating dockerized image from ${{ github.ref_name }}
+name: Build and push database image
+run-name: Build and push database image for ${{ github.ref_name }}
 
 on:
   workflow_dispatch:
   push:
-    branches:
-      - next
+    branches: [next]
   workflow_call:
     inputs:
       github_ref:
@@ -17,8 +16,8 @@ permissions:
   contents: read
 
 jobs:
-  setup-development-database:
-    name: Setup Development Database
+  build-and-push-database-image:
+    name: Build and push database image
     runs-on: ubuntu-latest
     env:
       RAILS_ENV: development
@@ -32,34 +31,36 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           ref: ${{ inputs.github_ref || github.ref_name == 'next' && 'next' || github.ref_name }}
-          repository: nhsuk/manage-vaccinations-in-schools
+          repository: nhsdigital/manage-vaccinations-in-schools
       - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
         with:
           node-version-file: .tool-versions
           cache: yarn
-      - name: Build custom postgres image
-        run: |
-          echo -e "FROM postgres:16.11\n\nENV PGDATA=\"/var/lib/postgresql/mydata\"" > db.Dockerfile
-          docker build -t custom-postgres:latest -f db.Dockerfile .
-      - name: Start db container
+      - name: Create Dockerfile
+        run: >-
+          echo -e \
+            "FROM postgis/postgis:17-master\nENV PGDATA=\"/var/lib/postgresql/mydata\"" \
+            > database.Dockerfile
+      - name: Build image
+        run: docker build -t database:latest -f database.Dockerfile .
+      - name: Start container
         run: |
           docker run -d \
             --name database \
             -e "POSTGRES_HOST_AUTH_METHOD=trust" \
             -p 5432:5432 \
-            custom-postgres:latest
-      - name: Wait for db to be ready
+            database:latest
+      - name: Wait for database to be ready
         run: |
           docker exec database bash -c '
             until pg_isready -U postgres; do
               echo "Waiting for postgres..."
               sleep 2
-            done
-                '
+            done'
       - uses: ruby/setup-ruby@60ecfba8750476ff216b59eee3b88218bb5111cc # v1.303.0
         with:
           bundler-cache: true
-      - name: Populate database for testing
+      - name: Set up database for testing
         run: |
           bin/rails db:setup
           bin/rails feature_flags:enable_for_development
@@ -73,17 +74,17 @@ jobs:
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@376925c9d111252e87ae59691e5a442dd100ef6a # v2.1.3
       # yamllint disable rule:line-length
-      - name: get github ref short
-        id: github-ref
+      - name: Get image tag
+        id: get-image-tag
         run: |
           git_ref=$(git rev-parse ${{ inputs.github_ref || github.ref_name == 'next' && 'origin/next' || github.ref_name }})
-          echo "ref=$git_ref" >> "$GITHUB_OUTPUT"
-      - name: Commit postgres container with database
+          echo "value=$git_ref" >> "$GITHUB_OUTPUT"
+      - name: Commit image
         run: >-
           docker commit database "${{ steps.login-ecr.outputs.registry
-          }}/mavis/development/postgres_db:${{ steps.github-ref.outputs.ref }}"
+          }}/mavis/development/postgres_db:${{ steps.get-image-tag.outputs.value }}"
       - name: Push image
         run: >-
           docker push "${{ steps.login-ecr.outputs.registry }}/mavis/development/postgres_db:${{
-          steps.github-ref.outputs.ref }}"
+          steps.get-image-tag.outputs.value }}"
       # yamllint enable rule:line-length

.github/workflows/end-to-end-tests-aws.yml

@@ -1,4 +1,4 @@
-name: AWS deployment E2E tests
+name: AWS
 
 on:
   workflow_call:
@@ -122,7 +122,7 @@ jobs:
     permissions:
       id-token: write
       contents: read
-    uses: ./.github/workflows/create_dockerized_db.yml
+    uses: ./.github/workflows/build-and-push-database-image.yml
     with:
       github_ref: ${{ needs.check-database-image-presence.outputs.db_git_ref_sha }}
   launch-dockerized-devimage:

.github/workflows/end-to-end-tests-local.yml

@@ -1,13 +1,13 @@
-name: Local E2E tests
+name: Local
 
 on: [workflow_call]
 
 jobs:
   end-to-end-tests:
     runs-on: ubuntu-latest
     services:
-      postgres:
-        image: postgres:17.2
+      postgresql:
+        image: postgis/postgis:17-master
         env:
           POSTGRES_PASSWORD: postgres
         options: >-

.github/workflows/end-to-end-tests-on-pull-request.yml

@@ -1,4 +1,4 @@
-name: E2E tests on PR
+name: End-to-end tests
 
 on: [pull_request]
 
@@ -11,7 +11,7 @@ permissions: {}
 jobs:
   aws-e2e-flow:
     if: github.event.pull_request.head.repo.full_name == github.repository
-    name: AWS deployment E2E tests
+    name: AWS
     permissions:
       id-token: write
       contents: write
@@ -22,7 +22,7 @@ jobs:
 
   local-e2e-flow:
     if: github.event.pull_request.head.repo.full_name != github.repository
-    name: Local E2E tests
+    name: Local
     uses: ./.github/workflows/end-to-end-tests-local.yml
 
   ensure-run-success:

.github/workflows/test.yml

@@ -11,8 +11,8 @@ jobs:
     name: RSpec
     runs-on: ubuntu-latest
     services:
-      postgres:
-        image: postgres:17.2
+      postgresql:
+        image: postgis/postgis:17-master
         env:
           POSTGRES_PASSWORD: postgres
         options: >-
@@ -50,8 +50,8 @@ jobs:
     name: Seeds
     runs-on: ubuntu-latest
     services:
-      postgres:
-        image: postgres:17.2
+      postgresql:
+        image: postgis/postgis:17-master
         env:
           POSTGRES_PASSWORD: postgres
         options: >-
@@ -60,7 +60,8 @@ jobs:
           - 5432:5432
     env:
       RAILS_ENV: development
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432/manage_vaccinations_development
+      DATABASE_URL: >-
+        postgis://postgres:postgres@localhost:5432/manage_vaccinations_development
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
@@ -70,7 +71,7 @@ jobs:
       - uses: ruby/setup-ruby@60ecfba8750476ff216b59eee3b88218bb5111cc # v1.303.0
         with:
           bundler-cache: true
-      - name: Check seeds run
+      - name: Run seeds
         run: bin/rails db:prepare
 
   jest:
@@ -82,5 +83,7 @@ jobs:
         with:
           node-version-file: .tool-versions
           cache: yarn
-      - run: yarn install --immutable --immutable-cache --check-cache
-      - run: yarn test
+      - name: Install dependencies
+        run: yarn install --immutable --immutable-cache --check-cache
+      - name: Run tests
+        run: yarn test

.tool-versions

@@ -3,9 +3,9 @@ awscli     2.27.46
 hk         1.37.0
 nodejs     22.15.0
 pkl        0.31.0
-postgres   17.2
 python     3.14.4
-redis      8.2.1
 ruby       4.0.3
 shellcheck 0.11.0
 yamllint   1.38.0
+yarn       1.22.22
+uv         0.11.7

Gemfile

@@ -22,6 +22,7 @@ gem "stackprof"
 
 # 3rd party gems
 gem "activerecord-import"
+gem "activerecord-postgis-adapter"
 gem "activerecord-session_store"
 gem "active_record_union"
 gem "amazing_print"

Gemfile.lock

@@ -90,6 +90,9 @@ GEM
       timeout (>= 0.4.0)
     activerecord-import (2.2.0)
       activerecord (>= 4.2)
+    activerecord-postgis-adapter (11.1.1)
+      activerecord (~> 8.1.0)
+      rgeo-activerecord (~> 8.1.0)
     activerecord-session_store (2.2.0)
       actionpack (>= 7.0)
       activerecord (>= 7.0)
@@ -175,14 +178,14 @@ GEM
       protocol-websocket (~> 0.17)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1238.0)
+    aws-partitions (1.1240.0)
     aws-sdk-accessanalyzer (1.88.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-cloudwatch (1.133.0)
+    aws-sdk-cloudwatch (1.134.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-core (3.244.0)
+    aws-sdk-core (3.246.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -202,7 +205,7 @@ GEM
     aws-sdk-kms (1.123.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-rds (1.310.0)
+    aws-sdk-rds (1.311.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
     aws-sdk-s3 (1.219.0)
@@ -294,7 +297,7 @@ GEM
     dry-cli (1.4.1)
     email_validator (2.2.4)
       activemodel
-    erb (6.0.3)
+    erb (6.0.4)
     erubi (1.13.1)
     et-orbi (1.4.0)
       tzinfo
@@ -306,7 +309,7 @@ GEM
     factory_bot_rails (6.5.1)
       factory_bot (~> 6.5)
       railties (>= 6.1.0)
-    faker (3.7.1)
+    faker (3.8.0)
       i18n (>= 1.8.11, < 2)
     falcon (0.55.3)
       async
@@ -537,7 +540,7 @@ GEM
     parallel (1.28.0)
     parallel_tests (5.7.0)
       parallel
-    parser (3.3.10.2)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     pg (1.6.3-arm64-darwin)
@@ -548,7 +551,7 @@ GEM
     prettier_print (1.2.1)
     prettyprint (0.2.0)
     prism (1.9.0)
-    propshaft (1.3.1)
+    propshaft (1.3.2)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
@@ -664,6 +667,10 @@ GEM
     reverse_markdown (3.0.2)
       nokogiri
     rexml (3.4.4)
+    rgeo (3.1.0)
+    rgeo-activerecord (8.1.0)
+      activerecord (>= 8.1, < 8.2)
+      rgeo (>= 3.0)
     rladr (1.2.0)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
@@ -694,26 +701,26 @@ GEM
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 9)
     rspec-support (3.13.7)
-    rubocop (1.82.1)
+    rubocop (1.86.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-govuk (5.2.0)
-      rubocop (= 1.82.1)
-      rubocop-ast (= 1.49.0)
+    rubocop-govuk (5.2.1)
+      rubocop (= 1.86.0)
+      rubocop-ast (= 1.49.1)
       rubocop-capybara (= 2.22.1)
       rubocop-rails (= 2.34.3)
       rubocop-rake (= 0.7.1)
@@ -767,13 +774,13 @@ GEM
       sidekiq (>= 5.0)
     shoulda-matchers (7.0.1)
       activesupport (>= 7.1)
-    sidekiq (8.1.2)
+    sidekiq (8.1.3)
       connection_pool (>= 3.0.0)
       json (>= 2.16.0)
       logger (>= 1.7.0)
       rack (>= 3.2.0)
       redis-client (>= 0.26.0)
-    sidekiq-scheduler (6.0.1)
+    sidekiq-scheduler (6.0.2)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 7.3, < 9)
     sidekiq-throttled (2.1.0)
@@ -910,6 +917,7 @@ PLATFORMS
 DEPENDENCIES
   active_record_union
   activerecord-import
+  activerecord-postgis-adapter
   activerecord-session_store
   amazing_print
   annotaterb