Close #71 Polishes sewage data

sledilnik · Jan 23, 2021 · 7aa051f · 7aa051f
1 parent 45f224a
commit 7aa051f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/sources/SloCovidServer/SloCovidServer/Mappers/SewageMapper.cs b/sources/SloCovidServer/SloCovidServer/Mappers/SewageMapper.cs
@@ -15,28 +15,35 @@ public ImmutableArray<SewageDay> GetFromRaw(string raw)
             foreach (string line in IterateLines(lines))
             {
                 var fields = ParseLine(line);
-                var cities = ImmutableDictionary<string, SewageCityDay>.Empty;
+                var plants = ImmutableDictionary<string, ImmutableDictionary<string, float?>>.Empty;
                 foreach (var pair in header)
                 {
                     string[] parts = pair.Key.Split('.');
                     if (parts.Length == 3)
                     {
-                        string cityName = parts[1];
-                        if (!cities.TryGetValue(cityName, out var city))
+                        float? value = GetFloat(fields[pair.Value]);
+                        string plantName = parts[1];
+                        if (value.HasValue)
                         {
-                            city = new SewageCityDay(ImmutableDictionary<string, float?>.Empty);
+                            if (!plants.TryGetValue(plantName, out var plant))
+                            {
+                                plant = ImmutableDictionary<string, float?>.Empty;
+                            }
+                            plant = plant.Add(parts[2], value);
+                            plants = plants.SetItem(plantName, plant);
                         }
-                        city = city with { Measurements = city.Measurements.Add(parts[2], GetFloat(fields[pair.Value])) };
-                        cities = cities.SetItem(cityName, city);
                     }
                 }
-                var date = GetDate(fields[dateIndex]);
-                result.Add(new SewageDay(
-                    date.Year,
-                    date.Month,
-                    date.Day,
-                    cities
-                ));
+                if (plants.Count > 0)
+                {
+                    var date = GetDate(fields[dateIndex]);
+                    result.Add(new SewageDay(
+                        date.Year,
+                        date.Month,
+                        date.Day,
+                        plants
+                    ));
+                }
             }
             return result.ToImmutableArray();
         }

diff --git a/sources/SloCovidServer/SloCovidServer/Models/SewageDay.cs b/sources/SloCovidServer/SloCovidServer/Models/SewageDay.cs
@@ -2,6 +2,5 @@
 
 namespace SloCovidServer.Models
 {
-    public record SewageDay(int Year, int Month, int Day, ImmutableDictionary<string, SewageCityDay> Cities) { }
-    public record SewageCityDay(ImmutableDictionary<string, float?> Measurements) { }
+    public record SewageDay(int Year, int Month, int Day, ImmutableDictionary<string, ImmutableDictionary<string, float?>> Plants) { }
 }