Merge pull request #411 from code4romania/bugfix/fix-2-issues

fix 2 issues
code4romania · Oct 10, 2023 · 8a271ba · 8a271ba
2 parents 679d0da + 76b6277
commit 8a271ba
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 21 deletions.
diff --git a/src/api/VoteMonitor.Api.Form/Models/FormDetailsModel.cs b/src/api/VoteMonitor.Api.Form/Models/FormDetailsModel.cs
@@ -1,27 +1,27 @@
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace VoteMonitor.Api.Form.Models;
 
 public class FormDetailsModel
 {
-    [JsonProperty(PropertyName = "id")]
+    [JsonPropertyName("id")]
     public int Id { get; set; }
 
-    [JsonProperty(PropertyName = "code")]
+    [JsonPropertyName("code")]
     public string Code { get; set; }
 
-    [JsonProperty(PropertyName = "description")]
+    [JsonPropertyName("description")]
     public string Description { get; set; }
 
-    [JsonProperty(PropertyName = "ver")]
+    [JsonPropertyName("ver")]
     public int CurrentVersion { get; set; }
 
-    [JsonProperty(PropertyName = "diaspora")]
+    [JsonPropertyName("diaspora")]
     public bool Diaspora { get; set; }
 
-    [JsonProperty(PropertyName = "order")]
+    [JsonPropertyName("order")]
     public int Order { get; set; }
 
-    [JsonProperty(PropertyName = "draft")]
+    [JsonPropertyName("draft")]
     public bool Draft { get; set; }
-}
+}
diff --git a/src/api/VoteMonitor.Api.Observer/Handlers/ActiveObserversQueryHandler.cs b/src/api/VoteMonitor.Api.Observer/Handlers/ActiveObserversQueryHandler.cs
@@ -17,29 +17,44 @@ public ActiveObserversQueryHandler(VoteMonitorContext context)
     public Task<List<ObserverModel>> Handle(ActiveObserversQuery request, CancellationToken cancellationToken)
     {
         var results = _context.PollingStationInfos
+            .AsNoTracking()
             .Include(pi => pi.PollingStation)
             .Include(pi => pi.PollingStation.Municipality)
             .ThenInclude(c => c.County)
             .Include(pi => pi.Observer)
-            .Where(i => request.CountyCodes.Contains(i.PollingStation.Municipality.County.Code));
+            .ThenInclude(o=>o.Ngo)
+            .Select(x => new 
+                {
+                    ObserverId = x.Observer.Id,
+                    ObserverName = x.Observer.Name,
+                    ObserverPhone = x.Observer.Phone,
+                    NgoName = x.Observer.Ngo.Name,
+                    NgoId = x.Observer.Ngo.Id,
+                    NumberOfNotes = x.Observer.Notes.Count,
+                    NumberOfPollingStations = x.Observer.PollingStationInfos.Count,
+                    DeviceRegisterDate = x.Observer.DeviceRegisterDate,
+                    CountyCode  = x.PollingStation.Municipality.County.Code,
+                    LastAnswer = x.Observer.Answers.Any() ? x.Observer.Answers.Max(a => a.LastModified) : (DateTime?)null,
+                    LastNote = x.Observer.Notes.Any() ? x.Observer.Notes.Max(a => a.LastModified) : (DateTime?)null,
+            })
+            .Where(x => request.CountyCodes.Contains(x.CountyCode));
 
         if (request.NgoId > 0)
         {
-            results = results.Where(i => i.Observer.IdNgo == request.NgoId);
+            results = results.Where(x => x.NgoId == request.NgoId);
         }
 
         var observers = results
-            .Select(i => i.Observer)
-            .AsEnumerable()
-            .Select(o => new ObserverModel
+            .Select(x => new ObserverModel
             {
-                Id = o.Id,
-                Name = o.Name,
-                Phone = o.Phone,
-                Ngo = o.Ngo.Name,
-                NumberOfNotes = o.Notes.Count,
-                NumberOfPollingStations = o.PollingStationInfos.Count,
-                DeviceRegisterDate = o.DeviceRegisterDate
+                Id = x.ObserverId,
+                Name = x.ObserverName,
+                Phone = x.ObserverPhone,
+                Ngo = x.NgoName,
+                NumberOfNotes = x.NumberOfNotes,
+                NumberOfPollingStations = x.NumberOfPollingStations,
+                DeviceRegisterDate = x.DeviceRegisterDate,
+                LastSeen = (x.LastAnswer ?? DateTime.MinValue) > (x.LastNote ?? DateTime.MinValue) ? x.LastAnswer : x.LastNote,
             })
             .ToList();