add more metrics

Added: cumPeopleVaccinatedAutumn22ByVaccinationDate50plus, cumVaccinationAutumn22UptakeByVaccinationDatePercentage50plus, newPeopleVaccinatedSpring23ByVaccinationDate75plus, cumPeopleVaccinatedSpring23ByVaccinationDate75plus, cumVaccinationSpring23UptakeByVaccinationDatePercentage75plus
UKHSA-Internal · May 22, 2023 · 8b86241 · 8b86241
1 parent 6d543ea
commit 8b86241
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/app/utils/assets.py b/app/utils/assets.py
@@ -149,9 +149,14 @@ class MetricData:
             "newPeopleVaccinatedAutumn22ByVaccinationDate",
             "cumPeopleVaccinatedAutumn22ByVaccinationDate",
             "cumVaccinationAutumn22UptakeByVaccinationDatePercentage",
+
             "newPeopleVaccinatedSpring22ByVaccinationDate",
             "cumPeopleVaccinatedSpring22ByVaccinationDate",
             "cumVaccinationSpring22UptakeByVaccinationDatePercentage",
+
+            "newPeopleVaccinatedSpring23ByVaccinationDate",
+            "cumPeopleVaccinatedSpring23ByVaccinationDate",
+            "cumVaccinationSpring23UptakeByVaccinationDatePercentage",
         ]
     }
 

diff --git a/app/utils/constants.py b/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,