Merge pull request #21 from publichealthengland/COV-49_add_missing_me…

…trics_to_DATA_TYPES

COV-49 Add missing metrics to DATA_TYPES

app/utils/constants.py

@@ -12,7 +12,7 @@
 
 # 3rd party:
 
-# Internal: 
+# Internal:
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -201,22 +201,22 @@ class DBQueries(NamedTuple):
 FETCH FIRST 1 ROW ONLY""")
 
     area_id_by_type = """\
-SELECT MIN(id) AS id 
-FROM covid19.area_reference 
-WHERE area_type = $1 
+SELECT MIN(id) AS id
+FROM covid19.area_reference
+WHERE area_type = $1
 GROUP BY area_code"""
 
     area_id_by_code_no_type = """\
-SELECT MIN(id) AS id 
-FROM covid19.area_reference 
-WHERE area_code = $1 
+SELECT MIN(id) AS id
+FROM covid19.area_reference
+WHERE area_code = $1
 GROUP BY area_code"""
 
     area_id_by_code = """\
-SELECT MIN(id) AS id 
-FROM covid19.area_reference 
-WHERE area_code = $1 
-  AND area_type = $2 
+SELECT MIN(id) AS id
+FROM covid19.area_reference
+WHERE area_code = $1
+  AND area_type = $2
 GROUP BY area_code"""
 
 
@@ -370,6 +370,10 @@ class DBQueries(NamedTuple):
 
     "newDailyNsoDeathsByDeathDate": int,
     "cumDailyNsoDeathsByDeathDate": int,
+    "newDailyNsoDeathsByDeathDateChangePercentage": float,
+    "newDailyNsoDeathsByDeathDateChange": int,
+    "newDailyNsoDeathsByDeathDateDirection": str,
+    "newDailyNsoDeathsByDeathDateRollingSum": int,
 
     "cumWeeklyNsoDeathsByRegDate": int,
     "cumWeeklyNsoDeathsByRegDateRate": float,
@@ -735,6 +739,10 @@ class DBQueries(NamedTuple):
 
         "newDailyNsoDeathsByDeathDate": int,
         "cumDailyNsoDeathsByDeathDate": int,
+        "newDailyNsoDeathsByDeathDateChangePercentage": float,
+        "newDailyNsoDeathsByDeathDateChange": int,
+        "newDailyNsoDeathsByDeathDateDirection": str,
+        "newDailyNsoDeathsByDeathDateRollingSum": int,
 
         "cumPeopleVaccinatedFirstDoseByPublishDate": int,
         "cumPeopleVaccinatedSecondDoseByPublishDate": int,