Add vaccination 2nd dose + used

sledilnik · Jan 23, 2021 · bbf4061 · bbf4061
1 parent 5532c76
commit bbf4061
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -25,6 +25,12 @@ In case of failures a notification is set to slack channel #alert through Data A
 
 ## Changelog
 
+## 1.9.18
+
+* Schema version 35
+* Add vaccination.administered2nd vaccination.used to `/api/stats`
+* Extend vaccinationSummary with 2nd dose in `/api/summary`
+
 ## 1.9.17
 
 * Schema version 34

diff --git a/sources/SloCovidServer/SloCovidServer/Mappers/SummaryMapper.cs b/sources/SloCovidServer/SloCovidServer/Mappers/SummaryMapper.cs
@@ -176,14 +176,13 @@ internal static VaccinationSummary GetVaccinationToDate(DateTime? toDate, Immuta
             var lastStats = GetLastAndPreviousItem(toDate, stats, s => s.Vaccination.Administered.ToDate != null);
             if (lastStats.HasValue)
             {
-                int? lastVaccinated = lastStats.Value.Last.Vaccination.Administered.ToDate;
-                int? prevVaccinated = lastStats.Value.Previous.Vaccination.Administered.ToDate;
-                int? today = lastStats.Value.Last.Vaccination.Administered.Today;
-                float? percentVaccinated = CalculatePopulationPercent(lastVaccinated);
+                int? vaccinated1st = lastStats.Value.Last.Vaccination.Administered.ToDate;
+                int? vaccinated2nd = lastStats.Value.Last.Vaccination.Administered2nd.ToDate;
+                float? percentVaccinated = CalculatePopulationPercent(vaccinated1st);
 
                 return new VaccinationSummary(
-                    lastVaccinated,
-                    new VaccinationSummarySubValues(today, percentVaccinated),
+                    vaccinated1st,
+                    new VaccinationSummarySubValues(vaccinated2nd, percentVaccinated),
                     default, 
                     lastStats.Value.Last.Year, lastStats.Value.Last.Month, lastStats.Value.Last.Day);
             }

diff --git a/sources/SloCovidServer/SloCovidServer/Models/StatsDaily.cs b/sources/SloCovidServer/SloCovidServer/Models/StatsDaily.cs
@@ -142,10 +142,14 @@ public RetirementHomeCases(int? employeeConfirmedToDate, int? occupantConfirmedT
     public record Vaccination
     {                
         public TodayToDate Administered { get; init; }
+        public TodayToDate Administered2nd { get; init; }
+        public TodayToDate Used { get; init; }
         public TodayToDate Delivered { get; init; }
-        public Vaccination(TodayToDate administered, TodayToDate delivered)
+        public Vaccination(TodayToDate administered, TodayToDate administered2nd, TodayToDate used, TodayToDate delivered)
         {
             Administered = administered;
+            Administered2nd = administered2nd;
+            Used = used;
             Delivered = delivered;
         }
     }

diff --git a/sources/SloCovidServer/SloCovidServer/Services/Implemented/Mapper.cs b/sources/SloCovidServer/SloCovidServer/Services/Implemented/Mapper.cs
@@ -454,9 +454,17 @@ StatsDaily GetDailyStatsFromRaw(ImmutableDictionary<string, int> header, string
                 deceasedPerType,
                 new Vaccination(
                     administered: new TodayToDate(
-                        GetInt("vaccination.administered", header, fields),
+                        null,
                         GetInt("vaccination.administered.todate", header, fields)
                     ),
+                    administered2nd: new TodayToDate(
+                        null,
+                        GetInt("vaccination.administered2nd.todate", header, fields)
+                    ),
+                    used: new TodayToDate(
+                        null,
+                        GetInt("vaccination.used.todate", header, fields)
+                    ),
                     delivered: new TodayToDate(
                         null,
                         GetInt("vaccination.delivered.todate", header, fields)

diff --git a/sources/SloCovidServer/SloCovidServer/Startup.cs b/sources/SloCovidServer/SloCovidServer/Startup.cs
@@ -16,7 +16,7 @@ namespace SloCovidServer
 {
     public class Startup
     {
-        const string SchemaVersion = "32";
+        const string SchemaVersion = "35";
         const string CorsPolicy = "Any";
         readonly IWebHostEnvironment env;
         public Startup(IConfiguration configuration, IWebHostEnvironment env)

diff --git a/version.xml b/version.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<version>1.9.17</version>
+<version>1.9.18</version>