Merge pull request #26 from UKHSA-Internal/sandbox

Sandbox -> development

.github/workflows/sandbox.yml

@@ -37,4 +37,22 @@ jobs:
       app-name: 'c19dashsbuksfe01apiv2server'
       publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }}
       images: 'c19dashacrprod.azurecr.io/apiv2server:${{ github.run_id }}-sandbox'
+
+
+ test:
+  runs-on: ubuntu-latest
+  name: Automated Regression Tests of COVID19 Dashboard Website
+  needs: deploy
+  steps:
+   # ## calls the AIQ-Automation-Covid-Dashboard workflow to run the automated tests
+  - name: Calls AIQ-Automation-Covid-Dashboard workflow to run the automated tests
+    run: |
+            curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ secrets.ACCESS_TOKEN }} " \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/UKHSA-Internal/AIQ-Automation-Covid-Dashboard/actions/workflows/CovidDashboard_CI.yml/dispatches \
+            -d '{"ref":"main","inputs": { "DExecution_Env":"Sandbox", "DScenarioNameTest":"SmokeTests_Scenario" }}'
+
     

.vs/VSWorkspaceState.json

@@ -6,6 +6,5 @@
     "\\app",
     "\\app\\database"
   ],
-  "SelectedNode": "\\app\\database\\postgres.py",
   "PreviewInSolutionExplorer": false
 }

app/utils/assets.py

@@ -149,9 +149,14 @@ class MetricData:
             "newPeopleVaccinatedAutumn22ByVaccinationDate",
             "cumPeopleVaccinatedAutumn22ByVaccinationDate",
             "cumVaccinationAutumn22UptakeByVaccinationDatePercentage",
+
             "newPeopleVaccinatedSpring22ByVaccinationDate",
             "cumPeopleVaccinatedSpring22ByVaccinationDate",
             "cumVaccinationSpring22UptakeByVaccinationDatePercentage",
+
+            "newPeopleVaccinatedSpring23ByVaccinationDate",
+            "cumPeopleVaccinatedSpring23ByVaccinationDate",
+            "cumVaccinationSpring23UptakeByVaccinationDatePercentage",
         ]
     }
 

app/utils/constants.py

@@ -425,6 +425,12 @@ class DBQueries(NamedTuple):
     "cumVaccinationCompleteCoverageByVaccinationDatePercentage": float,
     "newPeopleVaccinatedCompleteByVaccinationDate": int,
 
+    "cumPeopleVaccinatedAutumn22ByVaccinationDate50plus": int,
+    "cumVaccinationAutumn22UptakeByVaccinationDatePercentage50plus": float,
+    "newPeopleVaccinatedSpring23ByVaccinationDate75plus": int,
+    "cumPeopleVaccinatedSpring23ByVaccinationDate75plus": int,
+    "cumVaccinationSpring23UptakeByVaccinationDatePercentage75plus": float,
+
     "vaccinationsAgeDemographics": list,
 
     "cumPeopleVaccinatedThirdDoseByPublishDate": int,
@@ -781,6 +787,12 @@ class DBQueries(NamedTuple):
         "cumVaccinationCompleteCoverageByVaccinationDatePercentage": float,
         "newPeopleVaccinatedCompleteByVaccinationDate": int,
 
+        "cumPeopleVaccinatedAutumn22ByVaccinationDate50plus": int,
+        "cumVaccinationAutumn22UptakeByVaccinationDatePercentage50plus": float,
+        "newPeopleVaccinatedSpring23ByVaccinationDate75plus": int,
+        "cumPeopleVaccinatedSpring23ByVaccinationDate75plus": int,
+        "cumVaccinationSpring23UptakeByVaccinationDatePercentage75plus": float,
+
         "vaccinationsAgeDemographics": list,
 
         "cumPeopleVaccinatedThirdDoseByPublishDate": int,

app/utils/operations/response.py

@@ -39,13 +39,7 @@ def __init__(self, request, container, path):
         host: str = request.base_request.headers.get("X-Forwarded-Host", API_URL)
         host = host.removeprefix("https://").removeprefix("api.")
 
-        # TODO: remove this IF statement when routing rule for rr-apiv2cache frontend
-        #       domain name has been change
-        self.location = (
-            f"https://api.{host}/downloads/{container}/{path}"
-            if not host.startswith("sandbox")
-            else f"https://api-{host}/downloads/{container}/{path}"
-        )
+        self.location = f"https://api.{host}/downloads/{container}/{path}"
 
         permalink = f"https://{API_URL}/apiv2cache/{request.path}"