Update list/get observers (#916)

Author: idormenco

api/src/Vote.Monitor.Api.Feature.Observer/Get/Endpoint.cs

@@ -23,9 +23,11 @@ public override async Task<Results<Ok<ObserverModel>, NotFound>> ExecuteAsync(Re
                          u."PhoneNumber",
                          u."Status",
                          u."EmailConfirmed"                                      as "IsAccountVerified",
-                         COALESCE((select jsonb_agg(jsonb_build_object('ElectionTitle', er."Title",
-                                                                       'ElectionEnglishTitle', er."EnglishTitle",
-                                                                       'ElectionDate', er."StartDate",
+                         COALESCE((select jsonb_agg(jsonb_build_object('Id', er."Id",
+                                                                       'Title', er."Title",
+                                                                       'EnglishTitle', er."EnglishTitle",
+                                                                       'StartDate', er."StartDate",
+                                                                       'Status', er."Status",
                                                                        'NgoName', n."Name"
                                                     ))
                                    FROM "MonitoringObservers" mo

api/src/Vote.Monitor.Api.Feature.Observer/List/Endpoint.cs

@@ -46,11 +46,13 @@ WITH FilteredObservers as (
                          u."PhoneNumber",
                          u."Status",
                          u."EmailConfirmed"                                      as "IsAccountVerified",
-                         COALESCE((select jsonb_agg(jsonb_build_object('ElectionTitle', er."Title",
-                                                                       'ElectionEnglishTitle', er."EnglishTitle",
-                                                                       'ElectionDate', er."StartDate",
-                                                                       'NgoName', n."Name"
-                                                    ))
+                         COALESCE((select jsonb_agg(jsonb_build_object('Id', er."Id",
+                                                                'Title', er."Title",
+                                                                'EnglishTitle', er."EnglishTitle",
+                                                                'StartDate', er."StartDate",
+                                                                'Status', er."Status",
+                                                                'NgoName', n."Name"
+                                             ))
                                    FROM "MonitoringObservers" mo
                                             left join "ElectionRounds" er on er."Id" = mo."ElectionRoundId"
                                             left join "MonitoringNgos" mn on mo."MonitoringNgoId" = mn."Id"

api/src/Vote.Monitor.Api.Feature.Observer/ObserverModel.cs

@@ -1,4 +1,6 @@
-namespace Vote.Monitor.Api.Feature.Observer;
+using Vote.Monitor.Domain.Entities.ElectionRoundAggregate;
+
+namespace Vote.Monitor.Api.Feature.Observer;
 
 public record ObserverModel
 {
@@ -11,15 +13,15 @@ public record ObserverModel
 
     public string? PhoneNumber { get; init; }
     public UserStatus Status { get; init; }
-    
+
     public MonitoredElectionsDetails[] MonitoredElections { get; init; } = [];
 
     public record MonitoredElectionsDetails
     {
-        public string ElectionTitle { get; init; }
-        public string ElectionEnglishTitle { get; init; }
-        public string ElectionDate { get; init; }
+        public string Title { get; init; }
+        public string EnglishTitle { get; init; }
+        public string StartDate { get; init; }
+        public ElectionRoundStatus Status { get; init; }
         public string NgoName { get; init; }
-        
     }
 }