Bugfix/add ps number to note corrupted

src/api/VoteMonitor.Api.DataExport/Handlers/GetExcelDbCommandHandler.cs

@@ -146,9 +146,10 @@
 
         foreach (var row in data)
         {
             object?[] rowValues =
             {
-                row.ObserverId, row.ObserverPhone,
+                row.ObserverId, 
+                row.ObserverPhone,
                 row.ObserverName,
                 row.PollingStation,
                 row.LastModified.ToString("s"),
@@ -158,6 +159,8 @@
                 row.NumberOfFemaleMembers,
                 row.MinPresentMembers,
                 row.ChairmanPresence,
+                row.SinglePollingStationOrCommission,
+                row.AdequatePollingStationSize,
             };
             dataTable.Rows.Add(rowValues);
         }
@@ -219,7 +222,7 @@
 
         foreach (var question in questions)
         {
             object?[] rowValues = new List<object?>
                 {
                     question.FormCode,
                     question.FormSectionCode,
@@ -279,7 +282,7 @@
 
         foreach (var note in notes)
         {
             object?[] rowValues = new List<object?>
                 {
                     note.ObserverId,
                     note.ObserverPhone,

src/api/VoteMonitor.Api.Note/Commands/AddNoteToUnknownPollingStation.cs

@@ -8,15 +8,17 @@ public record AddNoteToUnknownPollingStation : IRequest<int>
     public int ObserverId { get;  }
     public string CountyCode { get; }
     public string MunicipalityCode { get; }
+    public int PollingStationNumber { get; }
     public int? QuestionId { get;  }
     public string Text { get;  }
     public UploadedFileModel[] Attachments { get;  }
 
-    public AddNoteToUnknownPollingStation(int observerId, string countyCode, string municipalityCode, int? questionId, string text, UploadedFileModel[] attachments = null)
+    public AddNoteToUnknownPollingStation(int observerId, string countyCode, string municipalityCode, int pollingStationNumber,  int? questionId, string text, UploadedFileModel[] attachments = null)
     {
         ObserverId = observerId;
         CountyCode = countyCode;
         MunicipalityCode = municipalityCode;
+        PollingStationNumber = pollingStationNumber;
         QuestionId = questionId;
         Text = text;
         Attachments = attachments ?? Array.Empty<UploadedFileModel>();

src/api/VoteMonitor.Api.Note/Controllers/NoteController.cs

@@ -63,7 +63,7 @@
         }
         else
         {
-            var command = new AddNoteToUnknownPollingStation(this.GetIdObserver(), note.CountyCode, note.MunicipalityCode, note.QuestionId, note.Text, attachments);
+            var command = new AddNoteToUnknownPollingStation(this.GetIdObserver(), note.CountyCode, note.MunicipalityCode, note.PollingStationNumber, note.QuestionId, note.Text, attachments);
             var result = await _mediator.Send(command);
             return ProcessUpload(result, note, command.Attachments.Select(x => x.Path).ToArray());
         }
@@ -108,7 +108,7 @@
     [HttpPost("upload")]
     [Authorize("Observer")]
     [Obsolete("Will be removed when ui will use multiple files upload")]
     [Produces(type: typeof(UploadNoteResult))]
     public async Task<IActionResult> UploadOld([FromForm] UploadNoteModel note)
     {
         // TODO[DH] use a pipeline instead of separate Send commands

src/api/VoteMonitor.Api.Note/Handlers/NoteQueriesHandler.cs

@@ -12,7 +12,7 @@
     IRequestHandler<NoteQuery, List<NoteModel>>,
     IRequestHandler<AddNoteCommandV2, int>,
     IRequestHandler<AddNoteToUnknownPollingStation, int>,
     IRequestHandler<AddNoteCommand, int>
 {
 
     private readonly VoteMonitorContext _context;
@@ -43,7 +43,7 @@
             {
                 Files = n.Attachments.Select(x => x.FileName).ToArray(),
                 Text = n.Text,
                 FormCode = (string?)n.Question.FormSection.Form.Code,
                 FormId = (int?)n.Question.FormSection.Form.Id,
                 QuestionId = (int?)n.Question.Id,
                 CountyCode = n.PollingStation.Municipality.County.Code,
@@ -84,7 +84,7 @@
         return await _context.SaveChangesAsync(cancellationToken);
     }
 
     public async Task<int> Handle(AddNoteCommand request, CancellationToken cancellationToken)
     {
         var noteEntity = new Entities.Note
         {
@@ -119,6 +119,7 @@
             Text = request.Text,
             CountyCode = request.CountyCode,
             MunicipalityCode = request.MunicipalityCode,
+            PollingStationNumber = request.PollingStationNumber,
             // A note can be added to a polling station as well.
             // In that case IdQuestion is either null or 0
             IdQuestion = request.QuestionId == 0 ? null : request.QuestionId,

src/api/VoteMonitor.Entities/NoteCorrupted.cs

@@ -8,11 +8,11 @@ public class NoteCorrupted : IIdentifiableEntity
     public int IdObserver { get; set; }
     public string CountyCode { get; set; }
     public string MunicipalityCode { get; set; }
+    public int PollingStationNumber { get; set; }
     public string Text { get; set; }
 
     public virtual Question Question { get; set; }
     public virtual Observer Observer { get; set; }
-    public virtual PollingStation PollingStation { get; set; }
     public virtual ICollection<NotesAttachmentCorrupted> Attachments { get; set; }
 
 }

src/api/VoteMonitor.Entities/VotingContext.cs

@@ -159,6 +159,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             entity.HasIndex(e => e.MunicipalityCode);
 
             entity.Property(e => e.LastModified);
+            entity.Property(e => e.PollingStationNumber);
 
             entity.HasOne(d => d.Question)
                 .WithMany(p => p.NotesCorrupted)